From 127e5a27266541256487d254bd3b21575a6ae8dc Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 4 Mar 2019 15:40:03 +0100 Subject: [PATCH] Add more features and symbols to libcrypto Fix #3203 --- repos/libports/lib/mk/libcrypto.inc | 7 ++++--- repos/libports/lib/symbols/libcrypto | 21 ++++++++++++++++++++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/repos/libports/lib/mk/libcrypto.inc b/repos/libports/lib/mk/libcrypto.inc index c343ec224..eb87feaa7 100644 --- a/repos/libports/lib/mk/libcrypto.inc +++ b/repos/libports/lib/mk/libcrypto.inc @@ -61,7 +61,7 @@ SRC_C_cast = c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c SRC_C_cmac = cm_ameth.c cm_pmeth.c cmac.c SRC_C_cms = cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c \ cms_err.c cms_sd.c cms_dd.c cms_cd.c cms_env.c \ - cms_enc.c cms_ess.c cms_pwri.c + cms_enc.c cms_ess.c cms_pwri.c cms_kari.c SRC_C_comp = comp_lib.c comp_err.c c_rle.c c_zlib.c SRC_C_conf = conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c \ conf_mall.c conf_sap.c @@ -72,7 +72,8 @@ SRC_C_des = cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c \ des_old.c des_old2.c read2pwd.c SRC_C_dh = dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c \ - dh_err.c dh_depr.c dh_ameth.c dh_pmeth.c dh_prn.c + dh_err.c dh_depr.c dh_ameth.c dh_pmeth.c dh_prn.c \ + dh_rfc5114.c dh_kdf.c SRC_C_dsa = dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c \ dsa_sign.c dsa_err.c dsa_ossl.c dsa_depr.c \ dsa_ameth.c dsa_pmeth.c dsa_prn.c @@ -84,7 +85,7 @@ SRC_C_ec = ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c \ ec_pmeth.c eck_prn.c ecp_nistp224.c ecp_nistp256.c \ ecp_nistp521.c ecp_nistputil.c ecp_oct.c ec2_oct.c \ ec_oct.c -SRC_C_ecdh = ech_lib.c ech_ossl.c ech_key.c ech_err.c +SRC_C_ecdh = ech_lib.c ech_ossl.c ech_key.c ech_err.c ech_kdf.c SRC_C_ecdsa = ecs_lib.c ecs_asn1.c ecs_ossl.c ecs_sign.c \ ecs_vrf.c ecs_err.c SRC_C_engine = eng_err.c eng_lib.c eng_list.c eng_init.c \ diff --git a/repos/libports/lib/symbols/libcrypto b/repos/libports/lib/symbols/libcrypto index cd19a0dd1..3ba80f3f0 100644 --- a/repos/libports/lib/symbols/libcrypto +++ b/repos/libports/lib/symbols/libcrypto @@ -585,11 +585,20 @@ CMS_ReceiptRequest_it D 56 CMS_ReceiptRequest_new T CMS_Receipt_it D 56 CMS_ReceiptsFrom_it D 56 +CMS_RecipientEncryptedKey_cert_cmp T +CMS_RecipientEncryptedKey_get0_id T CMS_RecipientEncryptedKey_it D 56 CMS_RecipientInfo_decrypt T CMS_RecipientInfo_encrypt T CMS_RecipientInfo_get0_pkey_ctx T CMS_RecipientInfo_it D 56 +CMS_RecipientInfo_kari_decrypt T +CMS_RecipientInfo_kari_get0_alg T +CMS_RecipientInfo_kari_get0_ctx T +CMS_RecipientInfo_kari_get0_orig_id T +CMS_RecipientInfo_kari_get0_reks T +CMS_RecipientInfo_kari_orig_id_cmp T +CMS_RecipientInfo_kari_set0_pkey T CMS_RecipientInfo_kekri_get0_id T CMS_RecipientInfo_kekri_id_cmp T CMS_RecipientInfo_ktri_cert_cmp T @@ -888,6 +897,7 @@ DES_set_odd_parity T DES_string_to_2keys T DES_string_to_key T DES_xcbc_encrypt T +DH_KDF_X9_42 T DH_OpenSSL T DH_check T DH_check_pub_key T @@ -897,6 +907,9 @@ DH_free T DH_generate_key T DH_generate_parameters T DH_generate_parameters_ex T +DH_get_1024_160 T +DH_get_2048_224 T +DH_get_2048_256 T DH_get_default_method T DH_get_ex_data T DH_get_ex_new_index T @@ -985,6 +998,7 @@ DSO_set_filename T DSO_set_method T DSO_set_name_converter T DSO_up_ref T +ECDH_KDF_X9_62 T ECDH_OpenSSL T ECDH_compute_key T ECDH_get_default_method T @@ -3287,10 +3301,13 @@ bn_cmp_words T bn_div_words T bn_dup_expand T bn_expand2 T +bn_from_mont_fixed_top T bn_mod_add_fixed_top T +bn_mod_sub_fixed_top T bn_mul_add_words T bn_mul_comba4 T bn_mul_comba8 T +bn_mul_fixed_top T bn_mul_high T bn_mul_low_normal T bn_mul_low_recursive T @@ -3302,6 +3319,7 @@ bn_mul_recursive T bn_mul_words T bn_sqr_comba4 T bn_sqr_comba8 T +bn_sqr_fixed_top T bn_sqr_normal T bn_sqr_recursive T bn_sqr_words T @@ -3326,6 +3344,8 @@ cms_EncryptedContent_init_bio T cms_EncryptedData_init_bio T cms_EnvelopedData_init_bio T cms_Receipt_verify T +cms_RecipientInfo_kari_encrypt T +cms_RecipientInfo_kari_init T cms_RecipientInfo_pwri_crypt T cms_SignedData_final T cms_SignedData_init_bio T @@ -3652,7 +3672,6 @@ ec_GFp_simple_points_make_affine T ec_GFp_simple_set_Jprojective_coordinates_GFp T ec_GFp_simple_set_compressed_coordinates T ec_pkey_meth D 208 -ec_precompute_mont_data T ec_wNAF_have_precompute_mult T ec_wNAF_mul T ec_wNAF_precompute_mult T