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

Merge pull request #4575 from SparkiDev/dh_enc_fix_2

Browse Source 
ASN: DH private key encoding
This commit is contained in:
David Garske
2021-11-18 06:57:40 -08:00
committed by GitHub
parent 618b9619c5 370570d19b
commit d02e819e4c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wolfcrypt/src/asn.c
View File

@ -8313,7 +8313,7 @@ int wc_DhKeyToDer(DhKey* key, byte* output, word32* outSz, int exportPriv)
{ {
#ifndef WOLFSSL_ASN_TEMPLATE #ifndef WOLFSSL_ASN_TEMPLATE
int ret, privSz = 0, pubSz = 0, keySz; int ret, privSz = 0, pubSz = 0, keySz;
word32 idx, total; word32 idx, len, total;
if (key == NULL || outSz == NULL) { if (key == NULL || outSz == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@ -8342,8 +8342,9 @@ int wc_DhKeyToDer(DhKey* key, byte* output, word32* outSz, int exportPriv)
/* object dhKeyAgreement 1.2.840.113549.1.3.1 */ /* object dhKeyAgreement 1.2.840.113549.1.3.1 */
idx += SetObjectId(sizeof(keyDhOid), NULL); idx += SetObjectId(sizeof(keyDhOid), NULL);
idx += sizeof(keyDhOid); idx += sizeof(keyDhOid);
len = idx - keySz;
/* sequence - all but pub/priv */ /* sequence - all but pub/priv */
idx += SetSequence(idx - keySz, NULL); idx += SetSequence(len, NULL);
if (exportPriv) { if (exportPriv) {
/* version: 0 (ASN_INTEGER, 0x01, 0x00) */ /* version: 0 (ASN_INTEGER, 0x01, 0x00) */
idx += 3; idx += 3;
@ -8370,7 +8371,7 @@ int wc_DhKeyToDer(DhKey* key, byte* output, word32* outSz, int exportPriv)
idx += SetMyVersion(0, output + idx, 0); idx += SetMyVersion(0, output + idx, 0);
} }
/* sequence - all but pub/priv */ /* sequence - all but pub/priv */
idx += SetSequence(total - keySz - idx, output + idx); idx += SetSequence(len, output + idx);
/* object dhKeyAgreement 1.2.840.113549.1.3.1 */ /* object dhKeyAgreement 1.2.840.113549.1.3.1 */
idx += SetObjectId(sizeof(keyDhOid), output + idx); idx += SetObjectId(sizeof(keyDhOid), output + idx);
XMEMCPY(output + idx, keyDhOid, sizeof(keyDhOid)); XMEMCPY(output + idx, keyDhOid, sizeof(keyDhOid));