New option no-ssl3-method which removes SSLv3_*method

[openssl.git] / util / mk1mf.pl

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 73523ef4e1d8ebd7a4dfa91569a7d8273c546b8c..0fcadcbad8609eebedf519dc208c71873315be2d 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -1388,12 +1388,17 @@ sub do_copy_rule
        return($ret);
        }
 
        return($ret);
        }
 

+# Options picked up from the OPTIONS line in the top level Makefile
+# generated by Configure.
+

 sub read_options
        {
        # Many options are handled in a similar way. In particular
        # no-xxx sets zero or more scalars to 1.
 sub read_options
        {
        # Many options are handled in a similar way. In particular
        # no-xxx sets zero or more scalars to 1.

-       # Process these using a hash containing the option name and
-       # reference to the scalars to set.
+       # Process these using the %valid_options hash containing the option
+       # name and reference to the scalars to set. In some cases the option
+       # needs no special handling and can be ignored: this is done by
+       # setting the value to 0.

 
        my %valid_options = (
                "no-rc2" => \$no_rc2,
 
        my %valid_options = (
                "no-rc2" => \$no_rc2,


@@ -1427,6 +1432,7 @@ sub read_options
                "gaswin" => \$gaswin,
                "no-ssl2" => \$no_ssl2,
                "no-ssl3" => \$no_ssl3,
                "gaswin" => \$gaswin,
                "no-ssl2" => \$no_ssl2,
                "no-ssl3" => \$no_ssl3,

+               "no-ssl3-method" => 0,

                "no-tlsext" => \$no_tlsext,
                "no-srp" => \$no_srp,
                "no-cms" => \$no_cms,
                "no-tlsext" => \$no_tlsext,
                "no-srp" => \$no_srp,
                "no-cms" => \$no_cms,