abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-08-09 23:43:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add sm9 and paillier pem support

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

13
crypto/evp/evp_err.c
View File

@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,6 +70,12 @@ static ERR_STRING_DATA EVP_str_functs[] = {
{ERR_FUNC(EVP_F_EVP_PKEY_GET0_HMAC), "EVP_PKEY_get0_hmac"},
{ERR_FUNC(EVP_F_EVP_PKEY_GET0_PAILLIER), "EVP_PKEY_get0_PAILLIER"},
{ERR_FUNC(EVP_F_EVP_PKEY_GET0_RSA), "EVP_PKEY_get0_RSA"},
{ERR_FUNC(EVP_F_EVP_PKEY_GET0_SM9), "EVP_PKEY_get0_SM9"},
{ERR_FUNC(EVP_F_EVP_PKEY_GET0_SM9MASTERSECRET),
"EVP_PKEY_get0_SM9MasterSecret"},
{ERR_FUNC(EVP_F_EVP_PKEY_GET0_SM9PUBLICPARAMETERS),
"EVP_PKEY_get0_SM9PublicParameters"},
{ERR_FUNC(EVP_F_EVP_PKEY_GET0_SM9_MASTER), "EVP_PKEY_get0_SM9_MASTER"},
{ERR_FUNC(EVP_F_EVP_PKEY_KEYGEN), "EVP_PKEY_keygen"},
{ERR_FUNC(EVP_F_EVP_PKEY_KEYGEN_INIT), "EVP_PKEY_keygen_init"},
{ERR_FUNC(EVP_F_EVP_PKEY_NEW), "EVP_PKEY_new"},
@@ -120,6 +126,11 @@ static ERR_STRING_DATA EVP_str_reasons[] = {
{ERR_REASON(EVP_R_EXPECTING_A_DSA_KEY), "expecting a dsa key"},
{ERR_REASON(EVP_R_EXPECTING_A_EC_KEY), "expecting a ec key"},
{ERR_REASON(EVP_R_EXPECTING_A_PAILLIER), "expecting a paillier"},
{ERR_REASON(EVP_R_EXPECTING_A_SM9_KEY), "expecting a sm9 key"},
{ERR_REASON(EVP_R_EXPECTING_A_SM9_MASTER_KEY),
"expecting a sm9 master key"},
{ERR_REASON(EVP_R_EXPECTING_A_SM9_MASTER_SECRET),
"expecting a sm9 master secret"},
{ERR_REASON(EVP_R_FIPS_MODE_NOT_SUPPORTED), "fips mode not supported"},
{ERR_REASON(EVP_R_ILLEGAL_SCRYPT_PARAMETERS),
"illegal scrypt parameters"},

54
crypto/evp/p_lib.c
View File

@@ -370,6 +370,60 @@ PAILLIER *EVP_PKEY_get1_PAILLIER(EVP_PKEY *pkey)
}
#endif
#ifndef OPENSSL_NO_SM9
int EVP_PKEY_set1_SM9_MASTER(EVP_PKEY *pkey, SM9_MASTER_KEY *key)
{
int ret = EVP_PKEY_assign_SM9_MASTER(pkey, key);
if (ret)
SM9_MASTER_KEY_up_ref(key);
return ret;
}
SM9_MASTER_KEY *EVP_PKEY_get0_SM9_MASTER(EVP_PKEY *pkey)
{
if (pkey->type != EVP_PKEY_SM9_MASTER) {
EVPerr(EVP_F_EVP_PKEY_GET0_SM9_MASTER, EVP_R_EXPECTING_A_SM9_MASTER_KEY);
return NULL;
}
return pkey->pkey.sm9_master;
}
SM9_MASTER_KEY *EVP_PKEY_get1_SM9_MASTER(EVP_PKEY *pkey)
{
SM9_MASTER_KEY *ret = EVP_PKEY_get0_SM9_MASTER(pkey);
if (ret != NULL)
SM9_MASTER_KEY_up_ref(ret);
return ret;
}
int EVP_PKEY_set1_SM9(EVP_PKEY *pkey, SM9_KEY *key)
{
int ret = EVP_PKEY_assign_SM9(pkey, key);
if (ret)
SM9_KEY_up_ref(key);
return ret;
}
SM9_KEY *EVP_PKEY_get0_SM9(EVP_PKEY *pkey)
{
if (pkey->type != EVP_PKEY_SM9) {
EVPerr(EVP_F_EVP_PKEY_GET0_SM9, EVP_R_EXPECTING_A_SM9_KEY);
return NULL;
}
return pkey->pkey.sm9;
}
SM9_KEY *EVP_PKEY_get1_SM9(EVP_PKEY *pkey)
{
SM9_KEY *ret = EVP_PKEY_get0_SM9(pkey);
if (ret != NULL)
SM9_KEY_up_ref(ret);
return ret;
}
#endif
#ifndef OPENSSL_NO_DH
int EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key)