diff options
author | Lutz Jänicke <jaenicke@openssl.org> | 2002-07-10 07:01:54 +0000 |
---|---|---|
committer | Lutz Jänicke <jaenicke@openssl.org> | 2002-07-10 07:01:54 +0000 |
commit | 7b63c0fa8c309bed7848b5ca5810ae9e2f2fb3c1 (patch) | |
tree | b17353bbf0eb8e7e4452b1c5044d84b6c0bc4e11 /ssl | |
parent | 063a8905bfd53f3cc12a01789efc23c0ea6af053 (diff) | |
download | openssl-7b63c0fa8c309bed7848b5ca5810ae9e2f2fb3c1.tar.gz |
Reorder inclusion of header files:
des_old.h redefines crypt:
#define crypt(b,s)\
DES_crypt((b),(s))
This scheme leads to failure, if header files with the OS's true definition
of crypt() are processed _after_ des_old.h was processed. This is e.g. the
case on HP-UX with unistd.h.
As evp.h now again includes des.h (which includes des_old.h), this problem
only came up after this modification.
Solution: move header files (indirectly) including e_os.h before the header
files (indirectly) including evp.h.
Submitted by:
Reviewed by:
PR:
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/s23_clnt.c | 2 | ||||
-rw-r--r-- | ssl/s23_pkt.c | 2 | ||||
-rw-r--r-- | ssl/s23_srvr.c | 2 | ||||
-rw-r--r-- | ssl/s3_both.c | 2 | ||||
-rw-r--r-- | ssl/s3_clnt.c | 4 | ||||
-rw-r--r-- | ssl/s3_enc.c | 2 | ||||
-rw-r--r-- | ssl/s3_pkt.c | 2 | ||||
-rw-r--r-- | ssl/s3_srvr.c | 4 | ||||
-rw-r--r-- | ssl/ssl_asn1.c | 2 | ||||
-rw-r--r-- | ssl/ssl_lib.c | 4 | ||||
-rw-r--r-- | ssl/ssl_rsa.c | 2 | ||||
-rw-r--r-- | ssl/t1_clnt.c | 2 | ||||
-rw-r--r-- | ssl/t1_enc.c | 2 | ||||
-rw-r--r-- | ssl/t1_srvr.c | 2 |
14 files changed, 17 insertions, 17 deletions
diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c index b2be8340fb..019e9aecee 100644 --- a/ssl/s23_clnt.c +++ b/ssl/s23_clnt.c @@ -57,11 +57,11 @@ */ #include <stdio.h> +#include "ssl_locl.h" #include <openssl/buffer.h> #include <openssl/rand.h> #include <openssl/objects.h> #include <openssl/evp.h> -#include "ssl_locl.h" static SSL_METHOD *ssl23_get_client_method(int ver); static int ssl23_client_hello(SSL *s); diff --git a/ssl/s23_pkt.c b/ssl/s23_pkt.c index f45e1ce3d8..4ca6a1b258 100644 --- a/ssl/s23_pkt.c +++ b/ssl/s23_pkt.c @@ -59,9 +59,9 @@ #include <stdio.h> #include <errno.h> #define USE_SOCKETS +#include "ssl_locl.h" #include <openssl/evp.h> #include <openssl/buffer.h> -#include "ssl_locl.h" int ssl23_write_bytes(SSL *s) { diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c index 9e89cc7f9a..8743b61cbb 100644 --- a/ssl/s23_srvr.c +++ b/ssl/s23_srvr.c @@ -110,11 +110,11 @@ */ #include <stdio.h> +#include "ssl_locl.h" #include <openssl/buffer.h> #include <openssl/rand.h> #include <openssl/objects.h> #include <openssl/evp.h> -#include "ssl_locl.h" static SSL_METHOD *ssl23_get_server_method(int ver); int ssl23_get_client_hello(SSL *s); diff --git a/ssl/s3_both.c b/ssl/s3_both.c index 58a24cd883..8864366f59 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -112,12 +112,12 @@ #include <limits.h> #include <string.h> #include <stdio.h> +#include "ssl_locl.h" #include <openssl/buffer.h> #include <openssl/rand.h> #include <openssl/objects.h> #include <openssl/evp.h> #include <openssl/x509.h> -#include "ssl_locl.h" /* send s->init_buf in records of type 'type' (SSL3_RT_HANDSHAKE or SSL3_RT_CHANGE_CIPHER_SPEC) */ int ssl3_do_write(SSL *s, int type) diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index e5853ede95..bd9ce5db55 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -110,12 +110,12 @@ */ #include <stdio.h> +#include "ssl_locl.h" +#include "kssl_lcl.h" #include <openssl/buffer.h> #include <openssl/rand.h> #include <openssl/objects.h> #include <openssl/evp.h> -#include "ssl_locl.h" -#include "kssl_lcl.h" #include <openssl/md5.h> static SSL_METHOD *ssl3_get_client_method(int ver); diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index 2bb5be49f1..888a9a2868 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -110,8 +110,8 @@ */ #include <stdio.h> -#include <openssl/evp.h> #include "ssl_locl.h" +#include <openssl/evp.h> #include <openssl/md5.h> static unsigned char ssl3_pad_1[48]={ diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index 43e8502b66..6ccea9aee5 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -112,9 +112,9 @@ #include <stdio.h> #include <errno.h> #define USE_SOCKETS +#include "ssl_locl.h" #include <openssl/evp.h> #include <openssl/buffer.h> -#include "ssl_locl.h" static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, unsigned int len, int create_empty_fragment); diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 99b6a86983..270afb8166 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -114,14 +114,14 @@ #include <stdio.h> +#include "ssl_locl.h" +#include "kssl_lcl.h" #include <openssl/buffer.h> #include <openssl/rand.h> #include <openssl/objects.h> #include <openssl/evp.h> #include <openssl/x509.h> #include <openssl/krb5_asn.h> -#include "ssl_locl.h" -#include "kssl_lcl.h" #include <openssl/md5.h> static SSL_METHOD *ssl3_get_server_method(int ver); diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c index c5eeeb6bc5..b1c2d17153 100644 --- a/ssl/ssl_asn1.c +++ b/ssl/ssl_asn1.c @@ -58,10 +58,10 @@ #include <stdio.h> #include <stdlib.h> +#include "ssl_locl.h" #include <openssl/asn1_mac.h> #include <openssl/objects.h> #include <openssl/x509.h> -#include "ssl_locl.h" typedef struct ssl_session_asn1_st { diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index df307a80c5..ab172aeaec 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -116,11 +116,11 @@ # include <assert.h> #endif #include <stdio.h> +#include "ssl_locl.h" +#include "kssl_lcl.h" #include <openssl/objects.h> #include <openssl/lhash.h> #include <openssl/x509v3.h> -#include "ssl_locl.h" -#include "kssl_lcl.h" const char *SSL_version_str=OPENSSL_VERSION_TEXT; diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c index 1cf8e20934..03828b6632 100644 --- a/ssl/ssl_rsa.c +++ b/ssl/ssl_rsa.c @@ -57,12 +57,12 @@ */ #include <stdio.h> +#include "ssl_locl.h" #include <openssl/bio.h> #include <openssl/objects.h> #include <openssl/evp.h> #include <openssl/x509.h> #include <openssl/pem.h> -#include "ssl_locl.h" static int ssl_set_cert(CERT *c, X509 *x509); static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey); diff --git a/ssl/t1_clnt.c b/ssl/t1_clnt.c index 9745630a00..9ad518f9f4 100644 --- a/ssl/t1_clnt.c +++ b/ssl/t1_clnt.c @@ -57,11 +57,11 @@ */ #include <stdio.h> +#include "ssl_locl.h" #include <openssl/buffer.h> #include <openssl/rand.h> #include <openssl/objects.h> #include <openssl/evp.h> -#include "ssl_locl.h" static SSL_METHOD *tls1_get_client_method(int ver); static SSL_METHOD *tls1_get_client_method(int ver) diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 1f6bb2edf3..0b512aa70a 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -110,10 +110,10 @@ */ #include <stdio.h> +#include "ssl_locl.h" #include <openssl/comp.h> #include <openssl/evp.h> #include <openssl/hmac.h> -#include "ssl_locl.h" #include <openssl/md5.h> static void tls1_P_hash(const EVP_MD *md, const unsigned char *sec, diff --git a/ssl/t1_srvr.c b/ssl/t1_srvr.c index 996b7ca8e2..6e765e587f 100644 --- a/ssl/t1_srvr.c +++ b/ssl/t1_srvr.c @@ -57,12 +57,12 @@ */ #include <stdio.h> +#include "ssl_locl.h" #include <openssl/buffer.h> #include <openssl/rand.h> #include <openssl/objects.h> #include <openssl/evp.h> #include <openssl/x509.h> -#include "ssl_locl.h" static SSL_METHOD *tls1_get_server_method(int ver); static SSL_METHOD *tls1_get_server_method(int ver) |