PR feedback

aws · Aug 29, 2024 · e323568 · e323568
1 parent 126021e
commit e323568
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/crypto/evp_extra/evp_asn1.c b/crypto/evp_extra/evp_asn1.c
@@ -606,7 +606,10 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **_pe,
   for (size_t i = 0; i < (size_t)EVP_PKEY_asn1_get_count(); i++) {
     const EVP_PKEY_ASN1_METHOD *ameth = EVP_PKEY_asn1_get0(i);
 
-    const size_t pem_str_len = OPENSSL_strnlen(ameth->pem_str, 16);
+    const size_t longest_pem_str_len = 10;  // "DILITHIUM3"
+
+    const size_t pem_str_len =
+        OPENSSL_strnlen(ameth->pem_str, longest_pem_str_len);
 
     // OPENSSL_strncasecmp(a, b, n) compares up to index n-1
     const size_t cmp_len =

diff --git a/include/openssl/base.h b/include/openssl/base.h
@@ -343,6 +343,7 @@ typedef struct evp_hpke_key_st EVP_HPKE_KEY;
 typedef struct evp_kem_st EVP_KEM;
 typedef struct kem_key_st KEM_KEY;
 typedef struct evp_pkey_ctx_st EVP_PKEY_CTX;
+typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD;
 typedef struct evp_pkey_st EVP_PKEY;
 typedef struct hmac_ctx_st HMAC_CTX;
 typedef struct md4_state_st MD4_CTX;

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
@@ -930,8 +930,6 @@ OPENSSL_EXPORT int EVP_PKEY_kem_check_key(EVP_PKEY *key);
 
 // ASN1 functions
 
-typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD;
-
 // EVP_PKEY_asn1_get_count returns the number of available
 // |EVP_PKEY_ASN1_METHOD| structures.
 OPENSSL_EXPORT int EVP_PKEY_asn1_get_count(void);