Add sm9 and paillier pem support

This commit is contained in:
Zhi Guan
2018-11-16 15:26:30 +08:00
parent 5baad7e043
commit 9a999ae907
38 changed files with 7956 additions and 6992 deletions

View File

@@ -64,6 +64,13 @@ extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth;
extern const EVP_PKEY_ASN1_METHOD ecx25519_asn1_meth;
extern const EVP_PKEY_ASN1_METHOD hmac_asn1_meth;
extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[2];
#ifndef OPENSSL_NO_PAILLIER
extern const EVP_PKEY_ASN1_METHOD paillier_asn1_meth;
#endif
#ifndef OPENSSL_NO_SM9
extern const EVP_PKEY_ASN1_METHOD sm9_master_asn1_meth;
extern const EVP_PKEY_ASN1_METHOD sm9_asn1_meth;
#endif
/*
* These are used internally in the ASN1_OBJECT to keep track of whether the

View File

@@ -370,8 +370,15 @@ struct evp_pkey_st {
# ifndef OPENSSL_NO_EC
struct ec_key_st *ec; /* ECC */
# endif
# ifndef OPENSSL_NO_PAILLIER
# ifndef OPENSSL_NO_PAILLIER /* PAILLIER */
struct paillier_st *paillier;
# endif
# ifndef OPENSSL_NO_SM9 /* SM9 */
struct SM9_MASTER_KEY_st *sm9_master;
struct SM9_KEY_st *sm9;
# endif
# ifndef OPENSSL_NO_CPK /* CPK */
struct CPK_MASTER_SECERT *cpk;
# endif
} pkey;
int save_parameters;