From: Dr. Stephen Henson Date: Thu, 23 Jan 2014 17:13:37 +0000 (+0000) Subject: make update X-Git-Tag: OpenSSL_1_0_2-beta1~96 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f4742b48c8ce2d1474bccf4c3df9152cfbc3040;p=openssl make update --- diff --git a/crypto/x509/Makefile b/crypto/x509/Makefile index 1cbb9a85d2..cfbb59c37d 100644 --- a/crypto/x509/Makefile +++ b/crypto/x509/Makefile @@ -312,7 +312,7 @@ x509_vfy.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h x509_vfy.o: ../../include/openssl/sha.h ../../include/openssl/stack.h x509_vfy.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_vfy.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -x509_vfy.o: ../cryptlib.h x509_vfy.c +x509_vfy.o: ../cryptlib.h vpm_int.h x509_vfy.c x509_vpm.o: ../../e_os.h ../../include/openssl/asn1.h x509_vpm.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509_vpm.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h @@ -326,7 +326,7 @@ x509_vpm.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h x509_vpm.o: ../../include/openssl/sha.h ../../include/openssl/stack.h x509_vpm.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h x509_vpm.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -x509_vpm.o: ../cryptlib.h x509_vpm.c +x509_vpm.o: ../cryptlib.h vpm_int.h x509_vpm.c x509cset.o: ../../e_os.h ../../include/openssl/asn1.h x509cset.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x509cset.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h diff --git a/util/libeay.num b/util/libeay.num index ca7477b117..23d0aaf619 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -4356,13 +4356,15 @@ CMS_RecipientInfo_kari_decrypt 4724 EXIST::FUNCTION:CMS CMS_SignerInfo_get0_pkey_ctx 4725 EXIST::FUNCTION:CMS ECDSA_METHOD_set_flags 4726 EXIST::FUNCTION:ECDSA ECDSA_METHOD_set_sign_setup 4727 EXIST::FUNCTION:ECDSA -CMS_RecipientInfo_kari_orig_id_cmp 4728 EXIST::FUNCTION:CMS +CMS_RecipientInfo_kari_orig_id_cmp 4728 EXIST:!VMS:FUNCTION:CMS +CMS_RecipInfo_kari_orig_id_cmp 4728 EXIST:VMS:FUNCTION:CMS CMS_RecipientInfo_kari_get0_alg 4729 EXIST::FUNCTION:CMS EVP_aes_192_wrap 4730 EXIST::FUNCTION:AES EVP_aes_128_cbc_hmac_sha256 4731 EXIST::FUNCTION:AES,SHA256 DH_compute_key_padded 4732 EXIST::FUNCTION:DH ECDSA_METHOD_set_sign 4733 EXIST::FUNCTION:ECDSA -CMS_RecipientEncryptedKey_cert_cmp 4734 EXIST::FUNCTION:CMS +CMS_RecipientEncryptedKey_cert_cmp 4734 EXIST:!VMS:FUNCTION:CMS +CMS_RecipEncryptedKey_cert_cmp 4734 EXIST:VMS:FUNCTION:CMS DH_KDF_X9_42 4735 EXIST::FUNCTION:DH RSA_OAEP_PARAMS_free 4736 EXIST::FUNCTION:RSA EVP_des_ede3_wrap 4737 EXIST::FUNCTION:DES @@ -4371,21 +4373,29 @@ RSA_OAEP_PARAMS_it 4738 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI ASN1_TIME_diff 4739 EXIST::FUNCTION: EVP_aes_256_cbc_hmac_sha256 4740 EXIST::FUNCTION:AES,SHA256 CMS_SignerInfo_get0_signature 4741 EXIST::FUNCTION:CMS -CMS_RecipientInfo_kari_get0_reks 4742 EXIST::FUNCTION:CMS +CMS_RecipientInfo_kari_get0_reks 4742 EXIST:!VMS:FUNCTION:CMS +CMS_RecipInfo_kari_get0_reks 4742 EXIST:VMS:FUNCTION:CMS EVP_aes_128_wrap 4743 EXIST::FUNCTION:AES CMS_SignerInfo_get0_md_ctx 4744 EXIST::FUNCTION:CMS OPENSSL_gmtime_diff 4745 EXIST::FUNCTION: -CMS_RecipientInfo_kari_set0_pkey 4746 EXIST::FUNCTION:CMS +CMS_RecipientInfo_kari_set0_pkey 4746 EXIST:!VMS:FUNCTION:CMS +CMS_RecipInfo_kari_set0_pkey 4746 EXIST:VMS:FUNCTION:CMS i2d_RSA_OAEP_PARAMS 4747 EXIST::FUNCTION:RSA d2i_RSA_OAEP_PARAMS 4748 EXIST::FUNCTION:RSA ECDH_KDF_X9_62 4749 EXIST::FUNCTION:ECDH CMS_RecipientInfo_kari_get0_ctx 4750 EXIST::FUNCTION:CMS ECDSA_METHOD_new 4751 EXIST::FUNCTION:ECDSA CMS_RecipientInfo_get0_pkey_ctx 4752 EXIST::FUNCTION:CMS -CMS_RecipientEncryptedKey_get0_id 4753 EXIST::FUNCTION:CMS -RSA_padding_check_PKCS1_OAEP_mgf1 4754 EXIST::FUNCTION:RSA +CMS_RecipientEncryptedKey_get0_id 4753 EXIST:!VMS:FUNCTION:CMS +CMS_RecipEncryptedKey_get0_id 4753 EXIST:VMS:FUNCTION:CMS +RSA_padding_check_PKCS1_OAEP_mgf1 4754 EXIST:!VMS:FUNCTION:RSA +RSA_pad_check_PKCS1_OAEP_mgf1 4754 EXIST:VMS:FUNCTION:RSA ECDSA_METHOD_set_verify 4755 EXIST::FUNCTION:ECDSA CMS_SharedInfo_encode 4756 EXIST::FUNCTION:CMS RSA_padding_add_PKCS1_OAEP_mgf1 4757 EXIST::FUNCTION:RSA -CMS_RecipientInfo_kari_get0_orig_id 4758 EXIST::FUNCTION:CMS +CMS_RecipientInfo_kari_get0_orig_id 4758 EXIST:!VMS:FUNCTION:CMS +CMS_RecipInfo_kari_get0_orig_id 4758 EXIST:VMS:FUNCTION:CMS ECDSA_METHOD_free 4759 EXIST::FUNCTION:ECDSA +X509_VERIFY_PARAM_get_count 4760 EXIST::FUNCTION: +X509_VERIFY_PARAM_get0_name 4761 EXIST::FUNCTION: +X509_VERIFY_PARAM_get0 4762 EXIST::FUNCTION: diff --git a/util/ssleay.num b/util/ssleay.num index b8e9d0191b..6ca1c47c2b 100755 --- a/util/ssleay.num +++ b/util/ssleay.num @@ -365,3 +365,6 @@ SSL_CONF_cmd_value_type 403 EXIST::FUNCTION: DTLSv1_2_method 404 EXIST::FUNCTION: DTLS_server_method 405 EXIST::FUNCTION: SSL_CTX_use_serverinfo_file 406 EXIST::FUNCTION:STDIO,TLSEXT +SSL_get0_param 407 EXIST::FUNCTION: +SSL_CTX_get0_param 408 EXIST::FUNCTION: +SSL_CTX_get_ssl_method 409 EXIST::FUNCTION: