Deprecate quite a few recursive includes from the ssl.h API header and

remove some unnecessary includes from the internal header ssl_locl.h. This
then requires adding includes for bn.h in four C files.

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 8feb24a1424500ff5cc5bf668e17061aae17087c..56dbf75fe3d48750d14ed65d41e9bb0d2aecfc30 100644 (file)
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -131,6 +131,7 @@
 #include <openssl/evp.h>
 #include <openssl/md5.h>
 #include <openssl/dh.h>
+#include <openssl/bn.h>
 
 static SSL_METHOD *ssl3_get_client_method(int ver);
 static int ssl3_client_hello(SSL *s);

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index cd96d67db7319d673c350d2b5aeba4ae15b67bc9..898f49810c3f4b4cb67d571cf332b8cb5e930d3f 100644 (file)
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -134,6 +134,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/dh.h>
+#include <openssl/bn.h>
 #ifndef OPENSSL_NO_KRB5
 #include <openssl/krb5_asn.h>
 #endif

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 8a16d77ac4e78ba55c4705ca1307df6b4ee3076c..04909c829a0d77eb0a79a93f2d45fa1e8c535927 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -178,9 +178,16 @@
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
+#ifndef OPENSSL_NO_DEPRECATED
 #ifndef OPENSSL_NO_X509
 #include <openssl/x509.h>
 #endif
+#include <openssl/crypto.h>
+#include <openssl/lhash.h>
+#include <openssl/buffer.h>
+#endif
+#include <openssl/pem.h>
+
 #include <openssl/kssl.h>
 #include <openssl/safestack.h>
 #include <openssl/symhacks.h>
@@ -318,11 +325,6 @@ extern "C" {
 }
 #endif
 
-#include <openssl/crypto.h>
-#include <openssl/lhash.h>
-#include <openssl/buffer.h>
-#include <openssl/pem.h>
-
 #ifdef  __cplusplus
 extern "C" {
 #endif

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index aa074e499db36df1610fa0d12a08cd3687b04c7d..258da8b21d134dd0ad26ab53a4d8d973b50ada77 100644 (file)
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -134,6 +134,7 @@
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/dh.h>
+#include <openssl/bn.h>
 #include "ssl_locl.h"
 
 int SSL_get_ex_data_X509_STORE_CTX_idx(void)

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 9b03123ab1154b4aa82d3d5c0d556497a08fa4d3..9c1fddd25cd8573a3388c8c06f79ead792e6ebfd 100644 (file)
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -126,10 +126,7 @@
 #include <openssl/buffer.h>
 #include <openssl/comp.h>
 #include <openssl/bio.h>
-#include <openssl/crypto.h>
-#include <openssl/evp.h>
 #include <openssl/stack.h>
-#include <openssl/x509.h>
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 #include <openssl/err.h>

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index aadfd899d08b6ca79dfa9ec4362dbd60aa1c60e0..f0b3c93ba5f0c6b2b7085e722fb0572e182fc4b9 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -141,6 +141,7 @@
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 #include <openssl/dh.h>
+#include <openssl/bn.h>
 
 #define _XOPEN_SOURCE_EXTENDED 1 /* Or gethostname won't be declared properly
                                     on Compaq platforms (at least with DEC C).