Make --enable-aeskeywrap drive HAVE_AES_KEYWRAP (F-3401)

After gating slot.c advertisement on HAVE_AES_KEYWRAP, the --enable-aeskeywrap
build option (which defined the unused HAVE_AES_KEY_WRAP) no longer controlled
anything. Point the option at the canonical HAVE_AES_KEYWRAP so it actually
enables the feature end-to-end.

Only ever define the macro when the option is enabled; never emit an #undef.
The previous configure DISABLE_DEFS path and the cmake/options.h.in entry would
otherwise generate '#undef HAVE_AES_KEYWRAP' in wolfpkcs11/options.h, which -
included after wolfssl/options.h - would clobber the wolfSSL-provided macro and
silently disable key wrap. The option can now only force it on; keywrap is
impossible without wolfSSL's wc_AesKeyWrap regardless.

Author: julek-wolfssl

CMakeLists.txt

@@ -244,7 +244,7 @@ add_option("WOLFPKCS11_AESKEYWRAP"
     "no" "yes;no")
 
 if(WOLFPKCS11_AESKEYWRAP)
-    list(APPEND WOLFPKCS11_DEFINITIONS "-DHAVE_AES_KEY_WRAP")
+    list(APPEND WOLFPKCS11_DEFINITIONS "-DHAVE_AES_KEYWRAP")
 endif()
 
 # AES-CBC

cmake/options.h.in

@@ -54,8 +54,6 @@ extern "C" {
 #cmakedefine NO_DH
 #undef NO_AES
 #cmakedefine NO_AES
-#undef HAVE_AES_KEY_WRAP
-#cmakedefine HAVE_AES_KEY_WRAP
 #undef NO_AES_CBC
 #cmakedefine NO_AES_CBC
 #undef HAVE_AESGCM

configure.ac

@@ -223,11 +223,12 @@ AC_ARG_ENABLE([aeskeywrap],
     [ ENABLED_AESKEYWRAP=$enableval ],
     [ ENABLED_AESKEYWRAP=no ]
     )
+# The implementation and mechanism advertisement gate on HAVE_AES_KEYWRAP (the
+# wolfSSL macro). Only force it on when requested; never emit an #undef, which
+# would clobber a wolfSSL build that already provides key wrap.
 if test "$ENABLED_AESKEYWRAP" = "yes"
 then
-    AM_CFLAGS="$AM_CFLAGS -DHAVE_AES_KEY_WRAP"
-else
-    DISABLE_DEFS="$DISABLE_DEFS -DHAVE_AES_KEY_WRAP"
+    AM_CFLAGS="$AM_CFLAGS -DHAVE_AES_KEYWRAP"
 fi
 
 AC_ARG_ENABLE([aescbc],