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

fix for leading bit check

Browse Source
This commit is contained in:
Jacob Barthelmeh
2019-07-03 10:35:08 -06:00
parent f2bb5e8944
commit 8327984523
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
wolfcrypt/src/asn.c
View File

@@ -4049,7 +4049,7 @@ int wc_DhParamsLoad(const byte* input, word32 inSz, byte* p, word32* pInOutSz,
int wc_DhParamsToDer(DhKey* key, byte* out, word32* outSz) int wc_DhParamsToDer(DhKey* key, byte* out, word32* outSz)
{ {
word32 sz = 0, idx = 0; word32 sz = 0, idx = 0;
int pSz = 0, qSz = 0, ret; int pSz = 0, gSz = 0, ret;
byte scratch[MAX_LENGTH_SZ]; byte scratch[MAX_LENGTH_SZ];
if (key == NULL || outSz == NULL) { if (key == NULL || outSz == NULL) {
@@ -4060,17 +4060,23 @@ int wc_DhParamsToDer(DhKey* key, byte* out, word32* outSz)
if (pSz < 0) { if (pSz < 0) {
return pSz; return pSz;
} }
if (mp_leading_bit(&key->p)) {
pSz++;
}
qSz = mp_unsigned_bin_size(&key->q); gSz = mp_unsigned_bin_size(&key->g);
if (qSz < 0) { if (gSz < 0) {
return qSz; return gSz;
}
if (mp_leading_bit(&key->g)) {
gSz++;
} }
sz = ASN_TAG_SZ; /* Integer */ sz = ASN_TAG_SZ; /* Integer */
sz += SetLength(qSz, scratch);
sz += ASN_TAG_SZ; /* Integer */
sz += SetLength(pSz, scratch); sz += SetLength(pSz, scratch);
sz += qSz + pSz; sz += ASN_TAG_SZ; /* Integer */
sz += SetLength(gSz, scratch);
sz += gSz + pSz;
if (out == NULL) { if (out == NULL) {
byte seqScratch[MAX_SEQ_SZ]; byte seqScratch[MAX_SEQ_SZ];
@@ -4090,6 +4096,10 @@ int wc_DhParamsToDer(DhKey* key, byte* out, word32* outSz)
out[idx++] = ASN_INTEGER; out[idx++] = ASN_INTEGER;
idx += SetLength(pSz, out + idx); idx += SetLength(pSz, out + idx);
if (mp_leading_bit(&key->p)) {
out[idx++] = 0x00;
pSz -= 1; /* subtract 1 from size to account for leading 0 */
}
ret = mp_to_unsigned_bin(&key->p, out + idx); ret = mp_to_unsigned_bin(&key->p, out + idx);
if (ret != MP_OKAY) { if (ret != MP_OKAY) {
return BUFFER_E; return BUFFER_E;
@@ -4097,12 +4107,16 @@ int wc_DhParamsToDer(DhKey* key, byte* out, word32* outSz)
idx += pSz; idx += pSz;
out[idx++] = ASN_INTEGER; out[idx++] = ASN_INTEGER;
idx += SetLength(qSz, out + idx); idx += SetLength(gSz, out + idx);
ret = mp_to_unsigned_bin(&key->q, out + idx); if (mp_leading_bit(&key->g)) {
out[idx++] = 0x00;
gSz -= 1; /* subtract 1 from size to account for leading 0 */
}
ret = mp_to_unsigned_bin(&key->g, out + idx);
if (ret != MP_OKAY) { if (ret != MP_OKAY) {
return BUFFER_E; return BUFFER_E;
} }
idx += qSz; idx += gSz;
return idx; return idx;
} }
#endif /* NO_DH */ #endif /* NO_DH */