WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added public key type to PKEY copy

pull/1/head
John Safranek 2013-11-06 14:16:21 -08:00
parent 4dc30fcde5
commit 20e6ac7104
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cyassl/internal.h
View File

@ -1664,6 +1664,7 @@ struct CYASSL_X509 {
byte notAfter[MAX_DATE_SZ]; byte notAfter[MAX_DATE_SZ];
int sigOID; int sigOID;
buffer sig; buffer sig;
int pubKeyOID;
buffer pubKey; buffer pubKey;
buffer derCert; /* may need */ buffer derCert; /* may need */
DNS_entry* altNames; /* alt names list */ DNS_entry* altNames; /* alt names list */

1
src/internal.c
View File

@ -3123,6 +3123,7 @@ int CopyDecodedToX509(CYASSL_X509* x509, DecodedCert* dCert)
x509->pubKey.buffer = (byte*)XMALLOC( x509->pubKey.buffer = (byte*)XMALLOC(
dCert->pubKeySize, NULL, DYNAMIC_TYPE_PUBLIC_KEY); dCert->pubKeySize, NULL, DYNAMIC_TYPE_PUBLIC_KEY);
if (x509->pubKey.buffer != NULL) { if (x509->pubKey.buffer != NULL) {
x509->pubKeyOID = dCert->keyOID;
x509->pubKey.length = dCert->pubKeySize; x509->pubKey.length = dCert->pubKeySize;
XMEMCPY(x509->pubKey.buffer, dCert->publicKey, dCert->pubKeySize); XMEMCPY(x509->pubKey.buffer, dCert->publicKey, dCert->pubKeySize);
} }

2
src/ssl.c
View File

@ -8312,7 +8312,7 @@ CYASSL_X509* CyaSSL_X509_load_certificate_file(const char* fname, int format)
key = (CYASSL_EVP_PKEY*)XMALLOC( key = (CYASSL_EVP_PKEY*)XMALLOC(
sizeof(CYASSL_EVP_PKEY), NULL, DYNAMIC_TYPE_PUBLIC_KEY); sizeof(CYASSL_EVP_PKEY), NULL, DYNAMIC_TYPE_PUBLIC_KEY);
if (key != NULL) { if (key != NULL) {
key->type = 0; key->type = x509->pubKeyOID;
key->save_type = 0; key->save_type = 0;
key->pkey.ptr = (char*)XMALLOC( key->pkey.ptr = (char*)XMALLOC(
x509->pubKey.length, NULL, DYNAMIC_TYPE_PUBLIC_KEY); x509->pubKey.length, NULL, DYNAMIC_TYPE_PUBLIC_KEY);