From ee50d95b0b72a0bc897646e5af83df70cbb48d7a Mon Sep 17 00:00:00 2001 From: David Garske Date: Tue, 4 Apr 2023 15:15:04 -0700 Subject: [PATCH] Fix `enum KeyWrap_Sum` impossible combinations (note: ugly code). --- wolfssl/wolfcrypt/asn.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/wolfssl/wolfcrypt/asn.h b/wolfssl/wolfcrypt/asn.h index 3d559cc9a..cda516080 100644 --- a/wolfssl/wolfcrypt/asn.h +++ b/wolfssl/wolfcrypt/asn.h @@ -1110,13 +1110,23 @@ enum KeyWrap_Sum { AES128_WRAP = 417 #endif #ifdef WOLFSSL_AES_192 - ,AES192_WRAP = 437 + #ifdef WOLFSSL_AES_128 + , + #endif + AES192_WRAP = 437 #endif #ifdef WOLFSSL_AES_256 - ,AES256_WRAP = 457 + #if defined(WOLFSSL_AES_128) || defined(WOLFSSL_AES_192) + , + #endif + AES256_WRAP = 457 #endif #ifdef HAVE_PKCS7 - ,PWRI_KEK_WRAP = 680 /*id-alg-PWRI-KEK, 1.2.840.113549.1.9.16.3.9 */ + #if defined(WOLFSSL_AES_128) || defined(WOLFSSL_AES_192) || \ + defined(WOLFSSL_AES_256) + , + #endif + PWRI_KEK_WRAP = 680 /*id-alg-PWRI-KEK, 1.2.840.113549.1.9.16.3.9 */ #endif }; #endif /* !NO_AES || PKCS7 */