Content-Type: multipart/mixed; boundary="===============3496753781129858402==" MIME-Version: 1.0 From: James Prestwood To: iwd at lists.01.org Subject: [PATCH v4 01/10] dpp-util: add dpp_point_to_asn1 Date: Thu, 16 Dec 2021 10:08:45 -0800 Message-ID: <20211216180854.39470-1-prestwoj@gmail.com> --===============3496753781129858402== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Converts an l_ecc_point to the DPP ASN.1 structure. --- src/dpp-util.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/dpp-util.h | 2 ++ 2 files changed, 92 insertions(+) v4: * Removed unneeded length check * Removed '512 bit' OID, this isn't actually a key size diff --git a/src/dpp-util.c b/src/dpp-util.c index 0b355311..ffdc1f84 100644 --- a/src/dpp-util.c +++ b/src/dpp-util.c @@ -361,3 +361,93 @@ bool dpp_derive_ke(const uint8_t *i_nonce, const uint8= _t *r_nonce, /* ke =3D HKDF-Expand(bk, "DPP Key", length) */ return hkdf_expand(sha, bk, key_len, "DPP Key", ke, key_len); } + +#define ASN1_ID(class, pc, tag) (((class) << 6) | ((pc) << 5) | (tag)) + +#define ASN1_ID_SEQUENCE ASN1_ID(0, 1, 0x10) +#define ASN1_ID_BIT_STRING ASN1_ID(0, 0, 0x03) +#define ASN1_ID_OID ASN1_ID(0, 0, 0x06) + +/* + * Values derived from OID definitions in https://www.secg.org/sec2-v2.pdf + * Appendix A.2.1 + * + * 1.2.840.10045.2.1 (ecPublicKey) + */ +static uint8_t ec_oid[] =3D { 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01 }; + +/* 1.2.840.10045.3.1.7 (prime256v1) */ +static uint8_t ec_p256_oid[] =3D { 0x2a, 0x86, 0x48, 0xce, + 0x3d, 0x03, 0x01, 0x07 }; +/* 1.3.132.0.34 (secp384r1) */ +static uint8_t ec_p384_oid[] =3D { 0x2B, 0x81, 0x04, 0x00, 0x22 }; + +uint8_t *dpp_point_to_asn1(const struct l_ecc_point *p, size_t *len_out) +{ + uint8_t *asn1; + uint8_t *ptr; + uint8_t *type_oid; + size_t type_oid_len; + const struct l_ecc_curve *curve =3D l_ecc_point_get_curve(p); + ssize_t key_size =3D l_ecc_curve_get_scalar_bytes(curve); + uint64_t x[L_ECC_MAX_DIGITS]; + ssize_t ret; + size_t len; + + switch (key_size) { + case 32: + type_oid =3D ec_p256_oid; + type_oid_len =3D sizeof(ec_p256_oid); + break; + case 48: + type_oid =3D ec_p384_oid; + type_oid_len =3D sizeof(ec_p384_oid); + break; + default: + return NULL; + } + + ret =3D l_ecc_point_get_x(p, x, sizeof(x)); + if (ret < 0 || ret !=3D key_size) + return NULL; + + len =3D 2 + sizeof(ec_oid) + 2 + type_oid_len + 2 + key_size + 4; + + if (L_WARN_ON(len > 128)) + return NULL; + + asn1 =3D l_malloc(len + 2); + ptr =3D asn1; + + *ptr++ =3D ASN1_ID_SEQUENCE; + /* Length of both OIDs and key, plus tag/len bytes */ + *ptr++ =3D len; + + *ptr++ =3D ASN1_ID_SEQUENCE; + + len =3D sizeof(ec_oid) + type_oid_len + 4; + + *ptr++ =3D len; + + *ptr++ =3D ASN1_ID_OID; + *ptr++ =3D sizeof(ec_oid); + memcpy(ptr, ec_oid, sizeof(ec_oid)); + ptr +=3D sizeof(ec_oid); + + *ptr++ =3D ASN1_ID_OID; + *ptr++ =3D type_oid_len; + memcpy(ptr, type_oid, type_oid_len); + ptr +=3D type_oid_len; + + *ptr++ =3D ASN1_ID_BIT_STRING; + *ptr++ =3D key_size + 2; + *ptr++ =3D 0x00; + *ptr++ =3D 0x03; + memcpy(ptr, x, key_size); + ptr +=3D key_size; + + if (len_out) + *len_out =3D ptr - asn1; + + return asn1; +} diff --git a/src/dpp-util.h b/src/dpp-util.h index c28bbcdf..e7e73071 100644 --- a/src/dpp-util.h +++ b/src/dpp-util.h @@ -137,3 +137,5 @@ struct l_ecc_scalar *dpp_derive_k2(const struct l_ecc_p= oint *i_proto_public, bool dpp_derive_ke(const uint8_t *i_nonce, const uint8_t *r_nonce, struct l_ecc_scalar *m, struct l_ecc_scalar *n, void *ke); + +uint8_t *dpp_point_to_asn1(const struct l_ecc_point *p, size_t *len_out); -- = 2.31.1 --===============3496753781129858402==--