From 77e9ddea57ffa3d0d763978a49a83a6484ba2782 Mon Sep 17 00:00:00 2001 From: zhaoxiaomeng Date: Fri, 14 Apr 2017 15:43:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0libcrypto.num?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/progs.h | 20 +++++++++++++++- util/libcrypto.num | 59 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 69 insertions(+), 10 deletions(-) diff --git a/apps/progs.h b/apps/progs.h index 51cb7595..e529aa74 100644 --- a/apps/progs.h +++ b/apps/progs.h @@ -182,10 +182,12 @@ static FUNCTION functions[] = { { FT_general, "otp", otp_main, otp_options }, #endif { FT_general, "passwd", passwd_main, passwd_options }, -#ifndef OPENSSL_NO_DES +#ifndef OPENSSL_NO_PKCS12 { FT_general, "pkcs12", pkcs12_main, pkcs12_options }, #endif +#ifndef OPENSSL_NO_PKCS7 { FT_general, "pkcs7", pkcs7_main, pkcs7_options }, +#endif { FT_general, "pkcs8", pkcs8_main, pkcs8_options }, { FT_general, "pkey", pkey_main, pkey_options }, { FT_general, "pkeyparam", pkeyparam_main, pkeyparam_options }, @@ -194,7 +196,9 @@ static FUNCTION functions[] = { { FT_general, "rand", rand_main, rand_options }, { FT_general, "rehash", rehash_main, rehash_options }, { FT_general, "req", req_main, req_options }, +#ifndef OPENSSL_NO_RSA { FT_general, "rsa", rsa_main, rsa_options }, +#endif #ifndef OPENSSL_NO_RSA { FT_general, "rsautl", rsautl_main, rsautl_options }, #endif @@ -229,7 +233,9 @@ static FUNCTION functions[] = { #ifndef OPENSSL_NO_MD4 { FT_md, "md4", dgst_main}, #endif +#ifndef OPENSSL_NO_MD5 { FT_md, "md5", dgst_main}, +#endif #ifndef OPENSSL_NO_GOST { FT_md, "gost", dgst_main}, #endif @@ -265,12 +271,24 @@ static FUNCTION functions[] = { #ifndef OPENSSL_NO_SMS4 { FT_cipher, "sms4-cfb", enc_main, enc_options }, #endif +#ifndef OPENSSL_NO_AES { FT_cipher, "aes-128-cbc", enc_main, enc_options }, +#endif +#ifndef OPENSSL_NO_AES { FT_cipher, "aes-128-ecb", enc_main, enc_options }, +#endif +#ifndef OPENSSL_NO_AES { FT_cipher, "aes-192-cbc", enc_main, enc_options }, +#endif +#ifndef OPENSSL_NO_AES { FT_cipher, "aes-192-ecb", enc_main, enc_options }, +#endif +#ifndef OPENSSL_NO_AES { FT_cipher, "aes-256-cbc", enc_main, enc_options }, +#endif +#ifndef OPENSSL_NO_AES { FT_cipher, "aes-256-ecb", enc_main, enc_options }, +#endif #ifndef OPENSSL_NO_CAMELLIA { FT_cipher, "camellia-128-cbc", enc_main, enc_options }, #endif diff --git a/util/libcrypto.num b/util/libcrypto.num index 9154397f..960e65b3 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -3549,7 +3549,7 @@ OPENSSL_strlcat 3501 1_1_0 EXIST::FUNCTION: X509_VERIFY_PARAM_new 3502 1_1_0 EXIST::FUNCTION: BIO_ADDR_rawport 3503 1_1_0 EXIST::FUNCTION:SOCK BUF_MEM_grow_clean 3504 1_1_0 EXIST::FUNCTION: -X509_NAME_print_ex_fp 3505 1_1_0 EXIST::FUNCTION:STDIO +X509_NAME_print_ex_fp 3505 1_1_0 NOEXIST::FUNCTION: X509_check_host 3506 1_1_0 EXIST::FUNCTION: PEM_read_ECPKParameters 3507 1_1_0 EXIST::FUNCTION:EC,STDIO X509_ATTRIBUTE_get0_data 3508 1_1_0 EXIST::FUNCTION: @@ -4265,8 +4265,8 @@ i2d_BFPublicParameters 4229 1_1_0d EXIST::FUNCTION: sms4_unwrap_key 4230 1_1_0d EXIST::FUNCTION: sms4_set_encrypt_key 4231 1_1_0d EXIST::FUNCTION: SKF_RSAVerify 4232 1_1_0d EXIST::FUNCTION: -PAILLIER_PUBLIC_KEY_it 4233 1_1_0d EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -PAILLIER_PUBLIC_KEY_it 4233 1_1_0d EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +PAILLIER_PUBLIC_KEY_it 4233 1_1_0d NOEXIST::FUNCTION: +PAILLIER_PUBLIC_KEY_it 4233 1_1_0d NOEXIST::FUNCTION: sms4_avx2_encrypt_8blocks 4234 1_1_0d EXIST::FUNCTION: SKF_Transmit 4235 1_1_0d EXIST::FUNCTION: SM9Signature_it 4236 1_1_0d EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: @@ -4324,7 +4324,7 @@ SDF_InternalPublicKeyOperation_RSA 4285 1_1_0d EXIST::FUNCTION: SM2_ENC_PARAMS_new 4286 1_1_0d EXIST::FUNCTION: SKF_PrintDeviceInfo 4287 1_1_0d EXIST::FUNCTION: EC_GROUP_get_type1curve_eta 4288 1_1_0d EXIST::FUNCTION: -d2i_PAILLIER_PUBLIC_KEY 4289 1_1_0d EXIST::FUNCTION: +d2i_PAILLIER_PUBLIC_KEY 4289 1_1_0d NOEXIST::FUNCTION: SM9PrivateKey_new 4290 1_1_0d EXIST::FUNCTION: sm3_hmac 4291 1_1_0d EXIST::FUNCTION: SOF_GetPinRetryCount 4292 1_1_0d EXIST::FUNCTION: @@ -4378,7 +4378,7 @@ SOF_VerifySignedMessage 4338 1_1_0d EXIST::FUNCTION: EC_KEY_METHOD_set_encrypt 4339 1_1_0d EXIST::FUNCTION: SAF_SM2_DecodeEnvelopedData 4340 1_1_0d EXIST::FUNCTION: SDF_HashUpdate 4341 1_1_0d EXIST::FUNCTION: -i2d_PAILLIER_PUBLIC_KEY 4342 1_1_0d EXIST::FUNCTION: +i2d_PAILLIER_PUBLIC_KEY 4342 1_1_0d NOEXIST::FUNCTION: EC_GROUP_new_type1curve 4343 1_1_0d EXIST::FUNCTION: BN_GFP2_copy 4344 1_1_0d EXIST::FUNCTION: sms4_encrypt_8blocks 4345 1_1_0d EXIST::FUNCTION: @@ -4614,7 +4614,7 @@ i2d_SM9MasterSecret 4569 1_1_0d EXIST::FUNCTION: FFX_encrypt 4570 1_1_0d EXIST::FUNCTION: CPK_MAP_is_valid 4571 1_1_0d EXIST::FUNCTION: SAF_EnumCertificatesFree 4572 1_1_0d EXIST::FUNCTION: -d2i_PAILLIER_PRIVATE_KEY 4573 1_1_0d EXIST::FUNCTION: +d2i_PAILLIER_PRIVATE_KEY 4573 1_1_0d NOEXIST::FUNCTION: SDF_PrintDeviceInfo 4574 1_1_0d EXIST::FUNCTION: RSA_new_from_RSArefPrivateKey 4575 1_1_0d EXIST::FUNCTION: KDF_get_nist_concatenation 4576 1_1_0d EXIST::FUNCTION: @@ -4693,8 +4693,8 @@ ERR_load_PAILLIER_strings 4646 1_1_0d EXIST::FUNCTION: SDF_GenerateKeyPair_RSA 4647 1_1_0d EXIST::FUNCTION: i2d_CPK_PUBLIC_PARAMS_bio 4648 1_1_0d EXIST::FUNCTION: SOF_EncryptFile 4649 1_1_0d EXIST::FUNCTION: -PAILLIER_PRIVATE_KEY_it 4650 1_1_0d EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -PAILLIER_PRIVATE_KEY_it 4650 1_1_0d EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +PAILLIER_PRIVATE_KEY_it 4650 1_1_0d NOEXIST::FUNCTION: +PAILLIER_PRIVATE_KEY_it 4650 1_1_0d NOEXIST::FUNCTION: ERR_load_BFIBE_strings 4651 1_1_0d EXIST::FUNCTION: SKF_EncryptInit 4652 1_1_0d EXIST::FUNCTION: EC_KEY_set_ECCrefPublicKey 4653 1_1_0d EXIST::FUNCTION: @@ -4756,7 +4756,7 @@ SDF_HashInit 4705 1_1_0d EXIST::FUNCTION: SM2_KAP_prepare 4706 1_1_0d EXIST::FUNCTION: SAF_VerifyCertificateByCrl 4707 1_1_0d EXIST::FUNCTION: ECDSA_SIG_get_ECCSIGNATUREBLOB 4708 1_1_0d EXIST::FUNCTION: -i2d_PAILLIER_PRIVATE_KEY 4709 1_1_0d EXIST::FUNCTION: +i2d_PAILLIER_PRIVATE_KEY 4709 1_1_0d NOEXIST::FUNCTION: SDF_OpenDevice 4710 1_1_0d EXIST::FUNCTION: SKF_GetContainerType 4711 1_1_0d EXIST::FUNCTION: PAILLIER_generate_key 4712 1_1_0d EXIST::FUNCTION: @@ -4872,3 +4872,44 @@ SOF_CreateTimeStampRequest 4819 1_1_0d EXIST::FUNCTION: BN_GF2P_add 4820 1_1_0d EXIST::FUNCTION: SM2_compute_key 4821 1_1_0d EXIST::FUNCTION: BN_GFP2_add_bn 4822 1_1_0d EXIST::FUNCTION: +i2d_PAILLIER_PUBKEY_fp 4823 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +d2i_PaillierPublicKey 4824 1_1_0d EXIST::FUNCTION: +PEM_read_PAILLIER_PUBKEY 4825 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +PEM_write_bio_PAILLIERPrivateKey 4826 1_1_0d EXIST::FUNCTION:PAILLIER +PEM_write_PAILLIERPublicKey 4827 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +PEM_write_PAILLIER_PUBKEY 4828 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +i2d_PaillierPublicKey_fp 4829 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +d2i_PaillierPublicKey_bio 4830 1_1_0d EXIST::FUNCTION:PAILLIER +EVP_PKEY_get1_PAILLIER 4831 1_1_0d EXIST::FUNCTION:PAILLIER +d2i_PaillierPrivateKey 4832 1_1_0d EXIST::FUNCTION: +PEM_write_bio_PAILLIER_PUBKEY 4833 1_1_0d EXIST::FUNCTION:PAILLIER +PaillierPublicKey_it 4834 1_1_0d EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: +PaillierPublicKey_it 4834 1_1_0d EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +i2d_PaillierPrivateKey_fp 4835 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +X509_NAMpaillierE_print_ex_fp 4836 1_1_0d EXIST::FUNCTION:STDIO +PEM_read_bio_PAILLIER_PUBKEY 4837 1_1_0d EXIST::FUNCTION:PAILLIER +d2i_PAILLIER_PUBKEY_bio 4838 1_1_0d EXIST::FUNCTION:PAILLIER +d2i_PaillierPublicKey_fp 4839 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +PEM_read_bio_PAILLIERPrivateKey 4840 1_1_0d EXIST::FUNCTION:PAILLIER +i2d_PaillierPublicKey 4841 1_1_0d EXIST::FUNCTION: +PEM_read_PAILLIERPrivateKey 4842 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +EVP_PKEY_set1_PAILLIER 4843 1_1_0d EXIST::FUNCTION:PAILLIER +i2d_PaillierPrivateKey 4844 1_1_0d EXIST::FUNCTION: +PaillierPrivateKey_it 4845 1_1_0d EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: +PaillierPrivateKey_it 4845 1_1_0d EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: +i2d_PaillierPrivateKey_bio 4846 1_1_0d EXIST::FUNCTION:PAILLIER +d2i_PaillierPrivateKey_fp 4847 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +PEM_write_bio_PAILLIERPublicKey 4848 1_1_0d EXIST::FUNCTION:PAILLIER +i2d_PAILLIER_PUBKEY 4849 1_1_0d EXIST::FUNCTION:PAILLIER +PAILLIER_up_ref 4850 1_1_0d EXIST::FUNCTION: +PEM_read_bio_PAILLIERPublicKey 4851 1_1_0d EXIST::FUNCTION:PAILLIER +SAF_EccSignFile 4852 1_1_0d EXIST::FUNCTION: +i2d_PaillierPublicKey_bio 4853 1_1_0d EXIST::FUNCTION:PAILLIER +d2i_PAILLIER_PUBKEY 4854 1_1_0d EXIST::FUNCTION:PAILLIER +i2d_PAILLIER_PUBKEY_bio 4855 1_1_0d EXIST::FUNCTION:PAILLIER +PEM_write_PAILLIERPrivateKey 4856 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +SAF_EccVerifySignFile 4857 1_1_0d EXIST::FUNCTION: +d2i_PaillierPrivateKey_bio 4858 1_1_0d EXIST::FUNCTION:PAILLIER +EVP_PKEY_get0_PAILLIER 4859 1_1_0d EXIST::FUNCTION:PAILLIER +PEM_read_PAILLIERPublicKey 4860 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO +d2i_PAILLIER_PUBKEY_fp 4861 1_1_0d EXIST::FUNCTION:PAILLIER,STDIO