Commit d095b68d authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

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.
parent 508999fa

ssl/s3_clnt.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

ssl/s3_srvr.c

+1 −0
Original line number Diff line number Diff line
@@ -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

ssl/ssl.h

+7 −5
Original line number Diff line number Diff line
@@ -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

ssl/ssl_cert.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

ssl/ssl_locl.h

+0 −3
Original line number Diff line number Diff line
@@ -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>