summaryrefslogtreecommitdiffstats
path: root/ssl/s3_both.c
diff options
context:
space:
mode:
authorLutz Jänicke <jaenicke@openssl.org>2002-07-10 07:01:54 +0000
committerLutz Jänicke <jaenicke@openssl.org>2002-07-10 07:01:54 +0000
commit7b63c0fa8c309bed7848b5ca5810ae9e2f2fb3c1 (patch)
treeb17353bbf0eb8e7e4452b1c5044d84b6c0bc4e11 /ssl/s3_both.c
parent063a8905bfd53f3cc12a01789efc23c0ea6af053 (diff)
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/s3_both.c')
-rw-r--r--ssl/s3_both.c2
1 files changed, 1 insertions, 1 deletions
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)