diff options
author | delphij <delphij@FreeBSD.org> | 2016-03-02 15:43:01 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2016-03-02 15:43:01 +0000 |
commit | 73af9669cdc04af0c06344ce6f0d85808187eab3 (patch) | |
tree | f76285aeef43941ffcb77e3220027526a2c2c421 /crypto/openssl/Configure | |
parent | 3b4b162df0228ed74a1e63eccc7315071254344f (diff) | |
download | FreeBSD-src-73af9669cdc04af0c06344ce6f0d85808187eab3.zip FreeBSD-src-73af9669cdc04af0c06344ce6f0d85808187eab3.tar.gz |
Merge OpenSSL 1.0.1s. This is a security update.
Relnotes: yes
Approved by: re (so@ implicit)
Diffstat (limited to 'crypto/openssl/Configure')
-rwxr-xr-x | crypto/openssl/Configure | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crypto/openssl/Configure b/crypto/openssl/Configure index 0a5ffac..93c4cc1 100755 --- a/crypto/openssl/Configure +++ b/crypto/openssl/Configure @@ -58,6 +58,10 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta # library and will be loaded in run-time by the OpenSSL library. # sctp include SCTP support # 386 generate 80386 code +# enable-weak-ssl-ciphers +# Enable EXPORT and LOW SSLv3 ciphers that are disabled by +# default. Note, weak SSLv2 ciphers are unconditionally +# disabled. # no-sse2 disables IA-32 SSE2 code, above option implies no-sse2 # no-<cipher> build without specified algorithm (rsa, idea, rc5, ...) # -<xxx> +<xxx> compiler options are passed through @@ -724,10 +728,12 @@ my %disabled = ( # "what" => "comment" [or special keyword "experimental "md2" => "default", "rc5" => "default", "rfc3779" => "default", - "sctp" => "default", + "sctp" => "default", "shared" => "default", + "ssl2" => "default", "store" => "experimental", "unit-test" => "default", + "weak-ssl-ciphers" => "default", "zlib" => "default", "zlib-dynamic" => "default" ); |