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:
This commit is contained in:
		@@ -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);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user