Quellcode durchsuchen

fix der_test and rsa_test when compiling for msvc

Steffen Jaeckel vor 7 Jahren
Ursprung
Commit
e1cba4da7d
2 geänderte Dateien mit 18 neuen und 8 gelöschten Zeilen
  1. 9 4
      tests/der_test.c
  2. 9 4
      tests/rsa_test.c

+ 9 - 4
tests/der_test.c

@@ -17,10 +17,6 @@ int der_test(void)
 
 #else
 
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <dirent.h>
-
 #if defined(LTC_TEST_DBG) && LTC_TEST_DBG > 1
 #define LTC_DER_TESTS_PRINT_FLEXI
 #endif
@@ -1314,6 +1310,12 @@ static void der_Xcode_test(void)
    mp_clear(mpinteger);
 }
 
+#if !((defined(_WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__))
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <dirent.h>
+
 static off_t fsize(const char *filename)
 {
    struct stat st;
@@ -1375,6 +1377,7 @@ static void der_asn1_test(void)
    if (f != NULL) fclose(f);
    closedir(d);
 }
+#endif
 
 
 static void _der_regression_test(void)
@@ -1613,7 +1616,9 @@ int der_test(void)
 
    der_Xcode_test();
 
+#if !((defined(_WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__))
    der_asn1_test();
+#endif
 
    der_custom_test();
 

+ 9 - 4
tests/rsa_test.c

@@ -10,10 +10,6 @@
 
 #if defined(LTC_MRSA)
 
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <dirent.h>
-
 #define RSA_MSGSIZE 78
 
 /* These are test keys [see file test.key] that I use to test my import/export against */
@@ -347,6 +343,12 @@ static int _rsa_issue_301(int prng_idx)
    return CRYPT_OK;
 }
 
+#if !((defined(_WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__))
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <dirent.h>
+
 static off_t fsize(const char *filename)
 {
    struct stat st;
@@ -416,6 +418,7 @@ static int _rsa_size_test(void)
    closedir(d);
    return err;
 }
+#endif
 
 int rsa_test(void)
 {
@@ -442,7 +445,9 @@ int rsa_test(void)
       return 1;
    }
 
+#if !((defined(_WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__))
    DO(_rsa_size_test());
+#endif
 
    DO(_rsa_issue_301(prng_idx));