diff --git a/oqs-template/oqs-kem-info.md b/oqs-template/oqs-kem-info.md index dafa41cb..7d5576dc 100644 --- a/oqs-template/oqs-kem-info.md +++ b/oqs-template/oqs-kem-info.md @@ -85,14 +85,14 @@ | HQC | 2023-04-30 | hqc192 | 4 | 3 | 0x2FB1 | x448 | | HQC | 2023-04-30 | hqc256 | 4 | 5 | 0x0246 | | | HQC | 2023-04-30 | hqc256 | 4 | 5 | 0x2F46 | secp521_r1 | -| ML-KEM | ML-KEM-ipd | mlkem1024 | ipd | 5 | 0x0249 | | -| ML-KEM | ML-KEM-ipd | mlkem1024 | ipd | 5 | 0x2F49 | secp521_r1 | -| ML-KEM | ML-KEM-ipd | mlkem1024 | ipd | 5 | 0x2F4A | p384 | -| ML-KEM | ML-KEM-ipd | mlkem512 | ipd | 1 | 0x0247 | | -| ML-KEM | ML-KEM-ipd | mlkem512 | ipd | 1 | 0x2F47 | secp256_r1 | -| ML-KEM | ML-KEM-ipd | mlkem512 | ipd | 1 | 0x2FB2 | x25519 | -| ML-KEM | ML-KEM-ipd | mlkem768 | ipd | 3 | 0x0248 | | -| ML-KEM | ML-KEM-ipd | mlkem768 | ipd | 3 | 0x2F48 | secp384_r1 | -| ML-KEM | ML-KEM-ipd | mlkem768 | ipd | 3 | 0x2FB3 | x448 | -| ML-KEM | ML-KEM-ipd | mlkem768 | ipd | 3 | 0x2FB4 | x25519 | -| ML-KEM | ML-KEM-ipd | mlkem768 | ipd | 3 | 0x2FB5 | p256 | +| ML-KEM | ML-KEM | mlkem1024 | FIPS203 | 5 | 0x0249 | | +| ML-KEM | ML-KEM | mlkem1024 | FIPS203 | 5 | 0x2F49 | secp521_r1 | +| ML-KEM | ML-KEM | mlkem1024 | FIPS203 | 5 | 0x2F4A | p384 | +| ML-KEM | ML-KEM | mlkem512 | FIPS203 | 1 | 0x0247 | | +| ML-KEM | ML-KEM | mlkem512 | FIPS203 | 1 | 0x2F47 | secp256_r1 | +| ML-KEM | ML-KEM | mlkem512 | FIPS203 | 1 | 0x2FB2 | x25519 | +| ML-KEM | ML-KEM | mlkem768 | FIPS203 | 3 | 0x0248 | | +| ML-KEM | ML-KEM | mlkem768 | FIPS203 | 3 | 0x2F48 | secp384_r1 | +| ML-KEM | ML-KEM | mlkem768 | FIPS203 | 3 | 0x2FB3 | x448 | +| ML-KEM | ML-KEM | mlkem768 | FIPS203 | 3 | 0x2FB4 | x25519 | +| ML-KEM | ML-KEM | mlkem768 | FIPS203 | 3 | 0x2FB5 | p256 | diff --git a/oqsprov/oqsprov_keys.c b/oqsprov/oqsprov_keys.c index 0f526abb..bad96908 100644 --- a/oqsprov/oqsprov_keys.c +++ b/oqsprov/oqsprov_keys.c @@ -1256,7 +1256,7 @@ OQSX_KEY *oqsx_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf, // removing extra OTECT STRING from ED25519 and ED448 keys if ((keytype == EVP_PKEY_ED25519) || (keytype == EVP_PKEY_ED448)) { - ASN1_OCTET_STRING *ed_octet; + ASN1_OCTET_STRING *ed_octet = NULL; ed_octet = d2i_ASN1_OCTET_STRING(&ed_octet, &buf, buflen); aux += ed_octet->length; memcpy(concat_key + plen - 1 - aux, ed_octet->data,