[openssl-commits] [openssl] master update

Richard Levitte levitte at openssl.org
Tue Feb 28 19:17:04 UTC 2017


The branch master has been updated
       via  77baccd7fac7cf480e3a3981b7deae5ef3b812b9 (commit)
       via  96bc5d03b813a318403d45600e07d6bdcb41d195 (commit)
       via  38a322a5f29ae0b4a9bd42233310835487d875ac (commit)
      from  629192c1b9f17965e0a6b73229b7b1e004bfbd98 (commit)


- Log -----------------------------------------------------------------
commit 77baccd7fac7cf480e3a3981b7deae5ef3b812b9
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 28 20:00:56 2017 +0100

    Code health: make update
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2793)

commit 96bc5d03b813a318403d45600e07d6bdcb41d195
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 28 20:00:42 2017 +0100

    Code health: Remove VAX exceptions in util/mkdef.pl
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2793)

commit 38a322a5f29ae0b4a9bd42233310835487d875ac
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 28 19:57:33 2017 +0100

    Code health: Remove unused VAX transfer vector for engines
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2793)

-----------------------------------------------------------------------

Summary of changes:
 engines/engine_vector.mar | 24 ------------------------
 util/libcrypto.num        | 22 +++++++++++-----------
 util/mkdef.pl             | 32 +++-----------------------------
 3 files changed, 14 insertions(+), 64 deletions(-)
 delete mode 100644 engines/engine_vector.mar

diff --git a/engines/engine_vector.mar b/engines/engine_vector.mar
deleted file mode 100644
index 7d968e7..0000000
--- a/engines/engine_vector.mar
+++ /dev/null
@@ -1,24 +0,0 @@
-;
-; Transfer vector for VAX shareable image
-;
-	.TITLE ENGINE
-	.IDENT /ENGINE/
-;
-; Define macro to assist in building transfer vector entries.  Each entry
-; should take no more than 8 bytes.
-;
-	.MACRO FTRANSFER_ENTRY routine
-	.ALIGN QUAD
-	.TRANSFER routine
-	.MASK	routine
-	JMP	routine+2
-	.ENDM FTRANSFER_ENTRY
-;
-; Place entries in own program section.
-;
-	.PSECT $$ENGINE,QUAD,PIC,USR,CON,REL,LCL,SHR,EXE,RD,NOWRT
-ENGINE_xfer:
-	FTRANSFER_ENTRY bind_engine
-	FTRANSFER_ENTRY v_check
-	.BLKB 32768-<.-ENGINE_xfer>	; 64 pages total.
-	.END
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 363ab66..359b9b0 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -153,7 +153,7 @@ ENGINE_get_ctrl_function                153	1_1_0	EXIST::FUNCTION:ENGINE
 X509_REVOKED_get_ext_count              154	1_1_0	EXIST::FUNCTION:
 BN_is_prime_fasttest_ex                 155	1_1_0	EXIST::FUNCTION:
 ERR_load_PKCS12_strings                 156	1_1_0	EXIST::FUNCTION:
-EVP_sha384                              157	1_1_0	EXIST:!VMSVAX:FUNCTION:
+EVP_sha384                              157	1_1_0	EXIST::FUNCTION:
 i2d_DHparams                            158	1_1_0	EXIST::FUNCTION:DH
 TS_VERIFY_CTX_set_store                 159	1_1_0	EXIST::FUNCTION:TS
 PKCS12_verify_mac                       160	1_1_0	EXIST::FUNCTION:
@@ -1420,7 +1420,7 @@ EVP_MD_meth_get_cleanup                 1408	1_1_0	EXIST::FUNCTION:
 SRP_Calc_server_key                     1409	1_1_0	EXIST::FUNCTION:SRP
 BN_mod_exp_simple                       1410	1_1_0	EXIST::FUNCTION:
 BIO_set_ex_data                         1411	1_1_0	EXIST::FUNCTION:
-SHA512                                  1412	1_1_0	EXIST:!VMSVAX:FUNCTION:
+SHA512                                  1412	1_1_0	EXIST::FUNCTION:
 X509_STORE_CTX_get_explicit_policy      1413	1_1_0	EXIST::FUNCTION:
 EVP_DecodeBlock                         1414	1_1_0	EXIST::FUNCTION:
 OCSP_REQ_CTX_http                       1415	1_1_0	EXIST::FUNCTION:OCSP
@@ -1487,7 +1487,7 @@ X509V3_section_free                     1474	1_1_0	EXIST::FUNCTION:
 CRYPTO_mem_debug_free                   1475	1_1_0	EXIST::FUNCTION:CRYPTO_MDEBUG
 d2i_OCSP_REQUEST                        1476	1_1_0	EXIST::FUNCTION:OCSP
 ENGINE_get_cipher_engine                1477	1_1_0	EXIST::FUNCTION:ENGINE
-SHA384_Final                            1478	1_1_0	EXIST:!VMSVAX:FUNCTION:
+SHA384_Final                            1478	1_1_0	EXIST::FUNCTION:
 TS_RESP_CTX_set_certs                   1479	1_1_0	EXIST::FUNCTION:TS
 BN_MONT_CTX_free                        1480	1_1_0	EXIST::FUNCTION:
 BN_GF2m_mod_solve_quad_arr              1481	1_1_0	EXIST::FUNCTION:EC2M
@@ -2829,7 +2829,7 @@ CMS_RecipientInfo_encrypt               2786	1_1_0	EXIST::FUNCTION:CMS
 X509_get_pubkey_parameters              2787	1_1_0	EXIST::FUNCTION:
 PKCS12_setup_mac                        2788	1_1_0	EXIST::FUNCTION:
 PEM_read_bio_PKCS7                      2789	1_1_0	EXIST::FUNCTION:
-SHA512_Final                            2790	1_1_0	EXIST:!VMSVAX:FUNCTION:
+SHA512_Final                            2790	1_1_0	EXIST::FUNCTION:
 X509_VERIFY_PARAM_set1_host             2791	1_1_0	EXIST::FUNCTION:
 OCSP_resp_find_status                   2792	1_1_0	EXIST::FUNCTION:OCSP
 d2i_ASN1_T61STRING                      2793	1_1_0	EXIST::FUNCTION:
@@ -3010,7 +3010,7 @@ EC_curve_nid2nist                       2964	1_1_0	EXIST::FUNCTION:EC
 ENGINE_get_finish_function              2965	1_1_0	EXIST::FUNCTION:ENGINE
 EC_POINT_add                            2966	1_1_0	EXIST::FUNCTION:EC
 EC_KEY_oct2key                          2967	1_1_0	EXIST::FUNCTION:EC
-SHA384_Init                             2968	1_1_0	EXIST:!VMSVAX:FUNCTION:
+SHA384_Init                             2968	1_1_0	EXIST::FUNCTION:
 ASN1_UNIVERSALSTRING_new                2969	1_1_0	EXIST::FUNCTION:
 EVP_PKEY_print_private                  2970	1_1_0	EXIST::FUNCTION:
 ASN1_INTEGER_new                        2971	1_1_0	EXIST::FUNCTION:
@@ -3038,7 +3038,7 @@ EC_GROUP_set_asn1_flag                  2991	1_1_0	EXIST::FUNCTION:EC
 EVP_PKEY_new                            2992	1_1_0	EXIST::FUNCTION:
 i2d_POLICYINFO                          2993	1_1_0	EXIST::FUNCTION:
 BN_get_flags                            2994	1_1_0	EXIST::FUNCTION:
-SHA384                                  2995	1_1_0	EXIST:!VMSVAX:FUNCTION:
+SHA384                                  2995	1_1_0	EXIST::FUNCTION:
 NCONF_get_string                        2996	1_1_0	EXIST::FUNCTION:
 d2i_PROXY_CERT_INFO_EXTENSION           2997	1_1_0	EXIST::FUNCTION:
 EC_POINT_point2buf                      2998	1_1_0	EXIST::FUNCTION:EC
@@ -3093,7 +3093,7 @@ i2d_X509_PUBKEY                         3045	1_1_0	EXIST::FUNCTION:
 EVP_DecryptUpdate                       3046	1_1_0	EXIST::FUNCTION:
 CAST_cbc_encrypt                        3047	1_1_0	EXIST::FUNCTION:CAST
 BN_BLINDING_invert                      3048	1_1_0	EXIST::FUNCTION:
-SHA512_Update                           3049	1_1_0	EXIST:!VMSVAX:FUNCTION:
+SHA512_Update                           3049	1_1_0	EXIST::FUNCTION:
 ESS_ISSUER_SERIAL_new                   3050	1_1_0	EXIST::FUNCTION:TS
 PKCS12_SAFEBAG_get0_pkcs8               3051	1_1_0	EXIST::FUNCTION:
 X509_get_ext_by_NID                     3052	1_1_0	EXIST::FUNCTION:
@@ -3337,7 +3337,7 @@ d2i_DIST_POINT                          3289	1_1_0	EXIST::FUNCTION:
 EVP_PKEY_CTX_free                       3290	1_1_0	EXIST::FUNCTION:
 PBEPARAM_free                           3291	1_1_0	EXIST::FUNCTION:
 NETSCAPE_SPKI_set_pubkey                3292	1_1_0	EXIST::FUNCTION:
-EVP_sha512                              3293	1_1_0	EXIST:!VMSVAX:FUNCTION:
+EVP_sha512                              3293	1_1_0	EXIST::FUNCTION:
 X509_CRL_match                          3294	1_1_0	EXIST::FUNCTION:
 i2s_ASN1_IA5STRING                      3295	1_1_0	EXIST::FUNCTION:
 EC_KEY_get_default_method               3296	1_1_0	EXIST::FUNCTION:EC
@@ -3444,7 +3444,7 @@ d2i_PKCS8_PRIV_KEY_INFO_fp              3395	1_1_0	EXIST::FUNCTION:STDIO
 X509_OBJECT_retrieve_match              3396	1_1_0	EXIST::FUNCTION:
 EVP_aes_128_ctr                         3397	1_1_0	EXIST::FUNCTION:
 EVP_PBE_find                            3398	1_1_0	EXIST::FUNCTION:
-SHA512_Transform                        3399	1_1_0	EXIST:!VMSVAX:FUNCTION:
+SHA512_Transform                        3399	1_1_0	EXIST::FUNCTION:
 ERR_add_error_vdata                     3400	1_1_0	EXIST::FUNCTION:
 OCSP_REQUEST_get_ext                    3401	1_1_0	EXIST::FUNCTION:OCSP
 NETSCAPE_SPKAC_new                      3402	1_1_0	EXIST::FUNCTION:
@@ -3676,7 +3676,7 @@ PKCS5_pbe_set                           3631	1_1_0	EXIST::FUNCTION:
 TS_RESP_CTX_free                        3632	1_1_0	EXIST::FUNCTION:TS
 d2i_PUBKEY                              3633	1_1_0	EXIST::FUNCTION:
 ASYNC_cleanup_thread                    3634	1_1_0	EXIST::FUNCTION:
-SHA384_Update                           3635	1_1_0	EXIST:!VMSVAX:FUNCTION:
+SHA384_Update                           3635	1_1_0	EXIST::FUNCTION:
 CRYPTO_cfb128_1_encrypt                 3636	1_1_0	EXIST::FUNCTION:
 BIO_set_cipher                          3637	1_1_0	EXIST::FUNCTION:
 PEM_read_PUBKEY                         3638	1_1_0	EXIST::FUNCTION:STDIO
@@ -3951,7 +3951,7 @@ CRL_DIST_POINTS_free                    3899	1_1_0	EXIST::FUNCTION:
 d2i_OCSP_SINGLERESP                     3900	1_1_0	EXIST::FUNCTION:OCSP
 EVP_CIPHER_CTX_num                      3901	1_1_0	EXIST::FUNCTION:
 EVP_PKEY_verify_recover_init            3902	1_1_0	EXIST::FUNCTION:
-SHA512_Init                             3903	1_1_0	EXIST:!VMSVAX:FUNCTION:
+SHA512_Init                             3903	1_1_0	EXIST::FUNCTION:
 TS_MSG_IMPRINT_set_msg                  3904	1_1_0	EXIST::FUNCTION:TS
 CMS_unsigned_add1_attr                  3905	1_1_0	EXIST::FUNCTION:CMS
 OPENSSL_LH_doall                        3906	1_1_0	EXIST::FUNCTION:
diff --git a/util/mkdef.pl b/util/mkdef.pl
index d82c849..6bc23b1 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -63,8 +63,6 @@ my $do_ctest = 0;
 my $do_ctestall = 0;
 my $do_checkexist = 0;
 
-my $VMSVAX=0;
-my $VMSNonVAX=0;
 my $VMS=0;
 my $W32=0;
 my $NT=0;
@@ -154,18 +152,10 @@ foreach (@ARGV, split(/ /, $config{options}))
 		$W32 = 1;
 		$NT = 1;
 	}
-	if ($_ eq "VMS-VAX") {
-		$VMS=1;
-		$VMSVAX=1;
-	}
-	if ($_ eq "VMS-NonVAX") {
-		$VMS=1;
-		$VMSNonVAX=1;
-	}
 	if ($_ eq "linux") {
 		$linux=1;
 	}
-	$VMS=$VMSNonVAX=1 if $_ eq "VMS";
+	$VMS=1 if $_ eq "VMS";
 	if ($_ eq "zlib" || $_ eq "enable-zlib" || $_ eq "zlib-dynamic"
 			 || $_ eq "enable-zlib-dynamic") {
 		$zlib = 1;
@@ -981,19 +971,6 @@ sub do_defs
 	$platform{"PEM_write_NS_CERT_SEQ"} = "VMS";
 	$platform{"PEM_read_P8_PRIV_KEY_INFO"} = "VMS";
 	$platform{"PEM_write_P8_PRIV_KEY_INFO"} = "VMS";
-	$platform{"EVP_sha384"} = "!VMSVAX";
-	$platform{"EVP_sha512"} = "!VMSVAX";
-	$platform{"SHA384_Init"} = "!VMSVAX";
-	$platform{"SHA384_Transform"} = "!VMSVAX";
-	$platform{"SHA384_Update"} = "!VMSVAX";
-	$platform{"SHA384_Final"} = "!VMSVAX";
-	$platform{"SHA384"} = "!VMSVAX";
-	$platform{"SHA512_Init"} = "!VMSVAX";
-	$platform{"SHA512_Transform"} = "!VMSVAX";
-	$platform{"SHA512_Update"} = "!VMSVAX";
-	$platform{"SHA512_Final"} = "!VMSVAX";
-	$platform{"SHA512"} = "!VMSVAX";
-
 
 	# Info we know about
 
@@ -1118,17 +1095,14 @@ sub is_valid
 
 		if ($platforms) {
 			# platforms
-			if ($keyword eq "VMSVAX" && $VMSVAX) { return 1; }
-			if ($keyword eq "VMSNonVAX" && $VMSNonVAX) { return 1; }
 			if ($keyword eq "VMS" && $VMS) { return 1; }
 			if ($keyword eq "WIN32" && $W32) { return 1; }
 			if ($keyword eq "_WIN32" && $W32) { return 1; }
 			if ($keyword eq "WINNT" && $NT) { return 1; }
 			# Special platforms:
 			# EXPORT_VAR_AS_FUNCTION means that global variables
-			# will be represented as functions.  This currently
-			# only happens on VMS-VAX.
-			if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32)) {
+			# will be represented as functions.
+			if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && $W32) {
 				return 1;
 			}
 			if ($keyword eq "ZLIB" && $zlib) { return 1; }


More information about the openssl-commits mailing list