Update from 1.0.0-stable

diff --git a/apps/install.com b/apps/install.com
index 080415e62e1dfd339df742fa8bac49c33e7910ca..c5821b40e3cf71f83d0408a5adecde570660ebcc 100644 (file)
--- 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 92d9a5e7a3f06a416de06bca9a2ddac6dded3646..6bbe37d8807cca6ec9060428f404066bc26e114f 100644 (file)
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -192,7 +192,7 @@ $ LIB_CAMELLIA = "camellia,cmll_misc,cmll_ecb,cmll_cbc,cmll_ofb,"+ -
 $ LIB_SEED = "seed,seed_ecb,seed_cbc,seed_cfb,seed_ofb"
 $ LIB_MODES = "cbc128,ctr128,cfb128,ofb128"
 $ LIB_BN_ASM = "[.asm]vms.mar,vms-helper"
-$ IF F$TRNLNM("OPENSSL_NO_ASM").OR.ARCH.EQS."AXP" 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 9940178a6de77ed0f0ed00598bd10b9126df9cb4..2cc2e0fa961e3ffceb6c463908f017ae2fa02842 100644 (file)
--- a/crypto/symhacks.h
+++ b/crypto/symhacks.h
@@ -138,6 +138,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/ssl/dtls1.h b/ssl/dtls1.h
index c4d3a75111a6c0256dccf1644767c39292c76525..472fe91f13e7299e28e20c294c4c503e6b57f390 100644 (file)
--- a/ssl/dtls1.h
+++ b/ssl/dtls1.h
@@ -57,8 +57,14 @@
  *
  */
 
-#ifndef HEADER_DTLS1_H 
-#define HEADER_DTLS1_H 
+#ifndef HEADER_DTLS1_H
+#define HEADER_DTLS1_H
+
+/* Unless _XOPEN_SOURCE_EXTENDED is defined, struct timeval will not be
+   properly defined with DEC C, at least on VMS */
+#if defined(__DECC) || defined(__DECCXX)
+#define _XOPEN_SOURCE_EXTENDED
+#endif
 
 #include <openssl/buffer.h>
 #include <openssl/pqueue.h>