summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorGeoff Thorpe <geoff@openssl.org>2004-04-19 18:09:28 +0000
committerGeoff Thorpe <geoff@openssl.org>2004-04-19 18:09:28 +0000
commit60a938c6bca4c0890ed2d320e29fb43c970094d5 (patch)
treeb4d6fa7ae1a0c24e30e9ef5edcec0d5a88fd9f5f /ssl
parent3a87a9b9db07f8d3c6d9aa7f20e01f053007a703 (diff)
(oops) Apologies all, that last header-cleanup commit was from the wrong
tree. This further reduces header interdependencies, and makes some associated cleanups.
Diffstat (limited to 'ssl')
-rw-r--r--ssl/s2_lib.c1
-rw-r--r--ssl/s3_clnt.c1
-rw-r--r--ssl/s3_lib.c1
-rw-r--r--ssl/s3_srvr.c1
-rw-r--r--ssl/ssl_cert.c1
-rw-r--r--ssl/ssl_lib.c1
-rw-r--r--ssl/ssl_locl.h2
-rw-r--r--ssl/ssltest.c3
8 files changed, 10 insertions, 1 deletions
diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index 4a86ac2dd6..075e49dc83 100644
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -59,7 +59,6 @@
#include "ssl_locl.h"
#ifndef OPENSSL_NO_SSL2
#include <stdio.h>
-#include <openssl/rsa.h>
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/md5.h>
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 09f6c8d3ab..8feb24a142 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -130,6 +130,7 @@
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/md5.h>
+#include <openssl/dh.h>
static SSL_METHOD *ssl3_get_client_method(int ver);
static int ssl3_client_hello(SSL *s);
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 1ff9e3093b..adeb3418a9 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -127,6 +127,7 @@
#include "ssl_locl.h"
#include "kssl_lcl.h"
#include <openssl/md5.h>
+#include <openssl/dh.h>
const char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index be92932bb6..cd96d67db7 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -133,6 +133,7 @@
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
+#include <openssl/dh.h>
#ifndef OPENSSL_NO_KRB5
#include <openssl/krb5_asn.h>
#endif
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 9fa4e61633..aa074e499d 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -133,6 +133,7 @@
#include <openssl/bio.h>
#include <openssl/pem.h>
#include <openssl/x509v3.h>
+#include <openssl/dh.h>
#include "ssl_locl.h"
int SSL_get_ex_data_X509_STORE_CTX_idx(void)
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index b7b2e4086a..7da3dda900 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -125,6 +125,7 @@
#include <openssl/objects.h>
#include <openssl/lhash.h>
#include <openssl/x509v3.h>
+#include <openssl/dh.h>
const char *SSL_version_str=OPENSSL_VERSION_TEXT;
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 26e518ade7..9b03123ab1 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -130,6 +130,8 @@
#include <openssl/evp.h>
#include <openssl/stack.h>
#include <openssl/x509.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
#include <openssl/symhacks.h>
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 68eb654572..9e95bf6a6e 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -138,6 +138,9 @@
#endif
#include <openssl/err.h>
#include <openssl/rand.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/dh.h>
#define _XOPEN_SOURCE_EXTENDED 1 /* Or gethostname won't be declared properly
on Compaq platforms (at least with DEC C).