[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 193/282: build: remove all HAVE_OPENSSL_ENGINE_H defines
From: |
gnunet |
Subject: |
[gnurl] 193/282: build: remove all HAVE_OPENSSL_ENGINE_H defines |
Date: |
Wed, 01 Apr 2020 14:30:58 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit d6e3273bb004013ce56bc97fae2d576696ca7579
Author: Daniel Stenberg <address@hidden>
AuthorDate: Sat Feb 29 23:39:42 2020 +0100
build: remove all HAVE_OPENSSL_ENGINE_H defines
... as there's nothing in the code that actually uses the define! The
last reference was removed in 38203f158.
Closes #5007
---
lib/Makefile.m32 | 4 ++--
lib/Makefile.netware | 3 +--
lib/config-dos.h | 3 +--
lib/config-plan9.h | 3 +--
lib/config-symbian.h | 5 +----
lib/config-tpf.h | 6 +-----
lib/config-vxworks.h | 5 +----
lib/curl_config.h.cmake | 3 ---
8 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index b6ef0a5cb..ac6b3de63 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1999 - 2019, Daniel Stenberg, <address@hidden>, et al.
+# Copyright (C) 1999 - 2020, Daniel Stenberg, <address@hidden>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -270,7 +270,7 @@ ifdef SSL
OPENSSL_LIBS += -lgdi32 -lcrypt32
endif
INCLUDES += -I"$(OPENSSL_INCLUDE)"
- CFLAGS += -DUSE_OPENSSL -DHAVE_OPENSSL_ENGINE_H -DHAVE_OPENSSL_PKCS12_H \
+ CFLAGS += -DUSE_OPENSSL -DHAVE_OPENSSL_PKCS12_H \
-DOPENSSL_NO_KRB5
DLL_LIBS += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
ifdef SRP
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index a40534684..752d3d6fb 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -6,7 +6,7 @@
# \___|\___/|_| \_\_____|
#
# Copyright (C) 2004 - 2015, Guenter Knauf
-# Copyright (C) 2001 - 2018, Daniel Stenberg, <address@hidden>, et al.
+# Copyright (C) 2001 - 2020, Daniel Stenberg, <address@hidden>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -639,7 +639,6 @@ ifdef WITH_SSL
@echo $(DL)#define HAVE_OPENSSL_PEM_H 1$(DL) >> $@
@echo $(DL)#define HAVE_OPENSSL_ERR_H 1$(DL) >> $@
@echo $(DL)#define HAVE_OPENSSL_CRYPTO_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_OPENSSL_ENGINE_H 1$(DL) >> $@
@echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@
ifdef WITH_SRP
@echo $(DL)#define USE_TLS_SRP 1$(DL) >> $@
diff --git a/lib/config-dos.h b/lib/config-dos.h
index 25f751eb5..aa83c4be5 100644
--- a/lib/config-dos.h
+++ b/lib/config-dos.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2020, Daniel Stenberg, <address@hidden>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -138,7 +138,6 @@
/* USE_OPENSSL on cmd-line */
#ifdef USE_OPENSSL
#define HAVE_CRYPTO_CLEANUP_ALL_EX_DATA 1
- #define HAVE_OPENSSL_ENGINE_H 1
#define OPENSSL_NO_KRB5 1
#endif
diff --git a/lib/config-plan9.h b/lib/config-plan9.h
index 4063d4bbd..41440a14e 100644
--- a/lib/config-plan9.h
+++ b/lib/config-plan9.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2020, Daniel Stenberg, <address@hidden>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -138,7 +138,6 @@
#define USE_OPENSSL 1
#define HAVE_OPENSSL_CRYPTO_H 1
-#define HAVE_OPENSSL_ENGINE_H 1
#define HAVE_OPENSSL_ERR_H 1
#define HAVE_OPENSSL_PEM_H 1
#define HAVE_OPENSSL_PKCS12_H 1
diff --git a/lib/config-symbian.h b/lib/config-symbian.h
index c01e1bfab..82a27bfef 100644
--- a/lib/config-symbian.h
+++ b/lib/config-symbian.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2020, Daniel Stenberg, <address@hidden>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -358,9 +358,6 @@
/* Define to 1 if you have the <openssl/crypto.h> header file. */
/*#define HAVE_OPENSSL_CRYPTO_H 1*/
-/* Define to 1 if you have the <openssl/engine.h> header file. */
-/*#define HAVE_OPENSSL_ENGINE_H 1*/
-
/* Define to 1 if you have the <openssl/err.h> header file. */
/*#define HAVE_OPENSSL_ERR_H 1*/
diff --git a/lib/config-tpf.h b/lib/config-tpf.h
index 85b634f9d..a79afae6d 100644
--- a/lib/config-tpf.h
+++ b/lib/config-tpf.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2020, Daniel Stenberg, <address@hidden>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -316,10 +316,6 @@
/* #undef HAVE_OPENSSL_CRYPTO_H */
#define HAVE_OPENSSL_CRYPTO_H 1
-/* Define to 1 if you have the <openssl/engine.h> header file. */
-/* #undef HAVE_OPENSSL_ENGINE_H */
-#define HAVE_OPENSSL_ENGINE_H 1
-
/* Define to 1 if you have the <openssl/err.h> header file. */
/* #undef HAVE_OPENSSL_ERR_H */
#define HAVE_OPENSSL_ERR_H 1
diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h
index 004fd4e80..2769cdfd9 100644
--- a/lib/config-vxworks.h
+++ b/lib/config-vxworks.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2020, Daniel Stenberg, <address@hidden>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -418,9 +418,6 @@
/* Define to 1 if you have the <openssl/crypto.h> header file. */
#define HAVE_OPENSSL_CRYPTO_H 1
-/* Define to 1 if you have the <openssl/engine.h> header file. */
-#define HAVE_OPENSSL_ENGINE_H 1
-
/* Define to 1 if you have the <openssl/err.h> header file. */
#define HAVE_OPENSSL_ERR_H 1
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index fda0926b5..98cdf5145 100644
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -455,9 +455,6 @@
/* Define to 1 if you have the <openssl/crypto.h> header file. */
#cmakedefine HAVE_OPENSSL_CRYPTO_H 1
-/* Define to 1 if you have the <openssl/engine.h> header file. */
-#cmakedefine HAVE_OPENSSL_ENGINE_H 1
-
/* Define to 1 if you have the <openssl/err.h> header file. */
#cmakedefine HAVE_OPENSSL_ERR_H 1
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 168/282: tests: Automatically deduce the tool name from the test case for unit tests, (continued)
- [gnurl] 168/282: tests: Automatically deduce the tool name from the test case for unit tests, gnunet, 2020/04/01
- [gnurl] 185/282: ci/tests: Send test results to Azure DevOps for reporting, gnunet, 2020/04/01
- [gnurl] 189/282: docs: fix typo on CURLINFO_RETRY_AFTER - alwaus -> always, gnunet, 2020/04/01
- [gnurl] 194/282: ci/tests: Make sure that the AZURE_ACCESS_TOKEN is available, gnunet, 2020/04/01
- [gnurl] 197/282: configure.ac: Disable metalink support if an incompatible SSL/TLS specified, gnunet, 2020/04/01
- [gnurl] 196/282: ci/tests: Update Azure DevOps pipeline job display names, gnunet, 2020/04/01
- [gnurl] 195/282: ci/tests: Fix typo in previous commit 597cf2, gnunet, 2020/04/01
- [gnurl] 202/282: altsvc: both h3 backends now speak h3-27, gnunet, 2020/04/01
- [gnurl] 198/282: unit1651: Fixed conversion compilation warning, gnunet, 2020/04/01
- [gnurl] 188/282: md5: Added implementation for mbedTLS, gnunet, 2020/04/01
- [gnurl] 193/282: build: remove all HAVE_OPENSSL_ENGINE_H defines,
gnunet <=
- [gnurl] 206/282: formdata/mime: copyright year range update, gnunet, 2020/04/01
- [gnurl] 201/282: mime: fix the binary encoder to handle large data properly, gnunet, 2020/04/01
- [gnurl] 205/282: Revert "mime: latch last read callback status.", gnunet, 2020/04/01
- [gnurl] 210/282: tests: disable 962, 963 and 964 on Windows, gnunet, 2020/04/01
- [gnurl] 208/282: configure: bump the AC_COPYRIGHT year range, gnunet, 2020/04/01
- [gnurl] 192/282: CMake: clean up and improve build procedures, gnunet, 2020/04/01
- [gnurl] 207/282: tests: disable SMTP UTF-8 tests on Windows, gnunet, 2020/04/01
- [gnurl] 203/282: Revert "mime: fix the binary encoder to handle large data properly", gnunet, 2020/04/01
- [gnurl] 213/282: ci/tests: some MacOS builds randomly take longer than 20min, gnunet, 2020/04/01
- [gnurl] 199/282: mime: latch last read callback status., gnunet, 2020/04/01