summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@chromium.org>2014-10-29 16:07:12 -0400
committerAdam Langley <agl@google.com>2014-10-29 21:17:27 +0000
commit2a0f3420f72b47b31c259ffd9f1dde8e646cc0e6 (patch)
tree27beaca5dd27e072bf83e4412cd2db4b324dfeeb
parent5f51c2530347045644ef64e8d277d985609d73d6 (diff)
downloadsrc-2a0f3420f72b47b31c259ffd9f1dde8e646cc0e6.tar.gz
Fix standalone bio_test and v3name_test on Win64.
Win32 still has assembly issues and bssl wants to select() on both sockets and stdin (doesn't work on Windows). But this is a start. Change-Id: Iafc5215be281aed836c5ac2dc8b379399848a2c2 Reviewed-on: https://boringssl-review.googlesource.com/2090 Reviewed-by: Adam Langley <agl@google.com>
-rw-r--r--crypto/bio/CMakeLists.txt3
-rw-r--r--crypto/x509v3/v3nametest.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/crypto/bio/CMakeLists.txt b/crypto/bio/CMakeLists.txt
index 86092f0..9178931 100644
--- a/crypto/bio/CMakeLists.txt
+++ b/crypto/bio/CMakeLists.txt
@@ -26,3 +26,6 @@ add_executable(
)
target_link_libraries(bio_test crypto)
+if (WIN32)
+ target_link_libraries(bio_test ws2_32)
+endif()
diff --git a/crypto/x509v3/v3nametest.c b/crypto/x509v3/v3nametest.c
index 6a2ea85..b2e9c09 100644
--- a/crypto/x509v3/v3nametest.c
+++ b/crypto/x509v3/v3nametest.c
@@ -53,9 +53,9 @@
* Hudson (tjh@cryptsoft.com). */
#include <string.h>
-#include <strings.h>
#include <openssl/crypto.h>
+#include <openssl/mem.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
@@ -326,7 +326,7 @@ static void run_cert(X509 *crt, const char *nameincert,
const char *const *pname = names;
while (*pname)
{
- int samename = strcasecmp(nameincert, *pname) == 0;
+ int samename = OPENSSL_strcasecmp(nameincert, *pname) == 0;
size_t namelen = strlen(*pname);
char *name = malloc(namelen);
int match, ret;