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

fast SMS4 with Intel AVX2/KNC-NI

Browse Source
This commit is contained in:
Zhi Guan
2016-05-09 09:20:02 +02:00
parent addcac4896
commit 8c0439e7d6
83 changed files with 3536 additions and 5882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crypto/asn1/d2i_pr.c
View File

@@ -93,28 +93,38 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
goto err;
}
fprintf(stderr, "GMSSL: %s %d\n", __FILE__, __LINE__);
if (!ret->ameth->old_priv_decode ||
!ret->ameth->old_priv_decode(ret, pp, length)) {
fprintf(stderr, "GMSSL: %s %d\n", __FILE__, __LINE__);
if (ret->ameth->priv_decode) {
PKCS8_PRIV_KEY_INFO *p8 = NULL;
p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL, pp, length);
fprintf(stderr, "GMSSL: %s %d\n", __FILE__, __LINE__);
if (!p8)
goto err;
EVP_PKEY_free(ret);
ret = EVP_PKCS82PKEY(p8);
PKCS8_PRIV_KEY_INFO_free(p8);
fprintf(stderr, "GMSSL: %s %d\n", __FILE__, __LINE__);
} else {
ASN1err(ASN1_F_D2I_PRIVATEKEY, ERR_R_ASN1_LIB);
fprintf(stderr, "GMSSL: %s %d\n", __FILE__, __LINE__);
goto err;
}
}
fprintf(stderr, "GMSSL: %s %d\n", __FILE__, __LINE__);
if (a != NULL)
(*a) = ret;
fprintf(stderr, "GMSSL: %s %d\n", __FILE__, __LINE__);
return (ret);
err:
fprintf(stderr, "GMSSL: %s %d\n", __FILE__, __LINE__);
if ((ret != NULL) && ((a == NULL) || (*a != ret)))
EVP_PKEY_free(ret);
fprintf(stderr, "GMSSL: %s %d\n", __FILE__, __LINE__);
return (NULL);
}
@@ -140,10 +150,16 @@ EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
* Since we only need to discern "traditional format" RSA and DSA keys we
* can just count the elements.
*/
fprintf(stderr, "GMSSL %s %d: %s %d\n", __FILE__, __LINE__, __FUNCTION__, sk_ASN1_TYPE_num(inkey));
if (sk_ASN1_TYPE_num(inkey) == 6)
keytype = EVP_PKEY_DSA;
else if (sk_ASN1_TYPE_num(inkey) == 4)
else if (sk_ASN1_TYPE_num(inkey) == 4) {
keytype = EVP_PKEY_EC;
fprintf(stderr, "GMSSL %s %d: %s\n", __FILE__, __LINE__, __FUNCTION__);
}
else if (sk_ASN1_TYPE_num(inkey) == 3) { /* This seems to be PKCS8, not
* traditional format */
PKCS8_PRIV_KEY_INFO *p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL, pp, length);