Update sizes to support 4K RSA keygen

wolfSSL · Jul 30, 2024 · d2323e9 · d2323e9
1 parent 86d2d31
commit d2323e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/wh_client_cryptocb.c b/src/wh_client_cryptocb.c
@@ -319,7 +319,8 @@ int wh_Client_CryptoCb(int devId, wc_CryptoInfo* info, void* inCtx)
                     info->pk.rsakg.key->devCtx = WH_KEYID_TO_DEVCTX(keyId);
 
                     if (info->pk.rsakg.key != NULL) {
-                        byte keyDer[2048] = {0};
+                        /* DER cannot be larger than MTU */
+                        byte keyDer[WOLFHSM_CFG_COMM_DATA_LEN] = {0};
                         uint32_t derSize = sizeof(keyDer);
                         word32 idx = 0;
                         uint8_t keyLabel[WH_NVM_LABEL_LEN] = {0};
@@ -328,6 +329,9 @@ int wh_Client_CryptoCb(int devId, wc_CryptoInfo* info, void* inCtx)
                         ret = wh_Client_KeyExport(ctx,keyId,
                                 keyLabel, sizeof(keyLabel),
                                 keyDer, &derSize);
+#ifdef DEBUG_CRYPTOCB_VERBOSE
+                        printf("-RSA Keygen Der size:%u\n", derSize);
+#endif
                         if (ret == 0) {
                             /* Update the RSA key structure */
                             ret = wc_RsaPrivateKeyDecode(
@@ -344,7 +348,7 @@ int wh_Client_CryptoCb(int devId, wc_CryptoInfo* info, void* inCtx)
         case WC_PK_TYPE_RSA:
         {
             whKeyId cacheKeyId = WH_KEYID_ERASED;
-            byte keyDer[2048] = {0};
+            byte keyDer[5000] = {0};  /* Estimated size of a 4096 keyfile */
             int derSize = 0;
             char keyLabel[] = "ClientCbTemp";
 

diff --git a/test/wolfhsm_cfg.h b/test/wolfhsm_cfg.h
@@ -30,12 +30,12 @@
 /* #define WOLFHSM_CFG_NO_CRYPTO */
 /* #define WOLFHSM_CFG_SHE_EXTENSION */
 
-#define WOLFHSM_CFG_COMM_DATA_LEN 1152
+#define WOLFHSM_CFG_COMM_DATA_LEN 1280
 
 
 #define WOLFHSM_CFG_NVM_OBJECT_COUNT 30
 #define WOLFHSM_CFG_SERVER_KEYCACHE_COUNT 10
-#define WOLFHSM_CFG_SERVER_KEYCACHE_SIZE 1024
+#define WOLFHSM_CFG_SERVER_KEYCACHE_SIZE 1280
 #define WOLFHSM_CFG_SERVER_DMAADDR_COUNT 8
 #define WOLFHSM_CFG_SERVER_CUSTOMCB_COUNT 6