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

Merge pull request #500 from dgarske/ocsp2_asn_fix

Browse Source 
Fix for failing OID check with "ocspstapling2" enabled
This commit is contained in:
John Safranek
2016-07-26 12:41:50 -07:00
committed by GitHub
parent 242d26eba2 c80f1805f0
commit edbec4db20
2 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
wolfcrypt/src/asn.c
View File

@@ -1117,7 +1117,45 @@ int EncodeObjectId(const word16* in, word32 inSz, byte* out, word32* outSz)
return 0;
}
#endif
#endif /* HAVE_OID_ENCODING */
#ifdef HAVE_OID_DECODING
int DecodeObjectId(const byte* in, word32 inSz, word16* out, word32* outSz)
{
int x = 0, y = 0;
word32 t = 0;
/* check args */
if (in == NULL || outSz == NULL) {
return BAD_FUNC_ARG;
}
/* decode bytes */
while (inSz--) {
t = (t << 7) | (in[x] & 0x7F);
if (!(in[x] & 0x80)) {
if (y >= (int)*outSz) {
return BUFFER_E;
}
if (y == 0) {
out[0] = (t / 40);
out[1] = (t % 40);
y = 2;
}
else {
out[y++] = t;
}
t = 0; /* reset tmp */
}
x++;
}
/* return length */
*outSz = y;
return 0;
}
#endif /* HAVE_OID_DECODING */
int GetObjectId(const byte* input, word32* inOutIdx, word32* oid,
word32 oidType, word32 maxIdx)
@@ -1164,6 +1202,33 @@ int GetObjectId(const byte* input, word32* inOutIdx, word32* oid,
if (oidType != oidIgnoreType) {
checkOid = OidFromId(*oid, oidType, &checkOidSz);
#if 0
/* support for dumping OID information */
printf("OID (Type %d, Sz %d, Sum %d): ", oidType, actualOidSz, *oid);
for (i=0; i<actualOidSz; i++) {
printf("%d, ", actualOid[i]);
}
printf("\n");
#ifdef HAVE_OID_DECODING
{
int ret;
word16 decOid[16];
word32 decOidSz = sizeof(decOid);
ret = DecodeObjectId(actualOid, actualOidSz, decOid, &decOidSz);
if (ret == 0) {
printf(" Decoded (Sz %d): ", decOidSz);
for (i=0; i<decOidSz; i++) {
printf("%d.", decOid[i]);
}
printf("\n");
}
else {
printf("DecodeObjectId failed: %d\n", ret);
}
}
#endif /* HAVE_OID_DECODING */
#endif
if (checkOid == NULL ||
(checkOid != NULL && (checkOidSz != actualOidSz ||
XMEMCMP(actualOid, checkOid, checkOidSz) != 0)))
@@ -1340,7 +1405,7 @@ int ToTraditional(byte* input, word32 sz)
if (GetMyVersion(input, &inOutIdx, &version) < 0)
return ASN_PARSE_E;
if (GetAlgoId(input, &inOutIdx, &oid, oidSigType, sz) < 0)
if (GetAlgoId(input, &inOutIdx, &oid, oidKeyType, sz) < 0)
return ASN_PARSE_E;
if (input[inOutIdx] == ASN_OBJECT_ID) {

4
wolfssl/wolfcrypt/asn.h
View File

@@ -653,6 +653,10 @@ WOLFSSL_LOCAL int GetInt(mp_int* mpi, const byte* input, word32* inOutIdx,
WOLFSSL_LOCAL int EncodeObjectId(const word16* in, word32 inSz,
byte* out, word32* outSz);
#endif
#ifdef HAVE_OID_DECODING
WOLFSSL_LOCAL int DecodeObjectId(const byte* in, word32 inSz,
word16* out, word32* outSz);
#endif
WOLFSSL_LOCAL int GetObjectId(const byte* input, word32* inOutIdx, word32* oid,
word32 oidType, word32 maxIdx);
WOLFSSL_LOCAL int GetAlgoId(const byte* input, word32* inOutIdx, word32* oid,