From c788e5936564c6b4927f7236a79aac20b5673986 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 22 Mar 2006 11:26:57 +0000 Subject: [PATCH] VMS doesn't support includes of paths very well. --- crypto/crypto-lib.com | 6 +++--- crypto/evp/evp_pkey.c | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com index edf9dc0884..4074b71473 100644 --- a/crypto/crypto-lib.com +++ b/crypto/crypto-lib.com @@ -1016,7 +1016,7 @@ $ IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" - THEN CC = "CC/DECC" $ CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + - "/NOLIST/PREFIX=ALL" + - - "/INCLUDE=(SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP])" + - + "/INCLUDE=(SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP],SYS$DISK:[.ASN1])" + - CCEXTRAFLAGS $! $! Define The Linker Options File Name. @@ -1050,7 +1050,7 @@ $ EXIT $ ENDIF $ IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC" $ CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + - - "/INCLUDE=(SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS])" + - + "/INCLUDE=(SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP],SYS$DISK:[.ASN1])" + - CCEXTRAFLAGS $ CCDEFS = """VAXC""," + CCDEFS $! @@ -1082,7 +1082,7 @@ $! $! Use GNU C... $! $ CC = "GCC/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + - - "/INCLUDE=(SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS])" + - + "/INCLUDE=(SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP],SYS$DISK:[.ASN1])" + - CCEXTRAFLAGS $! $! Define The Linker Options File Name. diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c index eea4705063..f3eca2b87e 100644 --- a/crypto/evp/evp_pkey.c +++ b/crypto/evp/evp_pkey.c @@ -69,7 +69,11 @@ #endif #include +#ifdef FLAT_INC +#include "asn1_locl.h" +#else #include "../asn1/asn1_locl.h" +#endif /* Extract a private key from a PKCS8 structure */ -- 2.25.1