Fixes for fsantize tests with Cavium Nitrox V. Removed typedef for CspHandle since its already defined.

Author: dgarske

wolfcrypt/src/port/cavium/cavium_nitrox.c

@@ -815,12 +815,22 @@ int NitroxAesGcmEncrypt(Aes* aes,
     byte* authTag, word32 authTagSz,
     const byte* authIn, word32 authInSz)
 {
+    const byte* ivTmp = iv;
+    byte ivLcl[AES_BLOCK_SIZE];
+
     (void)keySz;
-    (void)ivSz;
     (void)authTagSz;
-    return NitroxAesEncrypt(aes, AES_GCM, key, iv, out, in, sz,
+
+    /* Nitrox HW requires IV buffer to be 16-bytes */
+    if (ivSz < AES_BLOCK_SIZE) {
+        ivTmp = ivLcl;
+        XMEMCPY(ivLcl, iv, ivSz);
+    }
+
+    return NitroxAesEncrypt(aes, AES_GCM, key, ivTmp, out, in, sz,
         authInSz, authIn, authTag);
 }
+
 #ifdef HAVE_AES_DECRYPT
 int NitroxAesGcmDecrypt(Aes* aes,
     byte* out, const byte* in, word32 sz,
@@ -829,10 +839,19 @@ int NitroxAesGcmDecrypt(Aes* aes,
     const byte* authTag, word32 authTagSz,
     const byte* authIn, word32 authInSz)
 {
+    const byte* ivTmp = iv;
+    byte ivLcl[AES_BLOCK_SIZE];
+
     (void)keySz;
-    (void)ivSz;
     (void)authTagSz;
-    return NitroxAesDecrypt(aes, AES_GCM, key, iv, out, in, sz,
+
+    /* Nitrox HW requires IV buffer to be 16-bytes */
+    if (ivSz < AES_BLOCK_SIZE) {
+        ivTmp = ivLcl;
+        XMEMCPY(ivLcl, iv, ivSz);
+    }
+
+    return NitroxAesDecrypt(aes, AES_GCM, key, ivTmp, out, in, sz,
         authInSz, authIn, authTag);
 }
 #endif /* HAVE_AES_DECRYPT */

wolfssl/wolfcrypt/port/cavium/cavium_nitrox.h

@@ -51,7 +51,6 @@
     #define AES_CBC 0x3
     #define AES_GCM 0x7
 #else
-    typedef int    CspHandle;
     typedef word64 CavReqId;
     #define CAVIUM_DEV_ID       0
     #define CAVIUM_BLOCKING     BLOCKING