Skip the GOST test where appropriate

[openssl.git] / test / v3nametest.c

diff --git a/test/v3nametest.c b/test/v3nametest.c
index dee48328640f29a03b8a5372717335102bf620bd..86f3829aedbd8f3b23bd6b7e8c8d3c90321a51dd 100644 (file)
--- a/test/v3nametest.c
+++ b/test/v3nametest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -8,12 +8,17 @@
  */
 
 #include <string.h>
-#include <internal/nelem.h>
-#include "../e_os.h"
+
+#include <openssl/e_os2.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#include "internal/nelem.h"
 #include "testutil.h"
 
+#ifdef OPENSSL_SYS_WINDOWS
+# define strcasecmp _stricmp
+#endif
+
 static const char *const names[] = {
     "a", "b", ".", "*", "@",
     ".a", "a.", ".b", "b.", ".*", "*.", "*@", "@*", "a@", "@a", "b@", "..",
@@ -246,7 +251,7 @@ static const struct set_name_fn name_fns[] = {
     {set_altname_email, "set rfc822Name", 0, 1},
 };
 
-static X509 *make_cert()
+static X509 *make_cert(void)
 {
     X509 *crt = NULL;