diff options
| author | jkim <jkim@FreeBSD.org> | 2015-10-30 20:51:33 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-10-30 20:51:33 +0000 |
| commit | 6b741bee156148072e0e9588e7c9f4a9d66d1ab9 (patch) | |
| tree | e8d8b5ada49f5cdbf70d1e455c13f2625fdcdd45 /secure/lib/libcrypto/opensslconf-powerpc.h | |
| parent | 979d5cd34dadfb0b78c606ecca3ec8d3a6ca245f (diff) | |
| parent | 64cb0c902e312216cdc4c826fc0be9ba9e1bf4da (diff) | |
| download | FreeBSD-src-6b741bee156148072e0e9588e7c9f4a9d66d1ab9.zip FreeBSD-src-6b741bee156148072e0e9588e7c9f4a9d66d1ab9.tar.gz | |
Merge OpenSSL 1.0.2d.
Diffstat (limited to 'secure/lib/libcrypto/opensslconf-powerpc.h')
| -rw-r--r-- | secure/lib/libcrypto/opensslconf-powerpc.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/secure/lib/libcrypto/opensslconf-powerpc.h b/secure/lib/libcrypto/opensslconf-powerpc.h index 341daa2..45c1abd 100644 --- a/secure/lib/libcrypto/opensslconf-powerpc.h +++ b/secure/lib/libcrypto/opensslconf-powerpc.h @@ -21,12 +21,18 @@ extern "C" { #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_LIBUNBOUND +# define OPENSSL_NO_LIBUNBOUND +#endif #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif #ifndef OPENSSL_NO_SCTP # define OPENSSL_NO_SCTP #endif +#ifndef OPENSSL_NO_SSL_TRACE +# define OPENSSL_NO_SSL_TRACE +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -66,12 +72,18 @@ extern "C" { # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND) +# define NO_LIBUNBOUND +# endif # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) # define NO_SCTP # endif +# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE) +# define NO_SSL_TRACE +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif @@ -195,7 +207,7 @@ extern "C" { #endif #if defined(DES_RISC1) && defined(DES_RISC2) -YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! +#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! #endif /* Unroll the inner loop, this sometimes helps, sometimes hinders. |
