diff options
author | inoguchi <> | 2020-09-09 12:23:49 +0000 |
---|---|---|
committer | inoguchi <> | 2020-09-09 12:23:49 +0000 |
commit | 3f2dd3140c402b9a03bfac6c0e2504be39410d1b (patch) | |
tree | 6f6c8d3a80d5cc5d07da23339411e6ff08ed6717 | |
parent | f480541076046d416b477d5f85275becc18cb576 (diff) | |
download | openbsd-3f2dd3140c402b9a03bfac6c0e2504be39410d1b.tar.gz openbsd-3f2dd3140c402b9a03bfac6c0e2504be39410d1b.tar.bz2 openbsd-3f2dd3140c402b9a03bfac6c0e2504be39410d1b.zip |
Import latest OPENSSL_NO_* flags from OpenSSL 1.1.1g
ok tb@
-rw-r--r-- | src/lib/libcrypto/opensslfeatures.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/libcrypto/opensslfeatures.h b/src/lib/libcrypto/opensslfeatures.h index 3b19cd57a3..9684276b72 100644 --- a/src/lib/libcrypto/opensslfeatures.h +++ b/src/lib/libcrypto/opensslfeatures.h | |||
@@ -31,6 +31,7 @@ | |||
31 | /* #define OPENSSL_NO_BF */ | 31 | /* #define OPENSSL_NO_BF */ |
32 | /* #define OPENSSL_NO_BLAKE2 */ | 32 | /* #define OPENSSL_NO_BLAKE2 */ |
33 | /* #define OPENSSL_NO_CAMELLIA */ | 33 | /* #define OPENSSL_NO_CAMELLIA */ |
34 | /* #define OPENSSL_NO_CAPIENG */ | ||
34 | /* #define OPENSSL_NO_CAST */ | 35 | /* #define OPENSSL_NO_CAST */ |
35 | /* #define OPENSSL_NO_CHACHA */ | 36 | /* #define OPENSSL_NO_CHACHA */ |
36 | /* #define OPENSSL_NO_CMAC */ | 37 | /* #define OPENSSL_NO_CMAC */ |
@@ -41,6 +42,7 @@ | |||
41 | /* #define OPENSSL_NO_CT */ | 42 | /* #define OPENSSL_NO_CT */ |
42 | /* #define OPENSSL_NO_DECC_INIT */ | 43 | /* #define OPENSSL_NO_DECC_INIT */ |
43 | /* #define OPENSSL_NO_DES */ | 44 | /* #define OPENSSL_NO_DES */ |
45 | /* #define OPENSSL_NO_DEVCRYPTOENG */ | ||
44 | /* #define OPENSSL_NO_DGRAM */ | 46 | /* #define OPENSSL_NO_DGRAM */ |
45 | /* #define OPENSSL_NO_DH */ | 47 | /* #define OPENSSL_NO_DH */ |
46 | /* #define OPENSSL_NO_DSA */ | 48 | /* #define OPENSSL_NO_DSA */ |
@@ -57,12 +59,14 @@ | |||
57 | #define OPENSSL_NO_EGD | 59 | #define OPENSSL_NO_EGD |
58 | /* #define OPENSSL_NO_ENGINE */ | 60 | /* #define OPENSSL_NO_ENGINE */ |
59 | /* #define OPENSSL_NO_ERR */ | 61 | /* #define OPENSSL_NO_ERR */ |
62 | /* #define OPENSSL_NO_FUZZ_AFL */ | ||
60 | /* #define OPENSSL_NO_FUZZ_LIBFUZZER */ | 63 | /* #define OPENSSL_NO_FUZZ_LIBFUZZER */ |
61 | /* #define OPENSSL_NO_GOST */ | 64 | /* #define OPENSSL_NO_GOST */ |
62 | #define OPENSSL_NO_HEARTBEATS | 65 | #define OPENSSL_NO_HEARTBEATS |
63 | /* #define OPENSSL_NO_HW */ | 66 | /* #define OPENSSL_NO_HW */ |
64 | /* #define OPENSSL_NO_HW_PADLOCK */ | 67 | /* #define OPENSSL_NO_HW_PADLOCK */ |
65 | /* #define OPENSSL_NO_IDEA */ | 68 | /* #define OPENSSL_NO_IDEA */ |
69 | /* #define OPENSSL_NO_INLINE_ASM */ | ||
66 | #define OPENSSL_NO_MD2 | 70 | #define OPENSSL_NO_MD2 |
67 | /* #define OPENSSL_NO_MD4 */ | 71 | /* #define OPENSSL_NO_MD4 */ |
68 | /* #define OPENSSL_NO_MD5 */ | 72 | /* #define OPENSSL_NO_MD5 */ |
@@ -71,17 +75,20 @@ | |||
71 | /* #define OPENSSL_NO_NEXTPROTONEG */ | 75 | /* #define OPENSSL_NO_NEXTPROTONEG */ |
72 | /* #define OPENSSL_NO_OCB */ | 76 | /* #define OPENSSL_NO_OCB */ |
73 | /* #define OPENSSL_NO_OCSP */ | 77 | /* #define OPENSSL_NO_OCSP */ |
78 | /* #define OPENSSL_NO_PINSHARED */ | ||
74 | /* #define OPENSSL_NO_POLY1305 */ | 79 | /* #define OPENSSL_NO_POLY1305 */ |
75 | /* #define OPENSSL_NO_POSIX_IO */ | 80 | /* #define OPENSSL_NO_POSIX_IO */ |
76 | #define OPENSSL_NO_PSK | 81 | #define OPENSSL_NO_PSK |
77 | /* #define OPENSSL_NO_RC2 */ | 82 | /* #define OPENSSL_NO_RC2 */ |
78 | /* #define OPENSSL_NO_RC4 */ | 83 | /* #define OPENSSL_NO_RC4 */ |
79 | #define OPENSSL_NO_RC5 | 84 | #define OPENSSL_NO_RC5 |
85 | /* #define OPENSSL_NO_RDRAND */ | ||
80 | #define OPENSSL_NO_RFC3779 | 86 | #define OPENSSL_NO_RFC3779 |
81 | /* #define OPENSSL_NO_RMD160 */ | 87 | /* #define OPENSSL_NO_RMD160 */ |
82 | /* #define OPENSSL_NO_RSA */ | 88 | /* #define OPENSSL_NO_RSA */ |
83 | /* #define OPENSSL_NO_SCRYPT */ | 89 | /* #define OPENSSL_NO_SCRYPT */ |
84 | #define OPENSSL_NO_SCTP | 90 | #define OPENSSL_NO_SCTP |
91 | /* #define OPENSSL_NO_SECURE_MEMORY */ | ||
85 | #define OPENSSL_NO_SEED | 92 | #define OPENSSL_NO_SEED |
86 | /* #define OPENSSL_NO_SIPHASH */ | 93 | /* #define OPENSSL_NO_SIPHASH */ |
87 | /* #define OPENSSL_NO_SM2 */ | 94 | /* #define OPENSSL_NO_SM2 */ |
@@ -93,6 +100,7 @@ | |||
93 | #define OPENSSL_NO_SSL3 | 100 | #define OPENSSL_NO_SSL3 |
94 | #define OPENSSL_NO_SSL3_METHOD | 101 | #define OPENSSL_NO_SSL3_METHOD |
95 | #define OPENSSL_NO_SSL_TRACE | 102 | #define OPENSSL_NO_SSL_TRACE |
103 | /* #define OPENSSL_NO_STATIC_ENGINE */ | ||
96 | /* #define OPENSSL_NO_STDIO */ | 104 | /* #define OPENSSL_NO_STDIO */ |
97 | /* #define OPENSSL_NO_TLS */ | 105 | /* #define OPENSSL_NO_TLS */ |
98 | /* #define OPENSSL_NO_TLS1 */ | 106 | /* #define OPENSSL_NO_TLS1 */ |