Fix OpenSSL 1.1 build with mingw32/64

lib/tests/api.c

@@ -28,9 +28,9 @@
  *
  */
 
-#include "../../tool/openssl-compat.h"
 #include "ykpiv.h"
 #include "internal.h"
+#include "../../tool/openssl-compat.h"
 
 #include <stddef.h>
 #include <stdio.h>

linux.mk

@@ -42,23 +42,14 @@ doit:
 	tar xfz openssl-$(OPENSSLVERSION).tar.gz && \
 	cd openssl-$(OPENSSLVERSION) && \
 	./Configure linux-x86_64 shared --prefix=$(PWD)/tmp/root $(CFLAGS) && \
-	make all install_sw && \
+	make all install VERSION="$(OPENSSLVERSION)" && \
 	cp LICENSE $(PWD)/tmp$(ARCH)/root/licenses/openssl.txt && \
-	rm -rf $(PWD)/tmp/root/ssl/ && \
-	rm -rf $(PWD)/tmp/root/bin/ && \
-	rm -rf $(PWD)/tmp/root/lib/engines/ && \
-	rm -rf $(PWD)/tmp/root/lib/libssl* && \
-	rm $(PWD)/tmp/root/lib/pkgconfig/libssl.pc && \
-	rm $(PWD)/tmp/root/lib/pkgconfig/openssl.pc && \
 	cd .. && \
 	cp ../$(PACKAGE)-$(VERSION).tar.gz . && \
 	tar xfz $(PACKAGE)-$(VERSION).tar.gz && \
 	cd $(PACKAGE)-$(VERSION)/ && \
 	CFLAGS=$(CFLAGS) PKG_CONFIG_PATH=$(PWD)/tmp/root/lib/pkgconfig ./configure --prefix=$(PWD)/tmp/root && \
 	make install $(CHECK) && \
-	rm $(PWD)/tmp/root/lib/*.la && \
-	rm -rf $(PWD)/tmp/root/lib/pkgconfig && \
-	cp COPYING $(PWD)/tmp/root/licenses/$(PACKAGE).txt && \
 	cd .. && \
 	cd root && \
 	zip -r ../../$(PACKAGE)-$(VERSION)-linux-openssl-$(OPENSSLVERSION).zip *

tool/openssl-compat.h

@@ -10,6 +10,8 @@
 #ifndef LIBCRYPTO_COMPAT_H
 #define LIBCRYPTO_COMPAT_H
 
+#ifndef _WINDOWS
+
 #include <openssl/opensslv.h>
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 
@@ -30,6 +32,6 @@ void RSA_get0_crt_params(const RSA *r,
 void X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg,
                    ASN1_OCTET_STRING **pdigest);
 
+#endif /* _WINDOWS */
 #endif /* OPENSSL_VERSION_NUMBER */
 #endif /* LIBCRYPTO_COMPAT_H */
-