Fixes after rebase on latest master

Author: danielinux

wolfcrypt/benchmark/benchmark.c

@@ -2081,7 +2081,6 @@ static const char* bench_result_words2[][6] = {
 #endif
 };
 #endif /* !WC_NO_RNG || WOLFSSL_HAVE_MLKEM */
-#endif
 #if defined(WOLFSSL_MICROCHIP_TA100)
     #include <wolfssl/wolfcrypt/port/atmel/atmel.h>
 #endif

wolfcrypt/src/signature.c

@@ -124,6 +124,7 @@ int wc_SignatureGetSize(enum wc_SignatureType sig_type,
                 sig_len = wc_RsaEncryptSize((RsaKey*)(wc_ptr_t)key);
 #else
                 sig_len = wc_RsaEncryptSize((const RsaKey*)key);
+#endif
 #if defined(WOLFSSL_MICROCHIP_TA100)
                 if (sig_len <= 0) {
                     const RsaKey* r = (const RsaKey*)key;

wolfcrypt/test/test.c

@@ -70872,8 +70872,8 @@ static void print_fiducials(void) {
            fiducial1, fiducial2, fiducial3, fiducial4);
 }
 
-#else /* NO_CRYPT_TEST && !WC_TEST_EXPORT_SUBTESTS */
+#if defined(NO_CRYPT_TEST) && !defined(WC_TEST_EXPORT_SUBTESTS)
     #ifndef NO_MAIN_DRIVER
         int main(void) { return 0; }
-    #endif
-#endif /* NO_CRYPT_TEST && !WC_TEST_EXPORT_SUBTESTS */
+    #endif /* !NO_MAIN_DRIVER */
+#endif /* defined(NO_CRYPT_TEST) && !defined(WC_TEST_EXPORT_SUBTESTS) */