From 4270e6716f03a2c65fb2c5f22348f657abccc771 Mon Sep 17 00:00:00 2001
From: kinichiro <kinichiro.inoguchi@gmail.com>
Date: Mon, 4 May 2020 20:55:07 +0900
Subject: [PATCH 1/2] Enable regress handshake_table

---
 tests/CMakeLists.txt | 7 +++++++
 tests/Makefile.am    | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 80b785d..f8bb6d8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -225,6 +225,13 @@ add_executable(gost2814789t gost2814789t.c)
 target_link_libraries(gost2814789t ${OPENSSL_LIBS})
 add_test(gost2814789t gost2814789t)
 
+# handshake_table
+if(NOT BUILD_SHARED_LIBS AND NOT MSVC)
+	add_executable(handshake_table handshake_table.c)
+	target_link_libraries(handshake_table ${OPENSSL_LIBS})
+	add_test(handshake_table handshake_table)
+endif()
+
 # hkdf_test
 add_executable(hkdf_test hkdf_test.c)
 target_link_libraries(hkdf_test ${OPENSSL_LIBS})
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7463f26..86db040 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -228,7 +228,8 @@ check_PROGRAMS += gost2814789t
 gost2814789t_SOURCES = gost2814789t.c
 
 # handshake_table
-noinst_PROGRAMS = handshake_table
+TESTS += handshake_table
+check_PROGRAMS += handshake_table
 handshake_table_SOURCES = handshake_table.c
 
 # hkdf_test

From 1fe779234937c7194ef5a11f383136eb005370d5 Mon Sep 17 00:00:00 2001
From: kinichiro <kinichiro.inoguchi@gmail.com>
Date: Mon, 4 May 2020 23:40:33 +0900
Subject: [PATCH 2/2] Enable regress handshake_table on Windows

---
 patches/handshake_table.c.patch | 18 ++++++++++++++++++
 tests/CMakeLists.txt            |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 patches/handshake_table.c.patch

diff --git a/patches/handshake_table.c.patch b/patches/handshake_table.c.patch
new file mode 100644
index 0000000..46f2adb
--- /dev/null
+++ b/patches/handshake_table.c.patch
@@ -0,0 +1,18 @@
+--- tests/handshake_table.c.orig	Mon May  4 23:28:43 2020
++++ tests/handshake_table.c	Mon May  4 23:29:50 2020
+@@ -477,6 +477,7 @@
+ 	unsigned int	depth = 0;
+ 	int		ch, graphviz = 0, print = 0;
+ 
++#ifndef _MSC_VER
+ 	while ((ch = getopt(argc, argv, "Cg")) != -1) {
+ 		switch (ch) {
+ 		case 'C':
+@@ -494,6 +495,7 @@
+ 
+ 	if (argc != 0)
+ 		usage();
++#endif
+ 
+ 	if (graphviz && print)
+ 		usage();
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f8bb6d8..ed63f06 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -226,7 +226,7 @@ target_link_libraries(gost2814789t ${OPENSSL_LIBS})
 add_test(gost2814789t gost2814789t)
 
 # handshake_table
-if(NOT BUILD_SHARED_LIBS AND NOT MSVC)
+if(NOT BUILD_SHARED_LIBS)
 	add_executable(handshake_table handshake_table.c)
 	target_link_libraries(handshake_table ${OPENSSL_LIBS})
 	add_test(handshake_table handshake_table)