wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5293 from SparkiDev/asnt_setecc

Browse Source 
ASN template: Handle HAVE_OID_ENCODING
This commit is contained in:
David Garske
2022-06-28 15:45:13 -07:00
committed by GitHub
parent 092b37f709 3c3a90c988
commit f51c29d3ca
1 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
wolfcrypt/src/asn.c
View File

@ -634,7 +634,7 @@ static void SizeASN_CalcDataLength(const ASNItem* asn, ASNSetData *data,
* Call SetASN_Items() to write encoding to a buffer. * Call SetASN_Items() to write encoding to a buffer.
* *
* @param [in] asn ASN.1 items to encode. * @param [in] asn ASN.1 items to encode.
* @param [in, out] data Data to place in each item. Lengths set were not * @param [in, out] data Data to place in each item. Lengths set where not
* known. * known.
* @param [in] count Count of items to encode. * @param [in] count Count of items to encode.
* @param [out] encSz Length of the DER encoding. * @param [out] encSz Length of the DER encoding.
@ -13287,7 +13287,6 @@ word32 SetExplicit(byte number, word32 len, byte* output)
#if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT) #if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT)
#ifndef WOLFSSL_ASN_TEMPLATE
static int SetCurve(ecc_key* key, byte* output) static int SetCurve(ecc_key* key, byte* output)
{ {
#ifdef HAVE_OID_ENCODING #ifdef HAVE_OID_ENCODING
@ -13329,7 +13328,6 @@ static int SetCurve(ecc_key* key, byte* output)
return idx; return idx;
} }
#endif /* !WOLFSSL_ASN_TEMPLATE */
#endif /* HAVE_ECC && HAVE_ECC_KEY_EXPORT */ #endif /* HAVE_ECC && HAVE_ECC_KEY_EXPORT */
@ -22156,6 +22154,8 @@ static int SetEccPublicKey(byte* output, ecc_key* key, int outLen,
word32 pubSz = 0; word32 pubSz = 0;
int sz = 0; int sz = 0;
int ret = 0; int ret = 0;
int curveIdSz;
byte* curveOid = NULL;
/* Check key validity. */ /* Check key validity. */
if ((key == NULL) || (key->dp == NULL)) { if ((key == NULL) || (key->dp == NULL)) {
@ -22178,19 +22178,27 @@ static int SetEccPublicKey(byte* output, ecc_key* key, int outLen,
CALLOC_ASNSETDATA(dataASN, eccPublicKeyASN_Length, ret, key->heap); CALLOC_ASNSETDATA(dataASN, eccPublicKeyASN_Length, ret, key->heap);
/* Set the key type OID. */ /* Get the length of the named curve OID to put into the encoding. */
SetASN_OID(&dataASN[ECCPUBLICKEYASN_IDX_ALGOID_OID], ECDSAk, curveIdSz = SetCurve(key, NULL);
oidKeyType); if (curveIdSz < 0) {
/* Set the curve OID. */ ret = curveIdSz;
SetASN_Buffer(&dataASN[ECCPUBLICKEYASN_IDX_ALGOID_CURVEID], }
(const byte *)key->dp->oid, key->dp->oidSz);
/* Don't try to write out explicit parameters. */ if (ret == 0) {
dataASN[ECCPUBLICKEYASN_IDX_ALGOID_PARAMS].noOut = 1; /* Set the key type OID. */
/* Set size of public point to ensure space is made for it. */ SetASN_OID(&dataASN[ECCPUBLICKEYASN_IDX_ALGOID_OID], ECDSAk,
SetASN_Buffer(&dataASN[ECCPUBLICKEYASN_IDX_PUBKEY], NULL, pubSz); oidKeyType);
/* Calculate size of ECC public key. */ /* Set the curve OID. */
ret = SizeASN_Items(eccPublicKeyASN, dataASN, SetASN_ReplaceBuffer(&dataASN[ECCPUBLICKEYASN_IDX_ALGOID_CURVEID],
eccPublicKeyASN_Length, &sz); NULL, curveIdSz);
/* Don't try to write out explicit parameters. */
dataASN[ECCPUBLICKEYASN_IDX_ALGOID_PARAMS].noOut = 1;
/* Set size of public point to ensure space is made for it. */
SetASN_Buffer(&dataASN[ECCPUBLICKEYASN_IDX_PUBKEY], NULL, pubSz);
/* Calculate size of ECC public key. */
ret = SizeASN_Items(eccPublicKeyASN, dataASN,
eccPublicKeyASN_Length, &sz);
}
/* Check buffer, if passed in, is big enough for encoded data. */ /* Check buffer, if passed in, is big enough for encoded data. */
if ((ret == 0) && (output != NULL) && (sz > outLen)) { if ((ret == 0) && (output != NULL) && (sz > outLen)) {
@ -22202,6 +22210,9 @@ static int SetEccPublicKey(byte* output, ecc_key* key, int outLen,
output); output);
/* Skip to where public point is to be encoded. */ /* Skip to where public point is to be encoded. */
output += sz - pubSz; output += sz - pubSz;
/* Cache the location to place the name curve OID. */
curveOid = (byte*)
dataASN[ECCPUBLICKEYASN_IDX_ALGOID_CURVEID].data.buffer.data;
} }
FREE_ASNSETDATA(dataASN, key->heap); FREE_ASNSETDATA(dataASN, key->heap);
@ -22214,6 +22225,13 @@ static int SetEccPublicKey(byte* output, ecc_key* key, int outLen,
sz = pubSz; sz = pubSz;
} }
if ((ret == 0) && (output != NULL)) {
/* Put named curve OID data into encoding. */
curveIdSz = SetCurve(key, curveOid);
if (curveIdSz < 0) {
ret = curveIdSz;
}
}
if ((ret == 0) && (output != NULL)) { if ((ret == 0) && (output != NULL)) {
/* Encode public point. */ /* Encode public point. */
PRIVATE_KEY_UNLOCK(); PRIVATE_KEY_UNLOCK();
@ -26482,8 +26500,8 @@ static int MakeCertReq(Cert* cert, byte* derBuffer, word32 derSz,
if (cert->challengePw[0] != '\0') { if (cert->challengePw[0] != '\0') {
/* Add challenge password attribute. */ /* Add challenge password attribute. */
/* Set challenge password OID. */ /* Set challenge password OID. */
SetASN_Buffer(&dataASN[CERTREQBODYASN_IDX_ATTRS_CPW_OID], attrChallengePasswordOid, SetASN_Buffer(&dataASN[CERTREQBODYASN_IDX_ATTRS_CPW_OID],
sizeof(attrChallengePasswordOid)); attrChallengePasswordOid, sizeof(attrChallengePasswordOid));
/* Enable the ASN template item with the appropriate tag. */ /* Enable the ASN template item with the appropriate tag. */
if (cert->challengePwPrintableString) { if (cert->challengePwPrintableString) {
/* PRINTABLE_STRING - set buffer */ /* PRINTABLE_STRING - set buffer */
@ -29285,6 +29303,7 @@ static int wc_BuildEccKeyDer(ecc_key* key, byte* output, word32 *inLen,
word32 privSz, pubSz; word32 privSz, pubSz;
int sz = 0; int sz = 0;
int ret = 0; int ret = 0;
int curveIdSz;
/* Check validity of parameters. */ /* Check validity of parameters. */
if ((key == NULL) || ((output == NULL) && (inLen == NULL))) { if ((key == NULL) || ((output == NULL) && (inLen == NULL))) {
@ -29316,9 +29335,14 @@ static int wc_BuildEccKeyDer(ecc_key* key, byte* output, word32 *inLen,
/* Leave space for private key. */ /* Leave space for private key. */
SetASN_Buffer(&dataASN[ECCKEYASN_IDX_PKEY], NULL, privSz); SetASN_Buffer(&dataASN[ECCKEYASN_IDX_PKEY], NULL, privSz);
if (curveIn) { if (curveIn) {
/* Get length of the named curve OID to put into the encoding. */
curveIdSz = SetCurve(key, NULL);
if (curveIdSz < 0) {
ret = curveIdSz;
}
/* Curve OID */ /* Curve OID */
SetASN_Buffer(&dataASN[ECCKEYASN_IDX_CURVEID], SetASN_ReplaceBuffer(&dataASN[ECCKEYASN_IDX_CURVEID], NULL,
(const byte *)key->dp->oid, key->dp->oidSz); curveIdSz);
/* TODO: add support for SpecifiedECDomain curve. */ /* TODO: add support for SpecifiedECDomain curve. */
dataASN[ECCKEYASN_IDX_CURVEPARAMS].noOut = 1; dataASN[ECCKEYASN_IDX_CURVEPARAMS].noOut = 1;
} }
@ -29351,9 +29375,19 @@ static int wc_BuildEccKeyDer(ecc_key* key, byte* output, word32 *inLen,
/* Encode the private key. */ /* Encode the private key. */
SetASN_Items(eccKeyASN, dataASN, eccKeyASN_Length, output); SetASN_Items(eccKeyASN, dataASN, eccKeyASN_Length, output);
/* Export the private value into the buffer. */ if (curveIn) {
ret = wc_ecc_export_private_only(key, /* Put named curve OID data into encoding. */
curveIdSz = SetCurve(key,
(byte*)dataASN[ECCKEYASN_IDX_CURVEID].data.buffer.data);
if (curveIdSz < 0) {
ret = curveIdSz;
}
}
if (ret == 0) {
/* Export the private value into the buffer. */
ret = wc_ecc_export_private_only(key,
(byte*)dataASN[ECCKEYASN_IDX_PKEY].data.buffer.data, &privSz); (byte*)dataASN[ECCKEYASN_IDX_PKEY].data.buffer.data, &privSz);
}
if ((ret == 0) && pubIn) { if ((ret == 0) && pubIn) {
/* Export the public point into the buffer. */ /* Export the public point into the buffer. */
PRIVATE_KEY_UNLOCK(); PRIVATE_KEY_UNLOCK();