summaryrefslogtreecommitdiff
path: root/ssl/s3_enc.c
diff options
context:
space:
mode:
authorjaenicke <jaenicke>2002-07-10 07:01:33 +0000
committerjaenicke <jaenicke>2002-07-10 07:01:33 +0000
commitb084f445aa23de0ebf295b79bc5fe1292eadb037 (patch)
tree593c4d74b4049219c42c4a69a47dea0cc0c5f60c /ssl/s3_enc.c
parentf14cb5cabd196b9a96d12652c9f3fc2745106b05 (diff)
downloadopenssl-b084f445aa23de0ebf295b79bc5fe1292eadb037.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/s3_enc.c')
-rw-r--r--ssl/s3_enc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 2bb5be49f..888a9a286 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]={