summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortedu <>2014-07-11 15:14:33 +0000
committertedu <>2014-07-11 15:14:33 +0000
commitf1610dba54b76f55799f981c5d336c35aeadfc30 (patch)
tree27c1eb96da984726ac279eb3319a852baa2d1485
parent7ed55e000cfab9bb09f168faa98064e3076da2f2 (diff)
downloadopenbsd-f1610dba54b76f55799f981c5d336c35aeadfc30.tar.gz
openbsd-f1610dba54b76f55799f981c5d336c35aeadfc30.tar.bz2
openbsd-f1610dba54b76f55799f981c5d336c35aeadfc30.zip
it has been 4888 days since the transient feature to define short macros
for apps that haven't had time to make the appropriate changes was added. time's up.
Diffstat
-rw-r--r--src/lib/libcrypto/opensslfeatures.h59
-rw-r--r--src/lib/libssl/src/crypto/opensslfeatures.h59
2 files changed, 2 insertions, 116 deletions
diff --git a/src/lib/libcrypto/opensslfeatures.h b/src/lib/libcrypto/opensslfeatures.h
index 3f90e1ba43..cf7ffeac79 100644
--- a/src/lib/libcrypto/opensslfeatures.h
+++ b/src/lib/libcrypto/opensslfeatures.h
@@ -17,63 +17,6 @@
17# define OPENSSL_NO_STORE 17# define OPENSSL_NO_STORE
18# define OPENSSL_NO_BUF_FREELISTS 18# define OPENSSL_NO_BUF_FREELISTS
19# define OPENSSL_NO_HEARTBEATS 19# define OPENSSL_NO_HEARTBEATS
20
21
22# define OPENSSL_THREADS
23# define OPENSSL_NO_DYNAMIC_ENGINE 20# define OPENSSL_NO_DYNAMIC_ENGINE
24 21
25/* The OPENSSL_NO_* macros are also defined as NO_* if the application 22# define OPENSSL_THREADS
26 asks for it. This is a transient feature that is provided for those
27 who haven't had the time to do the appropriate changes in their
28 applications. */
29#ifdef OPENSSL_ALGORITHM_DEFINES
30# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
31# define NO_CAMELLIA
32# endif
33# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
34# define NO_EC_NISTP_64_GCC_128
35# endif
36# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
37# define NO_CMS
38# endif
39# if defined(OPENSSL_NO_COMP) && !defined(NO_COMP)
40# define NO_COMP
41# endif
42# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
43# define NO_GMP
44# endif
45# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
46# define NO_GOST
47# endif
48# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
49# define NO_JPAKE
50# endif
51# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
52# define NO_KRB5
53# endif
54# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
55# define NO_MD2
56# endif
57# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
58# define NO_RC5
59# endif
60# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
61# define NO_RFC3779
62# endif
63# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
64# define NO_SCTP
65# endif
66# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
67# define NO_SEED
68# endif
69# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
70# define NO_SRP
71# endif
72# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
73# define NO_SSL2
74# endif
75# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_STORE
77# endif
78#endif
79
diff --git a/src/lib/libssl/src/crypto/opensslfeatures.h b/src/lib/libssl/src/crypto/opensslfeatures.h
index 3f90e1ba43..cf7ffeac79 100644
--- a/src/lib/libssl/src/crypto/opensslfeatures.h
+++ b/src/lib/libssl/src/crypto/opensslfeatures.h
@@ -17,63 +17,6 @@
17# define OPENSSL_NO_STORE 17# define OPENSSL_NO_STORE
18# define OPENSSL_NO_BUF_FREELISTS 18# define OPENSSL_NO_BUF_FREELISTS
19# define OPENSSL_NO_HEARTBEATS 19# define OPENSSL_NO_HEARTBEATS
20
21
22# define OPENSSL_THREADS
23# define OPENSSL_NO_DYNAMIC_ENGINE 20# define OPENSSL_NO_DYNAMIC_ENGINE
24 21
25/* The OPENSSL_NO_* macros are also defined as NO_* if the application 22# define OPENSSL_THREADS
26 asks for it. This is a transient feature that is provided for those
27 who haven't had the time to do the appropriate changes in their
28 applications. */
29#ifdef OPENSSL_ALGORITHM_DEFINES
30# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
31# define NO_CAMELLIA
32# endif
33# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
34# define NO_EC_NISTP_64_GCC_128
35# endif
36# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
37# define NO_CMS
38# endif
39# if defined(OPENSSL_NO_COMP) && !defined(NO_COMP)
40# define NO_COMP
41# endif
42# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
43# define NO_GMP
44# endif
45# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
46# define NO_GOST
47# endif
48# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
49# define NO_JPAKE
50# endif
51# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
52# define NO_KRB5
53# endif
54# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
55# define NO_MD2
56# endif
57# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
58# define NO_RC5
59# endif
60# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
61# define NO_RFC3779
62# endif
63# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
64# define NO_SCTP
65# endif
66# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
67# define NO_SEED
68# endif
69# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP)
70# define NO_SRP
71# endif
72# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
73# define NO_SSL2
74# endif
75# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_STORE
77# endif
78#endif
79
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-10-27 22:58:19 +0000