diff options
| author | Xin LI <delphij@FreeBSD.org> | 2015-02-25 05:56:16 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2015-02-25 05:56:16 +0000 |
| commit | 0099f6f89a1325dc504096aecbdcbddad498310e (patch) | |
| tree | fb8622e587884d6798b247e77bf0a8dcc352eedd /crypto/openssl/crypto/opensslconf.h | |
| parent | 11ad446ce58488a8870294bee24ea87050e96dbe (diff) | |
| download | src-0099f6f89a1325dc504096aecbdcbddad498310e.tar.gz src-0099f6f89a1325dc504096aecbdcbddad498310e.zip | |
Fix integer overflow in IGMP protocol. [SA-15:04]releng/10.0
Fix vt(4) crash with improper ioctl parameters. [EN-15:01]
Updated base system OpenSSL to 1.0.1l. [EN-15:02]
Fix freebsd-update libraries update ordering issue. [EN-15:03]
Approved by: so
Notes
Notes:
svn path=/releng/10.0/; revision=279264
Diffstat (limited to 'crypto/openssl/crypto/opensslconf.h')
| -rw-r--r-- | crypto/openssl/crypto/opensslconf.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/crypto/openssl/crypto/opensslconf.h b/crypto/openssl/crypto/opensslconf.h index b18f4da49661..7513d14c7530 100644 --- a/crypto/openssl/crypto/opensslconf.h +++ b/crypto/openssl/crypto/opensslconf.h @@ -1,6 +1,9 @@ /* opensslconf.h */ /* WARNING: Generated automatically from opensslconf.h.in by Configure. */ +#ifdef __cplusplus +extern "C" { +#endif /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND @@ -32,6 +35,9 @@ #ifndef OPENSSL_NO_STORE # define OPENSSL_NO_STORE #endif +#ifndef OPENSSL_NO_UNIT_TEST +# define OPENSSL_NO_UNIT_TEST +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ @@ -71,6 +77,9 @@ # 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 #endif /* crypto/opensslconf.h.in */ @@ -227,3 +236,6 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! #endif /* DES_DEFAULT_OPTIONS */ #endif /* HEADER_DES_LOCL_H */ +#ifdef __cplusplus +} +#endif |