diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-07-19 21:46:40 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-07-19 22:57:37 +0100 |
| commit | 03c075e572d75d4a6410351f4637ec494bac9b61 (patch) | |
| tree | 973e295295d132a8fa89587d6490e70680597ebd | |
| parent | f8c03d4dbf43cadb14abffbe4d69eb6b4bdff50f (diff) | |
Windows build fixes.
Add cmac.h to mkdef.pl
Remove ENGINE_load_rsax from engine.h: no longer built.
Update ordinals
Reviewed-by: Tim Hudson <tjh@openssl.org>
| -rw-r--r-- | crypto/engine/engine.h | 1 | ||||
| -rwxr-xr-x | util/libeay.num | 348 | ||||
| -rwxr-xr-x | util/mkdef.pl | 1 | ||||
| -rwxr-xr-x | util/ssleay.num | 55 |
4 files changed, 276 insertions, 129 deletions
diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h index f8be497724..830d391f61 100644 --- a/crypto/engine/engine.h +++ b/crypto/engine/engine.h @@ -351,7 +351,6 @@ void ENGINE_load_gost(void); #endif #endif void ENGINE_load_cryptodev(void); -void ENGINE_load_rsax(void); void ENGINE_load_rdrand(void); void ENGINE_load_builtin_engines(void); diff --git a/util/libeay.num b/util/libeay.num index a5658774c6..303676cab0 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -2805,11 +2805,11 @@ ENGINE_setup_bsd_cryptodev 3246 EXIST:__FreeBSD__:FUNCTION:ENGINE ERR_release_err_state_table 3247 EXIST::FUNCTION:LHASH EVP_aes_128_cfb8 3248 EXIST::FUNCTION:AES FIPS_corrupt_rsa 3249 NOEXIST::FUNCTION: -FIPS_selftest_des 3250 EXIST:OPENSSL_FIPS:FUNCTION: +FIPS_selftest_des 3250 NOEXIST::FUNCTION: EVP_aes_128_cfb1 3251 EXIST::FUNCTION:AES EVP_aes_192_cfb8 3252 EXIST::FUNCTION:AES FIPS_mode_set 3253 EXIST::FUNCTION: -FIPS_selftest_dsa 3254 EXIST:OPENSSL_FIPS:FUNCTION: +FIPS_selftest_dsa 3254 NOEXIST::FUNCTION: EVP_aes_256_cfb8 3255 EXIST::FUNCTION:AES FIPS_allow_md5 3256 NOEXIST::FUNCTION: DES_ede3_cfb_encrypt 3257 EXIST::FUNCTION:DES @@ -2820,26 +2820,26 @@ AES_cfb8_encrypt 3261 EXIST::FUNCTION:AES FIPS_rand_seed 3262 NOEXIST::FUNCTION: FIPS_corrupt_des 3263 NOEXIST::FUNCTION: EVP_aes_192_cfb1 3264 EXIST::FUNCTION:AES -FIPS_selftest_aes 3265 EXIST:OPENSSL_FIPS:FUNCTION: +FIPS_selftest_aes 3265 NOEXIST::FUNCTION: FIPS_set_prng_key 3266 NOEXIST::FUNCTION: EVP_des_cfb8 3267 EXIST::FUNCTION:DES FIPS_corrupt_dsa 3268 NOEXIST::FUNCTION: FIPS_test_mode 3269 NOEXIST::FUNCTION: FIPS_rand_method 3270 NOEXIST::FUNCTION: EVP_aes_256_cfb1 3271 EXIST::FUNCTION:AES -ERR_load_FIPS_strings 3272 EXIST:OPENSSL_FIPS:FUNCTION: +ERR_load_FIPS_strings 3272 NOEXIST::FUNCTION: FIPS_corrupt_aes 3273 NOEXIST::FUNCTION: -FIPS_selftest_sha1 3274 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_selftest_rsa 3275 EXIST:OPENSSL_FIPS:FUNCTION: +FIPS_selftest_sha1 3274 NOEXIST::FUNCTION: +FIPS_selftest_rsa 3275 NOEXIST::FUNCTION: FIPS_corrupt_sha1 3276 NOEXIST::FUNCTION: EVP_des_cfb1 3277 EXIST::FUNCTION:DES FIPS_dsa_check 3278 NOEXIST::FUNCTION: AES_cfb1_encrypt 3279 EXIST::FUNCTION:AES EVP_des_ede3_cfb1 3280 EXIST::FUNCTION:DES -FIPS_rand_check 3281 EXIST:OPENSSL_FIPS:FUNCTION: +FIPS_rand_check 3281 NOEXIST::FUNCTION: FIPS_md5_allowed 3282 NOEXIST::FUNCTION: FIPS_mode 3283 EXIST::FUNCTION: -FIPS_selftest_failed 3284 EXIST:OPENSSL_FIPS:FUNCTION: +FIPS_selftest_failed 3284 NOEXIST::FUNCTION: sk_is_sorted 3285 EXIST::FUNCTION: X509_check_ca 3286 EXIST::FUNCTION: private_idea_set_encrypt_key 3287 NOEXIST::FUNCTION: @@ -2873,7 +2873,7 @@ EVP_sha384 3312 EXIST:!VMSVAX:FUNCTION:SHA,SHA512 EVP_sha512 3313 EXIST:!VMSVAX:FUNCTION:SHA,SHA512 EVP_sha224 3314 EXIST::FUNCTION:SHA,SHA256 EVP_sha256 3315 EXIST::FUNCTION:SHA,SHA256 -FIPS_selftest_hmac 3316 EXIST:OPENSSL_FIPS:FUNCTION: +FIPS_selftest_hmac 3316 NOEXIST::FUNCTION: FIPS_corrupt_rng 3317 NOEXIST::FUNCTION: BN_mod_exp_mont_consttime 3318 EXIST::FUNCTION: RSA_X931_hash_id 3319 EXIST::FUNCTION:RSA @@ -3673,14 +3673,14 @@ int_CRYPTO_set_do_dynlock_callback 4057 NOEXIST::FUNCTION: FIPS_rng_stick 4058 NOEXIST::FUNCTION: EVP_CIPHER_CTX_set_flags 4059 EXIST::FUNCTION: BN_X931_generate_prime_ex 4060 EXIST::FUNCTION: -FIPS_selftest_check 4061 EXIST:OPENSSL_FIPS:FUNCTION: +FIPS_selftest_check 4061 NOEXIST::FUNCTION: FIPS_rand_set_dt 4062 NOEXIST::FUNCTION: CRYPTO_dbg_pop_info 4063 NOEXIST::FUNCTION: FIPS_dsa_free 4064 EXIST:OPENSSL_FIPS:FUNCTION:DSA RSA_X931_derive_ex 4065 EXIST::FUNCTION:RSA -FIPS_rsa_new 4066 EXIST:OPENSSL_FIPS:FUNCTION: +FIPS_rsa_new 4066 NOEXIST::FUNCTION: FIPS_rand_bytes 4067 NOEXIST::FUNCTION: -fips_cipher_test 4068 EXIST:OPENSSL_FIPS:FUNCTION: +fips_cipher_test 4068 NOEXIST::FUNCTION: EVP_CIPHER_CTX_test_flags 4069 EXIST::FUNCTION: CRYPTO_malloc_debug_init 4070 NOEXIST::FUNCTION: CRYPTO_dbg_push_info 4071 NOEXIST::FUNCTION: @@ -3688,7 +3688,7 @@ FIPS_corrupt_rsa_keygen 4072 NOEXIST::FUNCTION: FIPS_dh_new 4073 EXIST:OPENSSL_FIPS:FUNCTION:DH FIPS_corrupt_dsa_keygen 4074 NOEXIST::FUNCTION: FIPS_dh_free 4075 EXIST:OPENSSL_FIPS:FUNCTION:DH -fips_pkey_signature_test 4076 EXIST:OPENSSL_FIPS:FUNCTION: +fips_pkey_signature_test 4076 NOEXIST::FUNCTION: EVP_add_alg_module 4077 EXIST::FUNCTION: int_RAND_init_engine_callbacks 4078 NOEXIST::FUNCTION: int_EVP_CIPHER_set_engine_callbacks 4079 NOEXIST::FUNCTION: @@ -3700,7 +3700,7 @@ int_RAND_set_callbacks 4084 NOEXIST::FUNCTION: BN_X931_derive_prime_ex 4085 EXIST::FUNCTION: int_ERR_lib_init 4086 NOEXIST::FUNCTION: int_EVP_CIPHER_init_engine_callbacks 4087 NOEXIST::FUNCTION: -FIPS_rsa_free 4088 EXIST:OPENSSL_FIPS:FUNCTION: +FIPS_rsa_free 4088 NOEXIST::FUNCTION: FIPS_dsa_sig_encode 4089 NOEXIST::FUNCTION: CRYPTO_dbg_remove_all_info 4090 NOEXIST::FUNCTION: OPENSSL_init 4091 EXIST::FUNCTION: @@ -4246,15 +4246,15 @@ RAND_init_fips 4614 EXIST:OPENSSL_FIPS:FUNCTION: EVP_aes_256_gcm 4615 EXIST::FUNCTION:AES private_SHA384_Init 4616 NOEXIST::FUNCTION: EVP_aes_192_ccm 4617 EXIST::FUNCTION:AES -CMAC_CTX_copy 4618 NOEXIST::FUNCTION: -CMAC_CTX_free 4619 NOEXIST::FUNCTION: -CMAC_CTX_get0_cipher_ctx 4620 NOEXIST::FUNCTION: -CMAC_CTX_cleanup 4621 NOEXIST::FUNCTION: -CMAC_Init 4622 NOEXIST::FUNCTION: -CMAC_Update 4623 NOEXIST::FUNCTION: -CMAC_resume 4624 NOEXIST::FUNCTION: -CMAC_CTX_new 4625 NOEXIST::FUNCTION: -CMAC_Final 4626 NOEXIST::FUNCTION: +CMAC_CTX_copy 4618 EXIST::FUNCTION: +CMAC_CTX_free 4619 EXIST::FUNCTION: +CMAC_CTX_get0_cipher_ctx 4620 EXIST::FUNCTION: +CMAC_CTX_cleanup 4621 EXIST::FUNCTION: +CMAC_Init 4622 EXIST::FUNCTION: +CMAC_Update 4623 EXIST::FUNCTION: +CMAC_resume 4624 EXIST::FUNCTION: +CMAC_CTX_new 4625 EXIST::FUNCTION: +CMAC_Final 4626 EXIST::FUNCTION: CRYPTO_ctr128_encrypt_ctr32 4627 EXIST::FUNCTION: CRYPTO_gcm128_release 4628 EXIST::FUNCTION: CRYPTO_ccm128_decrypt_ccm64 4629 EXIST::FUNCTION: @@ -4312,108 +4312,200 @@ BIO_dgram_sctp_wait_for_dry 4679 EXIST::FUNCTION:SCTP BIO_s_datagram_sctp 4680 EXIST::FUNCTION:DGRAM,SCTP BIO_dgram_is_sctp 4681 EXIST::FUNCTION:SCTP BIO_dgram_sctp_notification_cb 4682 EXIST::FUNCTION:SCTP -FIPS_selftest 4683 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_set_error_callbacks 4684 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_drbg_set_check_interval 4685 EXIST:OPENSSL_FIPS:FUNCTION: -i2d_DHxparams 4686 EXIST::FUNCTION:DH -FIPS_drbg_set_rand_callbacks 4687 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_rsa_sign 4688 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_rsa_verify_digest 4689 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_selftest_x931 4690 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_rsa_sign_digest 4691 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_ecdsa_verify_digest 4692 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA -FIPS_drbg_set_callbacks 4693 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_drbg_free 4694 EXIST:OPENSSL_FIPS:FUNCTION: -DH_get_1024_160 4695 EXIST::FUNCTION:DH -FIPS_dsa_sign_digest 4696 EXIST:OPENSSL_FIPS:FUNCTION:DSA -FIPS_x931_seed 4697 EXIST:OPENSSL_FIPS:FUNCTION: -ASN1_SCTX_get_flags 4698 EXIST::FUNCTION: -FIPS_dsa_verify_ctx 4699 EXIST:OPENSSL_FIPS:FUNCTION:DSA -FIPS_drbg_get_strength 4700 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_drbg_set_reseed_interval 4701 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_module_version 4702 EXIST:OPENSSL_FIPS:FUNCTION: -fips_set_selftest_fail 4703 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_get_default_drbg 4704 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_x931_set_dt 4705 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_get_cipherbynid 4706 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_dsa_sign_ctx 4707 EXIST:OPENSSL_FIPS:FUNCTION:DSA -X509_VERIFY_PARAM_get_count 4708 EXIST::FUNCTION: -FIPS_ecdsa_sign 4709 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA -PEM_write_DHxparams 4710 EXIST:!WIN16:FUNCTION:DH -FIPS_rand_strength 4711 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_module_mode_set 4712 EXIST:OPENSSL_FIPS:FUNCTION: -fips_check_rsa_prng 4713 EXIST:OPENSSL_FIPS:FUNCTION: -DH_compute_key_padded 4714 EXIST::FUNCTION:DH -FIPS_x931_stick 4715 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_drbg_stick 4716 EXIST:OPENSSL_FIPS:FUNCTION: -X509_VERIFY_PARAM_get0_name 4717 EXIST::FUNCTION: -FIPS_drbg_generate 4718 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_rsa_verify 4719 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_ecdsa_verify 4720 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA -FIPS_drbg_instantiate 4721 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_rand_set_method 4722 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_ecdsa_verify_ctx 4723 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA -d2i_DHxparams 4724 EXIST::FUNCTION:DH -FIPS_selftest_ecdh 4725 EXIST:OPENSSL_FIPS:FUNCTION: -ASN1_SCTX_get_template 4726 EXIST::FUNCTION: -FIPS_rand_set_bits 4727 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_module_mode 4728 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_selftest_drbg 4729 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_set_malloc_callbacks 4730 EXIST:OPENSSL_FIPS:FUNCTION: -ASN1_SCTX_set_app_data 4731 EXIST::FUNCTION: -ASN1_SCTX_free 4732 EXIST::FUNCTION: -FIPS_drbg_init 4733 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_drbg_health_check 4734 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_x931_bytes 4735 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_dsa_sign 4736 EXIST:OPENSSL_FIPS:FUNCTION:DSA -FIPS_rand_get_method 4737 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_get_timevec 4738 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_selftest_drbg_all 4739 EXIST:OPENSSL_FIPS:FUNCTION: -OPENSSL_gmtime_diff 4740 EXIST::FUNCTION: -X509_VERIFY_PARAM_get0 4741 EXIST::FUNCTION: -fips_check_rsa 4742 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_get_digestbynid 4743 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_drbg_new 4744 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_dsa_verify_digest 4745 EXIST:OPENSSL_FIPS:FUNCTION:DSA -FIPS_x931_reset 4746 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_selftest_aes_gcm 4747 EXIST:OPENSSL_FIPS:FUNCTION: -ASN1_SCTX_get_item 4748 EXIST::FUNCTION: -ASN1_SCTX_get_app_data 4749 EXIST::FUNCTION: -FIPS_drbg_get_blocklength 4750 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_check_incore_fingerprint 4751 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_rsa_sign_ctx 4752 EXIST:OPENSSL_FIPS:FUNCTION: -DH_get_2048_256 4753 EXIST::FUNCTION:DH -FIPS_selftest_ecdsa 4754 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_selftest_cmac 4755 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_selftest_aes_xts 4756 EXIST:OPENSSL_FIPS:FUNCTION: -fips_check_dsa_prng 4757 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_incore_fingerprint 4758 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_x931_status 4759 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_drbg_reseed 4760 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_drbg_uninstantiate 4761 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_selftest_aes_ccm 4762 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_x931_test_mode 4763 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_module_version_text 4764 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_drbg_set_app_data 4765 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_ecdsa_sign_ctx 4766 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA -FIPS_ecdsa_sign_digest 4767 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA -FIPS_x931_set_key 4768 EXIST:OPENSSL_FIPS:FUNCTION: -ASN1_SCTX_new 4769 EXIST::FUNCTION: -PEM_write_bio_DHxparams 4770 EXIST::FUNCTION:DH -fips_check_ec_prng 4771 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_x931_method 4772 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_post_set_callback 4773 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_set_locking_callbacks 4774 EXIST:OPENSSL_FIPS:FUNCTION: -BN_nist_mod_func 4775 EXIST::FUNCTION: -FIPS_drbg_get_app_data 4776 EXIST:OPENSSL_FIPS:FUNCTION: -FIPS_dsa_verify 4777 EXIST:OPENSSL_FIPS:FUNCTION:DSA -FIPS_rsa_verify_ctx 4778 EXIST:OPENSSL_FIPS:FUNCTION: -DH_get_2048_224 4779 EXIST::FUNCTION:DH -FIPS_drbg_method 4780 EXIST:OPENSSL_FIPS:FUNCTION: -EC_curve_nist2nid 4781 EXIST::FUNCTION:EC -EC_curve_nid2nist 4782 EXIST::FUNCTION:EC -X509_get0_signature 4783 EXIST::FUNCTION: -X509_get_signature_nid 4784 EXIST::FUNCTION: -X509_chain_check_suiteb 4785 EXIST::FUNCTION: -X509_chain_up_ref 4786 EXIST::FUNCTION: -X509_CRL_check_suiteb 4787 EXIST::FUNCTION: +i2d_DHxparams 4683 EXIST::FUNCTION:DH +EC_curve_nist2nid 4684 EXIST::FUNCTION:EC +DH_get_1024_160 4685 EXIST::FUNCTION:DH +PEM_write_DHxparams 4686 EXIST:!WIN16:FUNCTION:DH +d2i_DHxparams 4687 EXIST::FUNCTION:DH +EC_curve_nid2nist 4688 EXIST::FUNCTION:EC +DH_get_2048_256 4689 EXIST::FUNCTION:DH +PEM_write_bio_DHxparams 4690 EXIST::FUNCTION:DH +DH_get_2048_224 4691 EXIST::FUNCTION:DH +X509_chain_check_suiteb 4692 EXIST::FUNCTION: +X509_chain_up_ref 4693 EXIST::FUNCTION: +X509_VERIFY_PARAM_set1_ip_asc 4694 EXIST::FUNCTION: +X509_CRL_check_suiteb 4695 EXIST::FUNCTION: +X509_VERIFY_PARAM_set1_email 4696 EXIST::FUNCTION: +X509_check_email 4697 EXIST::FUNCTION: +X509_check_host 4698 EXIST::FUNCTION: +X509_check_ip_asc 4699 EXIST::FUNCTION: +X509_get0_signature 4700 EXIST::FUNCTION: +X509_get_signature_nid 4701 EXIST::FUNCTION: +X509_VERIFY_PARAM_set1_host 4702 EXIST::FUNCTION: +X509_VERIFY_PARAM_set1_ip 4703 EXIST::FUNCTION: +X509_check_ip 4704 EXIST::FUNCTION: +X509_STORE_set_lookup_crls_cb 4705 EXIST::FUNCTION: +X509_CRL_diff 4706 EXIST::FUNCTION: +X509_CRL_http_nbio 4707 EXIST::FUNCTION:EVP +OCSP_REQ_CTX_i2d 4708 EXIST::FUNCTION: +OCSP_REQ_CTX_get0_mem_bio 4709 EXIST::FUNCTION: +X509_STORE_CTX_get0_store 4710 EXIST::FUNCTION: +X509_REVOKED_dup 4711 EXIST::FUNCTION: +CMS_RecipientInfo_encrypt 4712 EXIST::FUNCTION:CMS +OCSP_REQ_CTX_http 4713 EXIST::FUNCTION: +OCSP_REQ_CTX_nbio 4714 EXIST::FUNCTION: +X509_http_nbio 4715 EXIST::FUNCTION:EVP +OCSP_set_max_response_length 4716 EXIST::FUNCTION: +OCSP_REQ_CTX_new 4717 EXIST::FUNCTION: +OCSP_REQ_CTX_nbio_d2i 4718 EXIST::FUNCTION: +EVP_aes_256_wrap 4719 EXIST::FUNCTION:AES +CRYPTO_128_wrap 4720 EXIST::FUNCTION: +RSA_OAEP_PARAMS_new 4721 EXIST::FUNCTION:RSA +CRYPTO_128_unwrap 4722 EXIST::FUNCTION: +ECDSA_METHOD_set_name 4723 EXIST::FUNCTION:ECDSA +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_RecipInfo_kari_orig_id_cmp 4728 NOEXIST::FUNCTION: +CMS_RecipientInfo_kari_orig_id_cmp 4728 EXIST::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_RecipEncryptedKey_cert_cmp 4734 NOEXIST::FUNCTION: +CMS_RecipientEncryptedKey_cert_cmp 4734 EXIST::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 +RSA_OAEP_PARAMS_it 4738 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA +RSA_OAEP_PARAMS_it 4738 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RSA +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_RecipInfo_kari_get0_reks 4742 NOEXIST::FUNCTION: +CMS_RecipientInfo_kari_get0_reks 4742 EXIST::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_RecipInfo_kari_set0_pkey 4746 NOEXIST::FUNCTION: +CMS_RecipientInfo_kari_set0_pkey 4746 EXIST::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_RecipEncryptedKey_get0_id 4753 NOEXIST::FUNCTION: +CMS_RecipientEncryptedKey_get0_id 4753 EXIST::FUNCTION:CMS +RSA_pad_check_PKCS1_OAEP_mgf1 4754 NOEXIST::FUNCTION: +RSA_padding_check_PKCS1_OAEP_mgf1 4754 EXIST::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_RecipInfo_kari_get0_orig_id 4758 NOEXIST::FUNCTION: +CMS_RecipientInfo_kari_get0_orig_id 4758 EXIST::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: +X509V3_EXT_free 4763 NOEXIST::FUNCTION: +BIO_hex_string 4764 EXIST::FUNCTION: +X509_VERIFY_PARAM_set_hostflags 4765 EXIST::FUNCTION: +BUF_strnlen 4766 EXIST::FUNCTION: +FIPS_ecdsa_verify_digest 4767 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA +FIPS_dsa_sign_digest 4768 EXIST:OPENSSL_FIPS:FUNCTION:DSA +BN_generate_dsa_nonce 4769 EXIST::FUNCTION: +ASN1_SCTX_get_flags 4770 EXIST::FUNCTION: +FIPS_dsa_verify_ctx 4771 EXIST:OPENSSL_FIPS:FUNCTION:DSA +FIPS_dsa_sign_ctx 4772 EXIST:OPENSSL_FIPS:FUNCTION:DSA +FIPS_ecdsa_sign 4773 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA +RSA_security_bits 4774 EXIST::FUNCTION:RSA +X509_VERIFY_PARAM_get0_peername 4775 EXIST::FUNCTION: +FIPS_ecdsa_verify 4776 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA +BN_security_bits 4777 EXIST::FUNCTION: +FIPS_ecdsa_verify_ctx 4778 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA +ASN1_SCTX_get_template 4779 EXIST::FUNCTION: +EVP_PKEY_asn1_set_security_bits 4780 EXIST::FUNCTION: +ASN1_SCTX_set_app_data 4781 EXIST::FUNCTION: +ASN1_SCTX_free 4782 EXIST::FUNCTION: +FIPS_dsa_sign 4783 EXIST:OPENSSL_FIPS:FUNCTION:DSA +DH_security_bits 4784 EXIST::FUNCTION:DH +EVP_aes_128_wrap_pad 4785 EXIST::FUNCTION:AES +EVP_aes_192_wrap_pad 4786 EXIST::FUNCTION:AES +FIPS_dsa_verify_digest 4787 EXIST:OPENSSL_FIPS:FUNCTION:DSA +ASN1_add_stable_module 4788 EXIST::FUNCTION: +DSA_security_bits 4789 EXIST::FUNCTION:DSA +ASN1_SCTX_get_item 4790 EXIST::FUNCTION: +ASN1_SCTX_get_app_data 4791 EXIST::FUNCTION: +ECDSA_METHOD_set_app_data 4792 EXIST::FUNCTION:ECDSA +CRYPTO_128_unwrap_pad 4793 EXIST::FUNCTION: +ASN1_str2mask 4794 EXIST::FUNCTION: +EVP_aes_256_wrap_pad 4795 EXIST::FUNCTION:AES +CRYPTO_128_wrap_pad 4796 EXIST::FUNCTION: +FIPS_ecdsa_sign_ctx 4797 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA +FIPS_ecdsa_sign_digest 4798 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA +ASN1_SCTX_new 4799 EXIST::FUNCTION: +sk_deep_copy 4800 EXIST::FUNCTION: +EVP_PKEY_security_bits 4801 EXIST::FUNCTION: +BN_nist_mod_func 4802 EXIST::FUNCTION: +ECDSA_METHOD_get_app_data 4803 EXIST::FUNCTION:ECDSA +FIPS_dsa_verify 4804 EXIST:OPENSSL_FIPS:FUNCTION:DSA +X509_VERIFY_PARAM_add1_host 4805 EXIST::FUNCTION: +FIPS_selftest 4806 NOEXIST::FUNCTION: +FIPS_set_error_callbacks 4807 NOEXIST::FUNCTION: +FIPS_drbg_set_check_interval 4808 NOEXIST::FUNCTION: +FIPS_rsa_sign 4809 NOEXIST::FUNCTION: +FIPS_rsa_sign_digest 4810 NOEXIST::FUNCTION: +FIPS_drbg_set_callbacks 4811 NOEXIST::FUNCTION: +FIPS_drbg_free 4812 NOEXIST::FUNCTION: +FIPS_drbg_get_strength 4813 NOEXIST::FUNCTION: +FIPS_drbg_set_reseed_interval 4814 NOEXIST::FUNCTION: +FIPS_get_default_drbg 4815 NOEXIST::FUNCTION: +FIPS_x931_set_dt 4816 NOEXIST::FUNCTION: +FIPS_get_cipherbynid 4817 NOEXIST::FUNCTION: +FIPS_rand_strength 4818 NOEXIST::FUNCTION: +fips_check_rsa_prng 4819 NOEXIST::FUNCTION: +FIPS_drbg_stick 4820 NOEXIST::FUNCTION: +FIPS_rsa_verify 4821 NOEXIST::FUNCTION: +FIPS_drbg_instantiate 4822 NOEXIST::FUNCTION: +FIPS_rand_set_method 4823 NOEXIST::FUNCTION: +FIPS_selftest_ecdh 4824 NOEXIST::FUNCTION: +FIPS_rand_set_bits 4825 NOEXIST::FUNCTION: +FIPS_set_malloc_callbacks 4826 NOEXIST::FUNCTION: +FIPS_drbg_init 4827 NOEXIST::FUNCTION: +FIPS_selftest_drbg_all 4828 NOEXIST::FUNCTION: +fips_check_rsa 4829 NOEXIST::FUNCTION: +FIPS_get_digestbynid 4830 NOEXIST::FUNCTION: +FIPS_x931_reset 4831 NOEXIST::FUNCTION: +FIPS_selftest_aes_gcm 4832 NOEXIST::FUNCTION: +FIPS_check_incore_fingerprint 4833 NOEXIST::FUNCTION: +FIPS_selftest_ecdsa 4834 NOEXIST::FUNCTION: +FIPS_incore_fingerprint 4835 NOEXIST::FUNCTION: +FIPS_drbg_uninstantiate 4836 NOEXIST::FUNCTION: +FIPS_selftest_aes_ccm 4837 NOEXIST::FUNCTION: +fips_check_ec_prng 4838 NOEXIST::FUNCTION: +FIPS_set_locking_callbacks 4839 NOEXIST::FUNCTION: +FIPS_drbg_method 4840 NOEXIST::FUNCTION: +FIPS_drbg_set_rand_callbacks 4841 NOEXIST::FUNCTION: +FIPS_rsa_verify_digest 4842 NOEXIST::FUNCTION: +FIPS_selftest_x931 4843 NOEXIST::FUNCTION: +FIPS_x931_seed 4844 NOEXIST::FUNCTION: +FIPS_module_version 4845 NOEXIST::FUNCTION: +fips_set_selftest_fail 4846 NOEXIST::FUNCTION: +FIPS_module_mode_set 4847 NOEXIST::FUNCTION: +FIPS_x931_stick 4848 NOEXIST::FUNCTION: +FIPS_drbg_generate 4849 NOEXIST::FUNCTION: +FIPS_module_mode 4850 NOEXIST::FUNCTION: +FIPS_selftest_drbg 4851 NOEXIST::FUNCTION: +FIPS_drbg_health_check 4852 NOEXIST::FUNCTION: +FIPS_x931_bytes 4853 NOEXIST::FUNCTION: +FIPS_rand_get_method 4854 NOEXIST::FUNCTION: +FIPS_get_timevec 4855 NOEXIST::FUNCTION: +FIPS_drbg_new 4856 NOEXIST::FUNCTION: +FIPS_drbg_get_blocklength 4857 NOEXIST::FUNCTION: +FIPS_rsa_sign_ctx 4858 NOEXIST::FUNCTION: +FIPS_selftest_cmac 4859 NOEXIST::FUNCTION: +FIPS_selftest_aes_xts 4860 NOEXIST::FUNCTION: +fips_check_dsa_prng 4861 NOEXIST::FUNCTION: +FIPS_x931_status 4862 NOEXIST::FUNCTION: +FIPS_drbg_reseed 4863 NOEXIST::FUNCTION: +FIPS_x931_test_mode 4864 NOEXIST::FUNCTION: +FIPS_module_version_text 4865 NOEXIST::FUNCTION: +FIPS_drbg_set_app_data 4866 NOEXIST::FUNCTION: +FIPS_x931_set_key 4867 NOEXIST::FUNCTION: +FIPS_x931_method 4868 NOEXIST::FUNCTION: +FIPS_post_set_callback 4869 NOEXIST::FUNCTION: +FIPS_drbg_get_app_data 4870 NOEXIST::FUNCTION: +FIPS_rsa_verify_ctx 4871 NOEXIST::FUNCTION: diff --git a/util/mkdef.pl b/util/mkdef.pl index 3dc846f6aa..12e1594bbe 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -307,6 +307,7 @@ $crypto.=" crypto/ec/ec.h" ; # unless $no_ec; $crypto.=" crypto/ecdsa/ecdsa.h" ; # unless $no_ecdsa; $crypto.=" crypto/ecdh/ecdh.h" ; # unless $no_ecdh; $crypto.=" crypto/hmac/hmac.h" ; # unless $no_hmac; +$crypto.=" crypto/cmac/cmac.h" ; $crypto.=" crypto/engine/engine.h"; # unless $no_engine; $crypto.=" crypto/stack/stack.h" ; # unless $no_stack; diff --git a/util/ssleay.num b/util/ssleay.num index 243484eddb..8814c8fe83 100755 --- a/util/ssleay.num +++ b/util/ssleay.num @@ -325,3 +325,58 @@ SSL_CTX_set_not_resumbl_sess_cb 363 EXIST:VMS:FUNCTION: SSL_set_not_resumable_session_callback 364 EXIST:!VMS:FUNCTION: SSL_set_not_resumbl_sess_cb 364 EXIST:VMS:FUNCTION: SSL_get_sigalgs 365 EXIST::FUNCTION:TLSEXT +SSL_CTX_get_security_callback 366 EXIST::FUNCTION: +SSL_get0_param 367 EXIST::FUNCTION: +SSL_CTX_get0_privatekey 368 EXIST::FUNCTION: +SSL_get_shared_sigalgs 369 EXIST::FUNCTION:TLSEXT +SSL_SESSION_print_keylog 370 EXIST::FUNCTION:BIO +SSL_CONF_CTX_finish 371 EXIST::FUNCTION: +SSL_get0_security_ex_data 372 EXIST::FUNCTION: +DTLS_method 373 EXIST::FUNCTION: +DTLS_client_method 374 EXIST::FUNCTION: +SSL_CIPHER_standard_name 375 EXIST::FUNCTION:SSL_TRACE +SSL_set_alpn_protos 376 EXIST::FUNCTION: +SSL_CONF_cmd_argv 377 EXIST::FUNCTION: +DTLSv1_2_server_method 378 EXIST::FUNCTION: +SSL_COMP_set0_compression_methods 379 EXIST::FUNCTION:COMP +SSL_CTX_set_cert_cb 380 EXIST::FUNCTION: +SSL_CTX_set_custom_cli_ext 381 EXIST::FUNCTION:TLSEXT +SSL_is_server 382 EXIST::FUNCTION: +SSL_CTX_get0_param 383 EXIST::FUNCTION: +SSL_CONF_cmd 384 EXIST::FUNCTION: +SSL_CTX_set_security_callback 385 EXIST::FUNCTION: +SSL_CTX_get_ssl_method 386 EXIST::FUNCTION: +SSL_CONF_CTX_set_ssl_ctx 387 EXIST::FUNCTION: +SSL_CIPHER_find 388 EXIST::FUNCTION: +SSL_CTX_use_serverinfo 389 EXIST::FUNCTION:TLSEXT +SSL_get1_supported_ciphers 390 EXIST::FUNCTION: +DTLSv1_2_client_method 391 EXIST::FUNCTION: +SSL_get0_alpn_selected 392 EXIST::FUNCTION: +SSL_set_security_level 393 EXIST::FUNCTION: +SSL_set0_security_ex_data 394 EXIST::FUNCTION: +SSL_CTX_set_security_level 395 EXIST::FUNCTION: +SSL_CONF_CTX_clear_flags 396 EXIST::FUNCTION: +SSL_CTX_set_alpn_protos 397 EXIST::FUNCTION: +SSL_CTX_set_custom_srv_ext 398 EXIST::FUNCTION:TLSEXT +SSL_CTX_get0_certificate 399 EXIST::FUNCTION: +SSL_CTX_set_alpn_select_cb 400 EXIST::FUNCTION: +SSL_CONF_cmd_value_type 401 EXIST::FUNCTION: +SSL_get_security_callback 402 EXIST::FUNCTION: +SSL_get_security_level 403 EXIST::FUNCTION: +SSL_set_cert_cb 404 EXIST::FUNCTION: +SSL_CTX_set0_security_ex_data 405 EXIST::FUNCTION: +SSL_CONF_CTX_set1_prefix 406 EXIST::FUNCTION: +SSL_CONF_CTX_new 407 EXIST::FUNCTION: +SSL_CONF_CTX_set_flags 408 EXIST::FUNCTION: +SSL_CONF_CTX_set_ssl 409 EXIST::FUNCTION: +SSL_check_chain 410 EXIST::FUNCTION:TLSEXT +SSL_certs_clear 411 EXIST::FUNCTION: +SSL_CONF_CTX_free 412 EXIST::FUNCTION: +SSL_set_security_callback 413 EXIST::FUNCTION: +SSL_trace 414 EXIST::FUNCTION:SSL_TRACE +DTLSv1_2_method 415 EXIST::FUNCTION: +SSL_CTX_get_security_level 416 EXIST::FUNCTION: +SSL_CTX_get0_security_ex_data 417 EXIST::FUNCTION: +DTLS_server_method 418 EXIST::FUNCTION: +SSL_COMP_free_compression_methods 419 EXIST::FUNCTION:COMP +SSL_CTX_use_serverinfo_file 420 EXIST::FUNCTION:STDIO,TLSEXT |