evp.h should not pull in all other header files, especially

since it's supposed to hid the specific ciphers. this change also avoids problems when evp is used together with kerberos (and <des.h>). ok deraadt@
author: markus <> 2002-09-10 20:14:31 +0000
committer: markus <> 2002-09-10 20:14:31 +0000
commit: 039ab409f8ad22e893aa696da4d70057041dc808 (patch)
tree: fbb6b8ec7a8a8c6d57f503f0fc7c790f4268b4bb /src
parent: 7d038e9d4d83e7c7120e78418e108df70b9025d6 (diff)
download: openbsd-039ab409f8ad22e893aa696da4d70057041dc808.tar.gz
openbsd-039ab409f8ad22e893aa696da4d70057041dc808.tar.bz2
openbsd-039ab409f8ad22e893aa696da4d70057041dc808.zip
2 files changed, 0 insertions, 114 deletions
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h
index 7051fe2816..7b234d0ad6 100644
--- a/src/lib/libcrypto/evp/evp.h
+++ b/src/lib/libcrypto/evp/evp.h
@@ -74,51 +74,6 @@
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
-#ifndef OPENSSL_NO_MD2
-#include <openssl/md2.h>
-#endif
-#ifndef OPENSSL_NO_MD4
-#include <openssl/md4.h>
-#endif
-#ifndef OPENSSL_NO_MD5
-#include <openssl/md5.h>
-#endif
-#ifndef OPENSSL_NO_SHA
-#include <openssl/sha.h>
-#endif
-#ifndef OPENSSL_NO_RIPEMD
-#include <openssl/ripemd.h>
-#endif
-#ifndef OPENSSL_NO_DES
-#include <openssl/des.h>
-#endif
-#ifndef OPENSSL_NO_RC4
-#include <openssl/rc4.h>
-#endif
-#ifndef OPENSSL_NO_RC2
-#include <openssl/rc2.h>
-#endif
-#ifndef OPENSSL_NO_RC5
-#include <openssl/rc5.h>
-#endif
-#ifndef OPENSSL_NO_BF
-#include <openssl/blowfish.h>
-#endif
-#ifndef OPENSSL_NO_CAST
-#include <openssl/cast.h>
-#endif
-#ifndef OPENSSL_NO_IDEA
-#include <openssl/idea.h>
-#endif
-#if 0
-/* mdc2 uses the new DES_ API, but DES_ is not defined if kerberos is used, too */
-#ifndef OPENSSL_NO_MDC2
-#include <openssl/mdc2.h>
-#endif
-#endif
-#ifndef OPENSSL_NO_AES
-#include <openssl/aes.h>
-#endif
 /*
 #define EVP_RC2_KEY_SIZE                16
@@ -136,18 +91,6 @@
 /* Default PKCS#5 iteration count */
 #define PKCS5_DEFAULT_ITER              2048
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
-#endif
-#ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
-#endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-#endif
 #include <openssl/objects.h>
 #define EVP_PK_RSA      0x0001
diff --git a/src/lib/libssl/src/crypto/evp/evp.h b/src/lib/libssl/src/crypto/evp/evp.h
index 7051fe2816..7b234d0ad6 100644
--- a/src/lib/libssl/src/crypto/evp/evp.h
+++ b/src/lib/libssl/src/crypto/evp/evp.h
@@ -74,51 +74,6 @@
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
-#ifndef OPENSSL_NO_MD2
-#include <openssl/md2.h>
-#endif
-#ifndef OPENSSL_NO_MD4
-#include <openssl/md4.h>
-#endif
-#ifndef OPENSSL_NO_MD5
-#include <openssl/md5.h>
-#endif
-#ifndef OPENSSL_NO_SHA
-#include <openssl/sha.h>
-#endif
-#ifndef OPENSSL_NO_RIPEMD
-#include <openssl/ripemd.h>
-#endif
-#ifndef OPENSSL_NO_DES
-#include <openssl/des.h>
-#endif
-#ifndef OPENSSL_NO_RC4
-#include <openssl/rc4.h>
-#endif
-#ifndef OPENSSL_NO_RC2
-#include <openssl/rc2.h>
-#endif
-#ifndef OPENSSL_NO_RC5
-#include <openssl/rc5.h>
-#endif
-#ifndef OPENSSL_NO_BF
-#include <openssl/blowfish.h>
-#endif
-#ifndef OPENSSL_NO_CAST
-#include <openssl/cast.h>
-#endif
-#ifndef OPENSSL_NO_IDEA
-#include <openssl/idea.h>
-#endif
-#if 0
-/* mdc2 uses the new DES_ API, but DES_ is not defined if kerberos is used, too */
-#ifndef OPENSSL_NO_MDC2
-#include <openssl/mdc2.h>
-#endif
-#endif
-#ifndef OPENSSL_NO_AES
-#include <openssl/aes.h>
-#endif
 /*
 #define EVP_RC2_KEY_SIZE                16
@@ -136,18 +91,6 @@
 /* Default PKCS#5 iteration count */
 #define PKCS5_DEFAULT_ITER              2048
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
-#endif
-#ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
-#endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-#endif
 #include <openssl/objects.h>
 #define EVP_PK_RSA      0x0001
author	markus <>	2002-09-10 20:14:31 +0000
committer	markus <>	2002-09-10 20:14:31 +0000
commit	039ab409f8ad22e893aa696da4d70057041dc808 (patch)
tree	fbb6b8ec7a8a8c6d57f503f0fc7c790f4268b4bb /src
parent	7d038e9d4d83e7c7120e78418e108df70b9025d6 (diff)
download	openbsd-039ab409f8ad22e893aa696da4d70057041dc808.tar.gz openbsd-039ab409f8ad22e893aa696da4d70057041dc808.tar.bz2 openbsd-039ab409f8ad22e893aa696da4d70057041dc808.zip

diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h index 7051fe2816..7b234d0ad6 100644 --- a/src/lib/libcrypto/evp/evp.h +++ b/src/lib/libcrypto/evp/evp.h
@@ -74,51 +74,6 @@
74	#ifndef OPENSSL_NO_BIO	74	#ifndef OPENSSL_NO_BIO
75	#include <openssl/bio.h>	75	#include <openssl/bio.h>
76	#endif	76	#endif
77	#ifndef OPENSSL_NO_MD2
78	#include <openssl/md2.h>
79	#endif
80	#ifndef OPENSSL_NO_MD4
81	#include <openssl/md4.h>
82	#endif
83	#ifndef OPENSSL_NO_MD5
84	#include <openssl/md5.h>
85	#endif
86	#ifndef OPENSSL_NO_SHA
87	#include <openssl/sha.h>
88	#endif
89	#ifndef OPENSSL_NO_RIPEMD
90	#include <openssl/ripemd.h>
91	#endif
92	#ifndef OPENSSL_NO_DES
93	#include <openssl/des.h>
94	#endif
95	#ifndef OPENSSL_NO_RC4
96	#include <openssl/rc4.h>
97	#endif
98	#ifndef OPENSSL_NO_RC2
99	#include <openssl/rc2.h>
100	#endif
101	#ifndef OPENSSL_NO_RC5
102	#include <openssl/rc5.h>
103	#endif
104	#ifndef OPENSSL_NO_BF
105	#include <openssl/blowfish.h>
106	#endif
107	#ifndef OPENSSL_NO_CAST
108	#include <openssl/cast.h>
109	#endif
110	#ifndef OPENSSL_NO_IDEA
111	#include <openssl/idea.h>
112	#endif
113	#if 0
114	/* mdc2 uses the new DES_ API, but DES_ is not defined if kerberos is used, too */
115	#ifndef OPENSSL_NO_MDC2
116	#include <openssl/mdc2.h>
117	#endif
118	#endif
119	#ifndef OPENSSL_NO_AES
120	#include <openssl/aes.h>
121	#endif
122		77
123	/*	78	/*
124	#define EVP_RC2_KEY_SIZE 16	79	#define EVP_RC2_KEY_SIZE 16
@@ -136,18 +91,6 @@
136	/* Default PKCS#5 iteration count */	91	/* Default PKCS#5 iteration count */
137	#define PKCS5_DEFAULT_ITER 2048	92	#define PKCS5_DEFAULT_ITER 2048
138		93
139	#ifndef OPENSSL_NO_RSA
140	#include <openssl/rsa.h>
141	#endif
142
143	#ifndef OPENSSL_NO_DSA
144	#include <openssl/dsa.h>
145	#endif
146
147	#ifndef OPENSSL_NO_DH
148	#include <openssl/dh.h>
149	#endif
150
151	#include <openssl/objects.h>	94	#include <openssl/objects.h>
152		95
153	#define EVP_PK_RSA 0x0001	96	#define EVP_PK_RSA 0x0001


diff --git a/src/lib/libssl/src/crypto/evp/evp.h b/src/lib/libssl/src/crypto/evp/evp.h index 7051fe2816..7b234d0ad6 100644 --- a/src/lib/libssl/src/crypto/evp/evp.h +++ b/src/lib/libssl/src/crypto/evp/evp.h
@@ -74,51 +74,6 @@
74	#ifndef OPENSSL_NO_BIO	74	#ifndef OPENSSL_NO_BIO
75	#include <openssl/bio.h>	75	#include <openssl/bio.h>
76	#endif	76	#endif
77	#ifndef OPENSSL_NO_MD2
78	#include <openssl/md2.h>
79	#endif
80	#ifndef OPENSSL_NO_MD4
81	#include <openssl/md4.h>
82	#endif
83	#ifndef OPENSSL_NO_MD5
84	#include <openssl/md5.h>
85	#endif
86	#ifndef OPENSSL_NO_SHA
87	#include <openssl/sha.h>
88	#endif
89	#ifndef OPENSSL_NO_RIPEMD
90	#include <openssl/ripemd.h>
91	#endif
92	#ifndef OPENSSL_NO_DES
93	#include <openssl/des.h>
94	#endif
95	#ifndef OPENSSL_NO_RC4
96	#include <openssl/rc4.h>
97	#endif
98	#ifndef OPENSSL_NO_RC2
99	#include <openssl/rc2.h>
100	#endif
101	#ifndef OPENSSL_NO_RC5
102	#include <openssl/rc5.h>
103	#endif
104	#ifndef OPENSSL_NO_BF
105	#include <openssl/blowfish.h>
106	#endif
107	#ifndef OPENSSL_NO_CAST
108	#include <openssl/cast.h>
109	#endif
110	#ifndef OPENSSL_NO_IDEA
111	#include <openssl/idea.h>
112	#endif
113	#if 0
114	/* mdc2 uses the new DES_ API, but DES_ is not defined if kerberos is used, too */
115	#ifndef OPENSSL_NO_MDC2
116	#include <openssl/mdc2.h>
117	#endif
118	#endif
119	#ifndef OPENSSL_NO_AES
120	#include <openssl/aes.h>
121	#endif
122		77
123	/*	78	/*
124	#define EVP_RC2_KEY_SIZE 16	79	#define EVP_RC2_KEY_SIZE 16
@@ -136,18 +91,6 @@
136	/* Default PKCS#5 iteration count */	91	/* Default PKCS#5 iteration count */
137	#define PKCS5_DEFAULT_ITER 2048	92	#define PKCS5_DEFAULT_ITER 2048
138		93
139	#ifndef OPENSSL_NO_RSA
140	#include <openssl/rsa.h>
141	#endif
142
143	#ifndef OPENSSL_NO_DSA
144	#include <openssl/dsa.h>
145	#endif
146
147	#ifndef OPENSSL_NO_DH
148	#include <openssl/dh.h>
149	#endif
150
151	#include <openssl/objects.h>	94	#include <openssl/objects.h>
152		95
153	#define EVP_PK_RSA 0x0001	96	#define EVP_PK_RSA 0x0001