Commit 9fc25706 authored by Richard Levitte's avatar Richard Levitte
Browse files

It's not just VMS that needs some symbols to be hacked. Let's 

centralise those hacks in crypto/symhacks.h and use it everywhere it's
needed.
parent 79d2eb64

VMS/install.com

+2 −4
Original line number Diff line number Diff line
@@ -34,10 +34,8 @@ $ IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN - 
$	IF F$PARSE("WRK_SSLROOT:[VMS]") .EQS. "" THEN -

	   CREATE/DIR/LOG WRK_SSLROOT:[VMS]

$

$	EXHEADER := vms_idhacks.h

$

$	COPY 'EXHEADER' WRK_SSLINCLUDE: /LOG

$	SET FILE/PROT=WORLD:RE WRK_SSLINCLUDE:'EXHEADER'

$	IF F$SEARCH("WRK_SSLINCLUDE:vms_idhacks.h") .NES. "" THEN -

	   DELETE WRK_SSLINCLUDE:vms_idhacks.h;*

$

$	OPEN/WRITE SF WRK_SSLROOT:[VMS]OPENSSL_STARTUP.COM

$	WRITE SYS$OUTPUT "%OPEN-I-CREATED,  ",F$SEARCH("WRK_SSLROOT:[VMS]OPENSSL_STARTUP.COM")," created."

crypto/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdi 


SRC= $(LIBSRC)



EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h

EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h symhacks.h

HEADER=	cryptlib.h buildinf.h md32_common.h $(EXHEADER)



ALL=    $(GENERAL) $(SRC) $(HEADER)

crypto/crypto.h

+3 −10
Original line number Diff line number Diff line
@@ -73,10 +73,9 @@ 
#include <openssl/ebcdic.h>

#endif



#if defined(VMS) || defined(__VMS)

#include "vms_idhacks.h"

#endif



/* Resolve problems on some operating systems with symbol names that clash

   one way or another */

#include <openssl/symhacks.h>



#ifdef  __cplusplus

extern "C" {
@@ -275,12 +274,6 @@ int CRYPTO_is_mem_check_on(void); 
#define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)





/* Case insensiteve linking causes problems.... */

#if defined(WIN16) || defined(VMS)

#define ERR_load_CRYPTO_strings	ERR_load_CRYPTOlib_strings

#endif





const char *SSLeay_version(int type);

unsigned long SSLeay(void);

crypto/install.com

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ $ SDIRS := ,MD2,MD5,SHA,MDC2,HMAC,RIPEMD,- 
		 BUFFER,BIO,STACK,LHASH,RAND,ERR,OBJECTS,-

		 EVP,ASN1,PEM,X509,X509V3,-

		 CONF,TXT_DB,PKCS7,PKCS12,COMP

$	EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h

$	EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h

$	EXHEADER_MD2 := md2.h

$	EXHEADER_MD5 := md5.h

$	EXHEADER_SHA := sha.h

crypto/pem/pem.h

+1 −3
Original line number Diff line number Diff line
@@ -531,9 +531,7 @@ void PEM_dek_info(char *buf, const char *type, int len, char *str); 


#ifndef SSLEAY_MACROS



#ifdef VMS

#include <openssl/vms_idhacks.h>

#endif

#include <openssl/symhacks.h>



DECLARE_PEM_rw(X509, X509)