From 41818bf6f895f050366cb054d1e28a99b62c5770 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Mon, 10 Apr 2023 17:20:39 -0500 Subject: [PATCH] Revert "Fix `enum KeyWrap_Sum` impossible combinations (note: ugly code)." This reverts commit 2bac48a290e5243337f661c70eb582e55ceb2c39. --- wolfssl/wolfcrypt/asn.h | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/wolfssl/wolfcrypt/asn.h b/wolfssl/wolfcrypt/asn.h index cda516080..3d559cc9a 100644 --- a/wolfssl/wolfcrypt/asn.h +++ b/wolfssl/wolfcrypt/asn.h @@ -1110,23 +1110,13 @@ enum KeyWrap_Sum { AES128_WRAP = 417 #endif #ifdef WOLFSSL_AES_192 - #ifdef WOLFSSL_AES_128 - , - #endif - AES192_WRAP = 437 + ,AES192_WRAP = 437 #endif #ifdef WOLFSSL_AES_256 - #if defined(WOLFSSL_AES_128) || defined(WOLFSSL_AES_192) - , - #endif - AES256_WRAP = 457 + ,AES256_WRAP = 457 #endif #ifdef HAVE_PKCS7 - #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 */ + ,PWRI_KEK_WRAP = 680 /*id-alg-PWRI-KEK, 1.2.840.113549.1.9.16.3.9 */ #endif }; #endif /* !NO_AES || PKCS7 */