factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Neuter namespace differently to fix Appveyor CI

Browse Source
This commit is contained in:
Theo Buehler 2022-11-23 12:46:44 +01:00
parent f015aed7a0
commit 67ab6a1187
5 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am.common
View File

@ -1,4 +1,3 @@
AM_CFLAGS = AM_CFLAGS =
AM_CPPFLAGS = -I$(top_srcdir)/crypto/hidden -I$(top_srcdir)/ssl/hidden AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/compat -DLIBRESSL_INTERNAL
AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/include/compat -DLIBRESSL_INTERNAL
AM_CPPFLAGS += -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= AM_CPPFLAGS += -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS=

1
crypto/CMakeLists.txt
View File

@ -999,7 +999,6 @@ target_include_directories(crypto_obj
ecdh ecdh
ecdsa ecdsa
evp evp
hidden
hmac hmac
modes modes
ocsp ocsp

24
patches/opensslconf.h.patch Normal file
View File

@ -0,0 +1,24 @@
--- include/openssl/opensslconf.h.orig Tue Nov 22 21:08:27 2022
+++ include/openssl/opensslconf.h Wed Nov 23 12:38:07 2022
@@ -1,6 +1,21 @@
#include <openssl/opensslfeatures.h>
/* crypto/opensslconf.h.in */
+#if defined(_MSC_VER) && !defined(__clang__) && !defined(__attribute__)
+#define __attribute__(a)
+#endif
+
+#ifndef LIBRESSL_NAMESPACE
+# define LCRYPTO_UNUSED(x)
+# define LCRYPTO_USED(x)
+# define LCRYPTO_ALIAS1(pre, x)
+# define LCRYPTO_ALIAS(x)
+
+# define LSSL_UNUSED(x)
+# define LSSL_USED(x)
+# define LSSL_ALIAS(x)
+#endif /* !LIBRESSL_NAMESPACE */
+
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define OPENSSLDIR "/etc/ssl"
#endif

13
patches/windows_headers.patch
View File

@ -13,19 +13,6 @@ diff -u include/openssl.orig/dtls1.h include/openssl/dtls1.h
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
--- include/openssl/opensslconf.h.orig Sat Nov 5 08:36:25 2016
+++ include/openssl/opensslconf.h Mon Jul 17 06:06:58 2017
@@ -1,6 +1,10 @@
#include <openssl/opensslfeatures.h>
/* crypto/opensslconf.h.in */
+#if defined(_MSC_VER) && !defined(__clang__) && !defined(__attribute__)
+#define __attribute__(a)
+#endif
+
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define OPENSSLDIR "/etc/ssl"
#endif
--- include/openssl/ossl_typ.h.orig Fri Feb 18 16:30:39 2022 --- include/openssl/ossl_typ.h.orig Fri Feb 18 16:30:39 2022
+++ include/openssl/ossl_typ.h Mon Feb 21 05:39:35 2022 +++ include/openssl/ossl_typ.h Mon Feb 21 05:39:35 2022
@@ -82,6 +82,22 @@ @@ -82,6 +82,22 @@

2
ssl/CMakeLists.txt
View File

@ -64,9 +64,7 @@ set(
add_library(ssl_obj OBJECT ${SSL_SRC}) add_library(ssl_obj OBJECT ${SSL_SRC})
target_include_directories(ssl_obj target_include_directories(ssl_obj
PRIVATE PRIVATE
../crypto/hidden
../crypto/bio ../crypto/bio
./hidden
. .
../include/compat ../include/compat
PUBLIC PUBLIC