Merge pull request #7799 from anhu/fips_macro_guard

Better macro guarding fix undeclared var error
wolfSSL · Sep 12, 2024 · e9d820b · e9d820b
2 parents b736d78 + 4bd39aa
commit e9d820b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/ssl_sess.c b/src/ssl_sess.c
@@ -1849,7 +1849,8 @@ int AddSessionToCache(WOLFSSL_CTX* ctx, WOLFSSL_SESSION* addSession,
  WOLFSSL_MSG("Hash session failed");
  #ifdef HAVE_SESSION_TICKET
  XFREE(ticBuff, NULL, DYNAMIC_TYPE_SESSION_TICK);
- #if defined(WOLFSSL_TLS13) && defined(WOLFSSL_TICKET_NONCE_MALLOC)
+ #if defined(WOLFSSL_TLS13) && defined(WOLFSSL_TICKET_NONCE_MALLOC) && \
+ (!defined(HAVE_FIPS) || (defined(FIPS_VERSION_GE) && FIPS_VERSION_GE(5,3)))
  XFREE(preallocNonce, addSession->heap, DYNAMIC_TYPE_SESSION_TICK);
  #endif
  #endif
@@ -1860,7 +1861,8 @@ int AddSessionToCache(WOLFSSL_CTX* ctx, WOLFSSL_SESSION* addSession,
  if (SESSION_ROW_WR_LOCK(sessRow) != 0) {
  #ifdef HAVE_SESSION_TICKET
  XFREE(ticBuff, NULL, DYNAMIC_TYPE_SESSION_TICK);
- #if defined(WOLFSSL_TLS13) && defined(WOLFSSL_TICKET_NONCE_MALLOC)
+ #if defined(WOLFSSL_TLS13) && defined(WOLFSSL_TICKET_NONCE_MALLOC) && \
+ (!defined(HAVE_FIPS) || (defined(FIPS_VERSION_GE) && FIPS_VERSION_GE(5,3)))
  XFREE(preallocNonce, addSession->heap, DYNAMIC_TYPE_SESSION_TICK);
  #endif
  #endif
@@ -1899,7 +1901,8 @@ int AddSessionToCache(WOLFSSL_CTX* ctx, WOLFSSL_SESSION* addSession,
  if (cacheSession == NULL) {
  #ifdef HAVE_SESSION_TICKET
  XFREE(ticBuff, NULL, DYNAMIC_TYPE_SESSION_TICK);
- #if defined(WOLFSSL_TLS13) && defined(WOLFSSL_TICKET_NONCE_MALLOC)
+ #if defined(WOLFSSL_TLS13) && defined(WOLFSSL_TICKET_NONCE_MALLOC) && \
+ (!defined(HAVE_FIPS) || (defined(FIPS_VERSION_GE) && FIPS_VERSION_GE(5,3)))
  XFREE(preallocNonce, addSession->heap, DYNAMIC_TYPE_SESSION_TICK);
  #endif
  #endif