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

use XSTRLEN and revert adding outLen parameter

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-02-26 16:52:09 -07:00
parent e6c95a0854
commit 00b6419964
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
wolfcrypt/src/asn.c
View File

@ -11032,19 +11032,14 @@ static void ByteToHex(byte n, char* str)
str[1] = hexChar[n & 0xf]; str[1] = hexChar[n & 0xf];
} }
/* /* returns 0 on success */
* outLen gets set to the size of buffer malloc'd (including null terminator) static int ASNToHexString(const byte* input, word32* inOutIdx, char** out,
* word32 inSz, void* heap, int heapType)
* returns 0 on success
*/
static int ASNToHexString(const byte* input, word32* inOutIdx, int* outLen,
char** out, word32 inSz, void* heap, int heapType)
{ {
int len; int len;
int i; int i;
char* str; char* str;
*outLen = 0;
if (*inOutIdx >= inSz) { if (*inOutIdx >= inSz) {
return BUFFER_E; return BUFFER_E;
} }
@ -11065,7 +11060,6 @@ static int ASNToHexString(const byte* input, word32* inOutIdx, int* outLen,
*inOutIdx += len; *inOutIdx += len;
*out = str; *out = str;
*outLen = len * 2 + 1;
return 0; return 0;
} }
@ -11125,8 +11119,8 @@ int wc_EccPublicKeyDecode(const byte* input, word32* inOutIdx,
} }
if (ret == 0) { if (ret == 0) {
SkipObjectId(input, inOutIdx, inSz); SkipObjectId(input, inOutIdx, inSz);
ret = ASNToHexString(input, inOutIdx, &len, (char**)&curve->prime, ret = ASNToHexString(input, inOutIdx, (char**)&curve->prime, inSz,
inSz, key->heap, DYNAMIC_TYPE_ECC_BUFFER); key->heap, DYNAMIC_TYPE_ECC_BUFFER);
} }
if (ret == 0) { if (ret == 0) {
curve->size = (int)XSTRLEN(curve->prime) / 2; curve->size = (int)XSTRLEN(curve->prime) / 2;
@ -11135,12 +11129,12 @@ int wc_EccPublicKeyDecode(const byte* input, word32* inOutIdx,
ret = ASN_PARSE_E; ret = ASN_PARSE_E;
} }
if (ret == 0) { if (ret == 0) {
ret = ASNToHexString(input, inOutIdx, &len, (char**)&curve->Af, ret = ASNToHexString(input, inOutIdx, (char**)&curve->Af, inSz,
inSz, key->heap, DYNAMIC_TYPE_ECC_BUFFER); key->heap, DYNAMIC_TYPE_ECC_BUFFER);
} }
if (ret == 0) { if (ret == 0) {
ret = ASNToHexString(input, inOutIdx, &len, (char**)&curve->Bf, ret = ASNToHexString(input, inOutIdx, (char**)&curve->Bf, inSz,
inSz, key->heap, DYNAMIC_TYPE_ECC_BUFFER); key->heap, DYNAMIC_TYPE_ECC_BUFFER);
} }
if (ret == 0) { if (ret == 0) {
if (*inOutIdx < inSz && input[*inOutIdx] == ASN_BIT_STRING) { if (*inOutIdx < inSz && input[*inOutIdx] == ASN_BIT_STRING) {
@ -11150,9 +11144,9 @@ int wc_EccPublicKeyDecode(const byte* input, word32* inOutIdx,
} }
} }
if (ret == 0) { if (ret == 0) {
ret = ASNToHexString(input, inOutIdx, &len, (char**)&point, inSz, ret = ASNToHexString(input, inOutIdx, (char**)&point, inSz,
key->heap, DYNAMIC_TYPE_ECC_BUFFER); key->heap, DYNAMIC_TYPE_ECC_BUFFER);
if (ret == 0 && len < (curve->size * 4) + 2) { if (ret == 0 && (int)XSTRLEN(point) < (curve->size * 4) + 2) {
XFREE(point, key->heap, DYNAMIC_TYPE_ECC_BUFFER); XFREE(point, key->heap, DYNAMIC_TYPE_ECC_BUFFER);
ret = BUFFER_E; ret = BUFFER_E;
} }
@ -11174,8 +11168,8 @@ int wc_EccPublicKeyDecode(const byte* input, word32* inOutIdx,
((char*)curve->Gx)[curve->size * 2] = '\0'; ((char*)curve->Gx)[curve->size * 2] = '\0';
((char*)curve->Gy)[curve->size * 2] = '\0'; ((char*)curve->Gy)[curve->size * 2] = '\0';
XFREE(point, key->heap, DYNAMIC_TYPE_ECC_BUFFER); XFREE(point, key->heap, DYNAMIC_TYPE_ECC_BUFFER);
ret = ASNToHexString(input, inOutIdx, &len, (char**)&curve->order, ret = ASNToHexString(input, inOutIdx, (char**)&curve->order, inSz,
inSz, key->heap, DYNAMIC_TYPE_ECC_BUFFER); key->heap, DYNAMIC_TYPE_ECC_BUFFER);
} }
if (ret == 0) { if (ret == 0) {
curve->cofactor = GetInteger7Bit(input, inOutIdx, inSz); curve->cofactor = GetInteger7Bit(input, inOutIdx, inSz);