Revert "Fix enum KeyWrap_Sum impossible combinations (note: ugly code)."

This reverts commit 2bac48a290e5243337f661c70eb582e55ceb2c39.
This commit is contained in:
Daniel Pouzzner
2023-04-10 17:20:39 -05:00
parent ed11669f3c
commit 41818bf6f8

View File

@@ -1110,23 +1110,13 @@ enum KeyWrap_Sum {
AES128_WRAP = 417 AES128_WRAP = 417
#endif #endif
#ifdef WOLFSSL_AES_192 #ifdef WOLFSSL_AES_192
#ifdef WOLFSSL_AES_128 ,AES192_WRAP = 437
,
#endif
AES192_WRAP = 437
#endif #endif
#ifdef WOLFSSL_AES_256 #ifdef WOLFSSL_AES_256
#if defined(WOLFSSL_AES_128) || defined(WOLFSSL_AES_192) ,AES256_WRAP = 457
,
#endif
AES256_WRAP = 457
#endif #endif
#ifdef HAVE_PKCS7 #ifdef HAVE_PKCS7
#if defined(WOLFSSL_AES_128) || defined(WOLFSSL_AES_192) || \ ,PWRI_KEK_WRAP = 680 /*id-alg-PWRI-KEK, 1.2.840.113549.1.9.16.3.9 */
defined(WOLFSSL_AES_256)
,
#endif
PWRI_KEK_WRAP = 680 /*id-alg-PWRI-KEK, 1.2.840.113549.1.9.16.3.9 */
#endif #endif
}; };
#endif /* !NO_AES || PKCS7 */ #endif /* !NO_AES || PKCS7 */