diff options
| author | Renato Botelho <renato@netgate.com> | 2016-03-04 08:51:22 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-03-04 08:51:22 -0300 |
| commit | cf00d471748aedaa5d375c10b8db032b1b2543dd (patch) | |
| tree | ed4154fa2b5b2ae74266cdf83881698a026d7602 /secure/lib | |
| parent | 1f35e43df1094ff19ecabbd0066238226407f832 (diff) | |
| parent | 74ee552c5dacc20b6dde64cbb8a44e8c8ce975d0 (diff) | |
| download | FreeBSD-src-cf00d471748aedaa5d375c10b8db032b1b2543dd.zip FreeBSD-src-cf00d471748aedaa5d375c10b8db032b1b2543dd.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'secure/lib')
| -rw-r--r-- | secure/lib/libcrypto/opensslconf-arm.h | 6 | ||||
| -rw-r--r-- | secure/lib/libcrypto/opensslconf-ia64.h | 6 | ||||
| -rw-r--r-- | secure/lib/libcrypto/opensslconf-mips.h | 6 | ||||
| -rw-r--r-- | secure/lib/libcrypto/opensslconf-powerpc.h | 6 | ||||
| -rw-r--r-- | secure/lib/libcrypto/opensslconf-sparc64.h | 6 | ||||
| -rw-r--r-- | secure/lib/libcrypto/opensslconf-x86.h | 6 |
6 files changed, 0 insertions, 36 deletions
diff --git a/secure/lib/libcrypto/opensslconf-arm.h b/secure/lib/libcrypto/opensslconf-arm.h index 9700912..11bebb6 100644 --- a/secure/lib/libcrypto/opensslconf-arm.h +++ b/secure/lib/libcrypto/opensslconf-arm.h @@ -27,9 +27,6 @@ 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 @@ -75,9 +72,6 @@ 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 diff --git a/secure/lib/libcrypto/opensslconf-ia64.h b/secure/lib/libcrypto/opensslconf-ia64.h index 3e417e3..f4bd669 100644 --- a/secure/lib/libcrypto/opensslconf-ia64.h +++ b/secure/lib/libcrypto/opensslconf-ia64.h @@ -24,9 +24,6 @@ #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 @@ -69,9 +66,6 @@ # 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 diff --git a/secure/lib/libcrypto/opensslconf-mips.h b/secure/lib/libcrypto/opensslconf-mips.h index d96040e..fe4af3b 100644 --- a/secure/lib/libcrypto/opensslconf-mips.h +++ b/secure/lib/libcrypto/opensslconf-mips.h @@ -27,9 +27,6 @@ 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 @@ -75,9 +72,6 @@ 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 diff --git a/secure/lib/libcrypto/opensslconf-powerpc.h b/secure/lib/libcrypto/opensslconf-powerpc.h index 35145c2..ba593ed 100644 --- a/secure/lib/libcrypto/opensslconf-powerpc.h +++ b/secure/lib/libcrypto/opensslconf-powerpc.h @@ -27,9 +27,6 @@ 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 @@ -75,9 +72,6 @@ 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 diff --git a/secure/lib/libcrypto/opensslconf-sparc64.h b/secure/lib/libcrypto/opensslconf-sparc64.h index b1faf75..2bd0b2c 100644 --- a/secure/lib/libcrypto/opensslconf-sparc64.h +++ b/secure/lib/libcrypto/opensslconf-sparc64.h @@ -27,9 +27,6 @@ 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 @@ -75,9 +72,6 @@ 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 diff --git a/secure/lib/libcrypto/opensslconf-x86.h b/secure/lib/libcrypto/opensslconf-x86.h index 9f2be79..43f62bc 100644 --- a/secure/lib/libcrypto/opensslconf-x86.h +++ b/secure/lib/libcrypto/opensslconf-x86.h @@ -27,9 +27,6 @@ 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 @@ -72,9 +69,6 @@ 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 |
