Remove unnused code in key wrap test. Use client id in sample meta data

Author: AlexLanzano

test/wh_test_keywrap.c

@@ -54,20 +54,6 @@
 
 #endif /* HAVE_AESGCM */
 
-/* RSA Specific defines */
-#ifndef NO_RSA
-
-#define WH_TEST_RSA_KEY_OFFSET 0x2000
-#define WH_TEST_RSA_KEYID 3
-#define WH_TEST_RSA_MAX_DER_SIZE 2000
-
-/* We need the extra 4 bytes at the start to store the actual wrapped key size
- */
-#define WH_TEST_RSA_MAX_WRAPPED_KEYSIZE                            \
-    (sizeof(uint32_t) + WH_TEST_AES_IVSIZE + WH_TEST_AES_TAGSIZE + \
-     WH_TEST_RSA_MAX_DER_SIZE + sizeof(whNvmMetadata))
-#endif /* !NO_RSA */
-
 static int _InitServerKek(whClientContext* client)
 {
     /* IMPORTANT NOTE: Server KEK is typically intrinsic or set during
@@ -101,7 +87,7 @@ static int _AesGcm_KeyWrap(whClientContext* client, WC_RNG* rng)
     uint8_t       wrappedKey[WH_TEST_AES_WRAPPED_KEYSIZE];
     whKeyId       wrappedKeyId;
     whNvmMetadata metadata = {
-        .id    = WH_MAKE_KEYID(WH_KEYTYPE_CRYPTO, 0, WH_TEST_AESGCM_KEYID),
+        .id    = WH_MAKE_KEYID(WH_KEYTYPE_CRYPTO, client->comm->client_id, WH_TEST_AESGCM_KEYID),
         .label = "AES Key Label",
         .len   = WH_TEST_AES_KEYSIZE,
         .flags = WH_NVM_FLAGS_NONE,