Address CI failures

aidangarske · aidangarske · commit 2b60f0b283aa · 2026-04-09T13:16:30.000-07:00
diff --git a/src/internal.c b/src/internal.c
@@ -954,12 +954,14 @@ static void wp11_Session_Final(WP11_Session* session)
     }
 #endif
 #endif
+#ifndef NO_HMAC
     if ((session->init & ~WP11_INIT_DIGEST_MASK) == WP11_INIT_HMAC_SIGN ||
         (session->init & ~WP11_INIT_DIGEST_MASK) == WP11_INIT_HMAC_VERIFY) {
         wc_HmacFree(&session->params.hmac.hmac);
         session->init = 0;
     }
-#ifdef WOLFSSL_CMAC
+#endif
+#ifdef HAVE_AESCMAC
     if ((session->init & ~WP11_INIT_DIGEST_MASK) == WP11_INIT_AES_CMAC_SIGN ||
         (session->init & ~WP11_INIT_DIGEST_MASK) == WP11_INIT_AES_CMAC_VERIFY) {
         (void)wc_CmacFree(&session->params.cmac.cmac);
@@ -11459,7 +11461,7 @@ int WP11_Rsa_Verify_Recover(CK_MECHANISM_TYPE mechanism, unsigned char* sig,
                     }
                 }
                 if (data_out != NULL) {
-                    *outLen = (out + *outLen) - data_out;
+                    *outLen = (CK_ULONG)((out + *outLen) - data_out);
                     XMEMMOVE(out, data_out, *outLen);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -954,12 +954,14 @@ static void wp11_Session_Final(WP11_Session* session)`
`954`	`954`	`}`
`955`	`955`	`#endif`
`956`	`956`	`#endif`
	`957`	`+#ifndef NO_HMAC`
`957`	`958`	`if ((session->init & ~WP11_INIT_DIGEST_MASK) == WP11_INIT_HMAC_SIGN \|\|`
`958`	`959`	`(session->init & ~WP11_INIT_DIGEST_MASK) == WP11_INIT_HMAC_VERIFY) {`
`959`	`960`	`wc_HmacFree(&session->params.hmac.hmac);`
`960`	`961`	`session->init = 0;`
`961`	`962`	`}`
`962`		`-#ifdef WOLFSSL_CMAC`
	`963`	`+#endif`
	`964`	`+#ifdef HAVE_AESCMAC`
`963`	`965`	`if ((session->init & ~WP11_INIT_DIGEST_MASK) == WP11_INIT_AES_CMAC_SIGN \|\|`
`964`	`966`	`(session->init & ~WP11_INIT_DIGEST_MASK) == WP11_INIT_AES_CMAC_VERIFY) {`
`965`	`967`	`(void)wc_CmacFree(&session->params.cmac.cmac);`
`@@ -11459,7 +11461,7 @@ int WP11_Rsa_Verify_Recover(CK_MECHANISM_TYPE mechanism, unsigned char* sig,`
`11459`	`11461`	`}`
`11460`	`11462`	`}`
`11461`	`11463`	`if (data_out != NULL) {`
`11462`		`- outLen = (out + outLen) - data_out;`
	`11464`	`+ outLen = (CK_ULONG)((out + outLen) - data_out);`
`11463`	`11465`	`XMEMMOVE(out, data_out, *outLen);`
`11464`	`11466`	`}`
`11465`	`11467`	`}`