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

crl signature check, be sure to load CAs first

Browse Source
This commit is contained in:
toddouska
2012-05-24 15:49:38 -07:00
parent 0a31dc3a37
commit 3f35c86520
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ctaocrypt/src/asn.c
View File

@@ -4782,11 +4782,12 @@ static int GetCRL_Signature(const byte* source, word32* idx, DecodedCRL* dcrl,
/* prase crl buffer into decoded state, 0 on success */ /* prase crl buffer into decoded state, 0 on success */
int ParseCRL(DecodedCRL* dcrl, const byte* buff, long sz) int ParseCRL(DecodedCRL* dcrl, const byte* buff, long sz, void* cm)
{ {
int version, len; int version, len;
word32 oid, idx = 0; word32 oid, idx = 0;
Md5 md5; Md5 md5;
Signer* ca;
CYASSL_MSG("ParseCRL"); CYASSL_MSG("ParseCRL");
@@ -4848,6 +4849,25 @@ int ParseCRL(DecodedCRL* dcrl, const byte* buff, long sz)
if (GetCRL_Signature(buff, &idx, dcrl, sz) < 0) if (GetCRL_Signature(buff, &idx, dcrl, sz) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
ca = GetCA(cm, dcrl->issuerHash);
CYASSL_MSG("About to verify CRL signature");
if (ca) {
CYASSL_MSG("Found CRL issuer CA");
/* try to confirm/verify signature */
if (!ConfirmSignature(buff + dcrl->certBegin,
dcrl->sigIndex - dcrl->certBegin,
ca->publicKey, ca->pubKeySize, ca->keyOID,
dcrl->signature, dcrl->sigLength, dcrl->signatureOID, NULL)) {
CYASSL_MSG("CRL Confirm signature failed");
return ASN_SIG_CONFIRM_E;
}
}
else {
CYASSL_MSG("Did NOT find CRL issuer CA");
return ASN_SIG_CONFIRM_E;
}
return 0; return 0;
} }

2
cyassl/ctaocrypt/asn.h
View File

@@ -444,7 +444,7 @@ struct DecodedCRL {
}; };
CYASSL_LOCAL void InitDecodedCRL(DecodedCRL*); CYASSL_LOCAL void InitDecodedCRL(DecodedCRL*);
CYASSL_LOCAL int ParseCRL(DecodedCRL*, const byte* buff, long sz); CYASSL_LOCAL int ParseCRL(DecodedCRL*, const byte* buff, long sz, void* cm);
CYASSL_LOCAL void FreeDecodedCRL(DecodedCRL*); CYASSL_LOCAL void FreeDecodedCRL(DecodedCRL*);

2
src/crl.c
View File

@@ -256,7 +256,7 @@ int BufferLoadCRL(CYASSL_CRL* crl, const byte* buff, long sz, int type)
} }
InitDecodedCRL(&dcrl); InitDecodedCRL(&dcrl);
ret = ParseCRL(&dcrl, myBuffer, sz); ret = ParseCRL(&dcrl, myBuffer, sz, crl->cm);
if (ret != 0) { if (ret != 0) {
CYASSL_MSG("ParseCRL error"); CYASSL_MSG("ParseCRL error");
} }