summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2009-11-12 16:59:18 +0000
committerRichard Levitte <levitte@openssl.org>2009-11-12 16:59:18 +0000
commite333a8d6735105199dcda0334d60d59d0cca18a4 (patch)
treea23ccd2d639dc75eed39c2f8c1aab4f30bd934bd
parent89a6daac00bc11654a6c919653dccf6cc728d8f2 (diff)
Updated from 1.0.0-stable.
-rw-r--r--apps/install.com2
-rw-r--r--crypto/crypto-lib.com3
-rw-r--r--crypto/symhacks.h2
-rwxr-xr-xmakevms.com2
4 files changed, 6 insertions, 3 deletions
diff --git a/apps/install.com b/apps/install.com
index 080415e62e..c5821b40e3 100644
--- a/apps/install.com
+++ b/apps/install.com
@@ -57,7 +57,7 @@ $ LOOP_EXE_END:
$
$ SET NOON
$ COPY CA.COM WRK_SSLEXE:CA.COM/LOG
-$ SET FILE/PROT=W:RE WRK_SSLVEXE:CA.COM
+$ SET FILE/PROT=W:RE WRK_SSLEXE:CA.COM
$ COPY OPENSSL-VMS.CNF WRK_SSLROOT:[000000]OPENSSL.CNF/LOG
$ SET FILE/PROT=W:R WRK_SSLROOT:[000000]OPENSSL.CNF
$ SET ON
diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index a59a408866..99609d0b74 100644
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -191,7 +191,8 @@ $ LIB_CAMELLIA = "camellia,cmll_misc,cmll_ecb,cmll_cbc,cmll_ofb,"+ -
"cmll_cfb,cmll_ctr"
$ LIB_SEED = "seed,seed_cbc,seed_ecb,seed_cfb,seed_ofb"
$ LIB_BN_ASM = "[.asm]vms.mar,vms-helper"
-$ IF F$TRNLNM("OPENSSL_NO_ASM") THEN LIB_BN_ASM = "bn_asm"
+$ IF F$TRNLNM("OPENSSL_NO_ASM") .OR. ARCH .NES. "VAX" THEN -
+ LIB_BN_ASM = "bn_asm"
$ LIB_BN = "bn_add,bn_div,bn_exp,bn_lib,bn_ctx,bn_mul,bn_mod,"+ -
"bn_print,bn_rand,bn_shift,bn_word,bn_blind,"+ -
"bn_kron,bn_sqrt,bn_gcd,bn_prime,bn_err,bn_sqr,"+LIB_BN_ASM+","+ -
diff --git a/crypto/symhacks.h b/crypto/symhacks.h
index 826204e857..71c9ec041f 100644
--- a/crypto/symhacks.h
+++ b/crypto/symhacks.h
@@ -142,6 +142,8 @@
#define X509_policy_node_get0_qualifiers X509_pcy_node_get0_qualifiers
#undef X509_STORE_CTX_get_explicit_policy
#define X509_STORE_CTX_get_explicit_policy X509_STORE_CTX_get_expl_policy
+#undef X509_STORE_CTX_get0_current_issuer
+#define X509_STORE_CTX_get0_current_issuer X509_STORE_CTX_get0_cur_issuer
/* Hack some long CRYPTO names */
#undef CRYPTO_set_dynlock_destroy_callback
diff --git a/makevms.com b/makevms.com
index ec5a5c9faf..2c8fc24c02 100755
--- a/makevms.com
+++ b/makevms.com
@@ -349,7 +349,7 @@ $ ENDIF
$!
$! There are many places where this is needed.
$!
-$ WRITE H_FILE "#define _XOPEN_SOURCE_EXTENDED"
+$!!! WRITE H_FILE "#define _XOPEN_SOURCE_EXTENDED"
$!
$! Close the [.CRYPTO.<ARCH>]OPENSSLCONF.H file
$!