Additional print protections. Remove in the future.

wolfSSL · Jul 30, 2024 · 9aad059 · 9aad059
1 parent d2323e9
commit 9aad059
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/wh_client_cryptocb.c b/src/wh_client_cryptocb.c
@@ -301,16 +301,20 @@ int wh_Client_CryptoCb(int devId, wc_CryptoInfo* info, void* inCtx)
                 WC_ALGO_TYPE_PK,
                 WH_PACKET_STUB_SIZE + sizeof(packet->pkRsakgReq),
                 (uint8_t*)packet);
+#ifdef DEBUG_CRYPTOCB_VERBOSE
             printf("RSA KeyGen Req sent:size:%u, e:%u, ret:%d\n",
                     packet->pkRsakgReq.size, packet->pkRsakgReq.e, ret);
+#endif
             if (ret == 0) {
                 do {
                     ret = wh_Client_RecvResponse(ctx, &group, &action, &dataSz,
                         (uint8_t*)packet);
                 } while (ret == WH_ERROR_NOTREADY);
             }
+#ifdef DEBUG_CRYPTOCB_VERBOSE
             printf("RSA KeyGen Res recv:keyid:%u, rc:%d, ret:%d\n",
                     packet->pkRsakgRes.keyId, packet->rc, ret);
+#endif
             if (ret == 0) {
                 if (packet->rc != 0)
                     ret = packet->rc;
@@ -372,6 +376,8 @@ int wh_Client_CryptoCb(int devId, wc_CryptoInfo* info, void* inCtx)
                 ret = derSize = wc_RsaKeyToDer(info->pk.rsa.key, keyDer, sizeof(keyDer));
                 if(derSize >= 0) {
                     /* Cache the key and get the keyID */
+                    /* WWW This is likely recursive so assume the packet will be
+                     *     trashed by the time this returns */
                     ret = wh_Client_KeyCache(ctx, 0, (uint8_t*)keyLabel,
                         sizeof(keyLabel), keyDer, derSize, &cacheKeyId);
                     packet->pkRsaReq.keyId = cacheKeyId;
@@ -385,7 +391,9 @@ int wh_Client_CryptoCb(int devId, wc_CryptoInfo* info, void* inCtx)
 #endif
             /* set type */
             packet->pkRsaReq.opType = info->pk.rsa.type;
+#ifdef DEBUG_CRYPTOCB_VERBOSE
             printf("RSA optype:%u\n",packet->pkRsaReq.opType);
+#endif
             /* set inLen */
             packet->pkRsaReq.inLen = info->pk.rsa.inLen;
             /* set outLen */

diff --git a/src/wh_server_crypto.c b/src/wh_server_crypto.c
@@ -144,7 +144,9 @@ static int hsmCryptoRsaFunction(whServerContext* server, whPacket* packet,
     if (ret == 0) {
         ret = hsmLoadKeyRsa(server, server->crypto->algoCtx.rsa,
             packet->pkRsaReq.keyId);
+#ifdef DEBUG_CRYPTOCB_VERBOSE
         printf("-LoadKeyRsa keyid %u:%d\n", packet->pkRsaReq.keyId,ret);
+#endif
     }
     /* do the rsa operation */
     if (ret == 0) {