Define OpenSSL guard iff OQS_USE_OPENSSL is set

Signed-off-by: Spencer Wilson <[email protected]>
open-quantum-safe · Jul 29, 2024 · f3248ce · f3248ce
1 parent 799a38c
commit f3248ce
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/common/common.h b/src/common/common.h
@@ -43,24 +43,26 @@ extern "C" {
  * This is a temporary workaround until a better error
  * handling strategy is developed.
  */
-#if defined(OQS_USE_OPENSSL) && !defined(OPENSSL_NO_STDIO)
+#ifdef OQS_USE_OPENSSL
+#ifdef OPENSSL_NO_STDIO
 #define OQS_OPENSSL_GUARD(x)                                                           \
     do {                                                                               \
         if( 1 != (x) ) {                                                               \
             fprintf(stderr, "Error return value from OpenSSL API: %d. Exiting.\n", x); \
-            OSSL_FUNC(ERR_print_errors_fp)(stderr);                                    \
             exit(EXIT_FAILURE);                                                        \
         }                                                                              \
     } while (0)
-#else
+#else // OPENSSL_NO_STDIO
 #define OQS_OPENSSL_GUARD(x)                                                           \
     do {                                                                               \
         if( 1 != (x) ) {                                                               \
             fprintf(stderr, "Error return value from OpenSSL API: %d. Exiting.\n", x); \
+            OSSL_FUNC(ERR_print_errors_fp)(stderr);                                    \
             exit(EXIT_FAILURE);                                                        \
         }                                                                              \
     } while (0)
-#endif // defined(OQS_USE_OPENSSL) && !defined(OPENSSL_NO_STDIO)
+#endif // OPENSSL_NO_STDIO
+#endif // OQS_USE_OPENSSL
 
 /**
  * Certain functions (such as OQS_randombytes_openssl in