A clean version

This commit is contained in:
Zhi Guan
2019-06-13 21:35:40 +08:00
parent 74d7992dda
commit 3be27d5d2e
45 changed files with 5164 additions and 7645 deletions

View File

@@ -51,20 +51,10 @@ extern "C" {
# define PEM_STRING_PAILLIER "PAILLIER PRIVATE KEY"
# define PEM_STRING_PAILLIER_PUBLIC "PAILLIER PUBLIC KEY"
# define PEM_STRING_CPK_MASTER "CPK MASTER PRIVATE KEY"
# define PEM_STRING_CPK_MASTER_PUBLIC "CPK MASTER PUBLIC KEY"
# define PEM_STRING_SM9_MASTER "SM9 MASTER PRIVATE KEY"
# define PEM_STRING_SM9_MASTER_PUBLIC "SM9 MASTER PUBLIC KEY"
# define PEM_STRING_SM9 "SM9 PRIVATE KEY"
# define PEM_STRING_SM9_PUBLIC "SM9 PUBLIC KEY"
# define PEM_STRING_BFIBE_MASTER "BFIBE MASTER PRIVATE KEY"
# define PEM_STRING_BFIBE_MASTER_PUBLIC "BFIBE MASTER PUBLIC KEY"
# define PEM_STRING_BFIBE "BFIBE PRIVATE KEY"
# define PEM_STRING_BFIBE_PUBLIC "BFIBE PUBLIC KEY"
# define PEM_STRING_BB1IBE_MASTER "BB1IBE MASTER PRIVATE KEY"
# define PEM_STRING_BB1IBE_MASTER_PUBLIC "BB1IBE MASTER PUBLIC KEY"
# define PEM_STRING_BB1IBE "BB1IBE PRIVATE KEY"
# define PEM_STRING_BB1IBE_PUBLIC "BB1IBE PUBLIC KEY"
# define PEM_TYPE_ENCRYPTED 10
# define PEM_TYPE_MIC_ONLY 20
@@ -378,8 +368,6 @@ DECLARE_PEM_rw_cb(PaillierPrivateKey, PAILLIER)
DECLARE_PEM_rw_const(PaillierPublicKey, PAILLIER)
DECLARE_PEM_rw(PAILLIER_PUBKEY, PAILLIER)
# endif
# ifndef OPENSSL_NO_CPK
# endif
# ifndef OPENSSL_NO_SM9
DECLARE_PEM_rw_cb(SM9MasterSecret, SM9_MASTER_KEY)
DECLARE_PEM_rw_const(SM9PublicParameters, SM9_MASTER_KEY)
@@ -388,10 +376,6 @@ DECLARE_PEM_rw_cb(SM9PrivateKey, SM9_KEY)
DECLARE_PEM_rw_const(SM9PublicKey, SM9_KEY)
DECLARE_PEM_rw(SM9_PUBKEY, SM9_KEY)
# endif
# ifndef OPENSSL_NO_BFIBE
# endif
# ifndef OPENSSL_NO_BB1IBE
# endif
DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY)
DECLARE_PEM_rw(PUBKEY, EVP_PKEY)