feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

d2i_PKCS12_fp

Browse Source
This commit is contained in:
Go Hosohara
2018-05-28 12:15:44 +09:00
parent c715bb5ade
commit 8cd357aa3a
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ssl.c
View File

@ -18150,6 +18150,13 @@ WOLFSSL_X509_PKCS12 *wolfSSL_d2i_PKCS12_fp(XFILE fp, WOLFSSL_X509_PKCS12 **pkcs1
return (WOLFSSL_X509_PKCS12 *)wolfSSL_d2i_X509_fp_ex(fp, (void **)pkcs12, PKCS12_TYPE); return (WOLFSSL_X509_PKCS12 *)wolfSSL_d2i_X509_fp_ex(fp, (void **)pkcs12, PKCS12_TYPE);
} }
WOLFSSL_X509_PKCS12 *wolfSSL_d2i_PKCS12_fp(XFILE fp, WOLFSSL_X509_PKCS12 **pkcs12)
{
WOLFSSL_ENTER("wolfSSL_d2i_PKCS12_fp");
return (WOLFSSL_X509_PKCS12 *)wolfSSL_d2i_X509_fp_ex(fp, (void **)pkcs12, PKCS12_TYPE);
}
WOLFSSL_X509 *wolfSSL_d2i_X509_fp(XFILE fp, WOLFSSL_X509 **x509) WOLFSSL_X509 *wolfSSL_d2i_X509_fp(XFILE fp, WOLFSSL_X509 **x509)
{ {
WOLFSSL_ENTER("wolfSSL_d2i_X509_fp"); WOLFSSL_ENTER("wolfSSL_d2i_X509_fp");
@ -21589,7 +21596,8 @@ int wolfSSL_RAND_poll()
WOLFSSL_ENTER("wolfSSL_RAND_poll"); WOLFSSL_ENTER("wolfSSL_RAND_poll");
byte entropy[16]; byte entropy[16];
int ret = 0; int ret = 0;
const int entropy_sz = 16; word32 entropy_sz = 16;
if (initGlobalRNG == 0){ if (initGlobalRNG == 0){
WOLFSSL_MSG("Global RNG no Init"); WOLFSSL_MSG("Global RNG no Init");
@ -27672,7 +27680,11 @@ WOLFSSL_RSA *wolfSSL_d2i_RSAPublicKey(WOLFSSL_RSA **r, const unsigned char **pp,
int wolfSSL_i2d_RSAPublicKey(WOLFSSL_RSA *rsa, const unsigned char **pp) int wolfSSL_i2d_RSAPublicKey(WOLFSSL_RSA *rsa, const unsigned char **pp)
{ {
byte *der; byte *der;
<<<<<<< HEAD
int derLen; int derLen;
=======
int derLen = 165;
>>>>>>> d2i_PKCS12_fp
int ret; int ret;
WOLFSSL_ENTER("i2d_RSAPublicKey"); WOLFSSL_ENTER("i2d_RSAPublicKey");
@ -27682,6 +27694,10 @@ int wolfSSL_i2d_RSAPublicKey(WOLFSSL_RSA *rsa, const unsigned char **pp)
WOLFSSL_MSG("SetRsaInternal Failed"); WOLFSSL_MSG("SetRsaInternal Failed");
return ret; return ret;
} }
<<<<<<< HEAD
=======
>>>>>>> d2i_PKCS12_fp
if((derLen = RsaPublicKeyDerSize((RsaKey *)rsa->internal, 1)) < 0) if((derLen = RsaPublicKeyDerSize((RsaKey *)rsa->internal, 1)) < 0)
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
der = (byte*)XMALLOC(derLen, NULL, DYNAMIC_TYPE_TMP_BUFFER); der = (byte*)XMALLOC(derLen, NULL, DYNAMIC_TYPE_TMP_BUFFER);

2
tests/api.c
View File

@ -18582,7 +18582,7 @@ static void test_wolfSSL_ASN1_TIME_to_generalizedtime(void){
} }
static void test_wolfSSL_X509_check_ca(void){ static void test_wolfSSL_X509_check_ca(void){
#if defined(OPENSSL_EXTRA) #if defined(OPENSSL_EXTRA) && !defined(NO_RSA)
WOLFSSL_X509 *x509; WOLFSSL_X509 *x509;
x509 = wolfSSL_X509_load_certificate_file(svrCertFile, WOLFSSL_FILETYPE_PEM); x509 = wolfSSL_X509_load_certificate_file(svrCertFile, WOLFSSL_FILETYPE_PEM);