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 /secure/lib/libcrypto/opensslconf-mips.h | |
| 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 'secure/lib/libcrypto/opensslconf-mips.h')
| -rw-r--r-- | secure/lib/libcrypto/opensslconf-mips.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/secure/lib/libcrypto/opensslconf-mips.h b/secure/lib/libcrypto/opensslconf-mips.h index 3b2cbdc..d96040e 100644 --- a/secure/lib/libcrypto/opensslconf-mips.h +++ b/secure/lib/libcrypto/opensslconf-mips.h @@ -27,12 +27,18 @@ extern "C" { #ifndef OPENSSL_NO_SCTP # define OPENSSL_NO_SCTP #endif +#ifndef OPENSSL_NO_SSL2 +# define OPENSSL_NO_SSL2 +#endif #ifndef OPENSSL_NO_STORE # define OPENSSL_NO_STORE #endif #ifndef OPENSSL_NO_UNIT_TEST # define OPENSSL_NO_UNIT_TEST #endif +#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS +# define OPENSSL_NO_WEAK_SSL_CIPHERS +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ @@ -69,12 +75,18 @@ extern "C" { # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) # define NO_SCTP # endif +# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) +# define NO_SSL2 +# endif # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) # define NO_STORE # endif # if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST) # define NO_UNIT_TEST # endif +# if defined(OPENSSL_NO_WEAK_SSL_CIPHERS) && !defined(NO_WEAK_SSL_CIPHERS) +# define NO_WEAK_SSL_CIPHERS +# endif #endif /* crypto/opensslconf.h.in */ |
