fix broken build on windows

we also want to make sure we use the openssl
version 3.6 and newer.

Reviewed-by: Neil Horman <[email protected]>
(Merged from #38)

Author: Sashan

source/CMakeLists.txt

@@ -113,7 +113,7 @@ find_package(OpenSSL REQUIRED ${OPENSSL_CONFIG_MODE})
 add_library(perf perflib/perfhelper.c perflib/perfsslhelper.c perflib/threads.c
 	perflib/time.c)
 
-if (WIN32)
+if(WIN32)
     target_sources(perf PRIVATE perflib/getopt.c perflib/basename.c perflib/err.c)
 endif()
 
@@ -127,8 +127,15 @@ if( OPENSSL_VERSION VERSION_GREATER_EQUAL 3 )
     add_executable(providerdoall providerdoall.c)
     target_link_libraries(providerdoall PRIVATE perf)
 
+endif()
+
+if( OPENSSL_VERSION VERSION_GREATER_EQUAL 3.6 )
     add_executable(ssl_poll_perf ssl_poll_perf.c)
-    target_link_libraries(ssl_poll_perf PRIVATE perf)
+    if(WIN32)
+        target_link_libraries(ssl_poll_perf PUBLIC wsock32 ws2_32 PRIVATE perf)
+    else()
+        target_link_libraries(ssl_poll_perf PRIVATE perf)
+    endif()
 endif()
 
 add_executable(randbytes randbytes.c)

source/perflib/err.c

@@ -8,10 +8,12 @@
  */
 
 #include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 const char *progname;
 
-static void
+void
 vwarnx(const char *fmt, va_list ap)
 {
     if (progname != NULL)
@@ -20,7 +22,7 @@ vwarnx(const char *fmt, va_list ap)
     putc('\n', stderr);
 }
 
-static void
+void
 errx(int status, const char *fmt, ...)
 {
     va_list ap;
@@ -31,7 +33,7 @@ errx(int status, const char *fmt, ...)
     exit(status);
 }
 
-static void
+void
 warnx(const char *fmt, ...)
 {
     va_list ap;

source/perflib/err.h

@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_PERFLIB_GETOPT_H
-# define OSSL_PERFLIB_GETOPT_H
+#ifndef OSSL_PERFLIB_ERR_H
+# define OSSL_PERFLIB_ERR_H
 # pragma once
 
 #include <stdarg.h>

source/ssl_poll_perf.c

@@ -32,8 +32,6 @@
 /* Include the appropriate header file for SOCK_STREAM */
 #ifdef _WIN32 /* Windows */
 # include <winsock2.h>
-# include "perflib/basename.h"
-# include "perflib/err.h"
 #else /* Linux/Unix */
 # include <err.h>
 # include <sys/socket.h>
@@ -55,6 +53,8 @@
 # include <unistd.h>
 #else
 # include <windows.h>
+# include "perflib/basename.h"
+# include "perflib/err.h"
 # include "perflib/getopt.h"
 #endif /* _WIN32 */
 
@@ -668,7 +668,7 @@ new_txt_full_request(const char *url, const char *fill_pattern, size_t body_len)
     return rtf;
 }
 
-static __attribute__((unused)) const char *
+static const char *
 pe_type_to_name(const struct poll_event *pe)
 {
     static const char *names[] = {
@@ -950,7 +950,7 @@ pe_disable_write(struct poll_event *pe)
  * or error is permanent. In case of permanent error the
  * poll event pe should be removed from poll manager and destroyed.
  */
-static __attribute__((unused)) const char *
+static const char *
 err_str_n(unsigned long e, char *buf, size_t buf_sz)
 {
     ERR_error_string_n(e, buf, buf_sz);
@@ -1003,7 +1003,7 @@ handle_ssl_error(struct poll_event *pe, int rc, const char *caller)
     return rv;
 }
 
-static __attribute__((unused)) const char *
+static const char *
 stream_state_str(int stream_state)
 {
     const char *rv;