[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 76/256: vtls: move SSL backends' private constants
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 76/256: vtls: move SSL backends' private constants out of their header files |
Date: |
Fri, 06 Oct 2017 19:42:47 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 118b074fba6ac9d8128410ce14cd05d46ad6dfa5
Author: Johannes Schindelin <address@hidden>
AuthorDate: Mon Jun 26 17:05:49 2017 +0200
vtls: move SSL backends' private constants out of their header files
Signed-off-by: Johannes Schindelin <address@hidden>
---
lib/vtls/openssl.c | 3 +++
lib/vtls/openssl.h | 3 ---
lib/vtls/schannel.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
lib/vtls/schannel.h | 48 ------------------------------------------------
4 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 69f35c73c..fcd4539d5 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -152,6 +152,9 @@ static unsigned long OpenSSL_version_num(void)
#define OSSL_PACKAGE "OpenSSL"
#endif
+#define DEFAULT_CIPHER_SELECTION \
+ "ALL:!EXPORT:!EXPORT40:!EXPORT56:!aNULL:!LOW:!RC4:@STRENGTH"
+
/*
* Number of bytes to read from the random number seed file. This must be
* a finite value (because some entropy "files" like /dev/urandom have
diff --git a/lib/vtls/openssl.h b/lib/vtls/openssl.h
index 673719604..030addac6 100644
--- a/lib/vtls/openssl.h
+++ b/lib/vtls/openssl.h
@@ -36,8 +36,5 @@ extern const struct Curl_ssl Curl_ssl_openssl;
/* Set the API backend definition to OpenSSL */
#define CURL_SSL_BACKEND CURLSSLBACKEND_OPENSSL
-#define DEFAULT_CIPHER_SELECTION \
- "ALL:!EXPORT:!EXPORT40:!EXPORT56:!aNULL:!LOW:!RC4:@STRENGTH"
-
#endif /* USE_OPENSSL */
#endif /* HEADER_CURL_SSLUSE_H */
diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index 0531b9b2f..d01a224c9 100644
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -74,6 +74,54 @@
# define HAS_ALPN 1
#endif
+#ifndef UNISP_NAME_A
+#define UNISP_NAME_A "Microsoft Unified Security Protocol Provider"
+#endif
+
+#ifndef UNISP_NAME_W
+#define UNISP_NAME_W L"Microsoft Unified Security Protocol Provider"
+#endif
+
+#ifndef UNISP_NAME
+#ifdef UNICODE
+#define UNISP_NAME UNISP_NAME_W
+#else
+#define UNISP_NAME UNISP_NAME_A
+#endif
+#endif
+
+#ifndef SP_PROT_SSL2_CLIENT
+#define SP_PROT_SSL2_CLIENT 0x00000008
+#endif
+
+#ifndef SP_PROT_SSL3_CLIENT
+#define SP_PROT_SSL3_CLIENT 0x00000008
+#endif
+
+#ifndef SP_PROT_TLS1_CLIENT
+#define SP_PROT_TLS1_CLIENT 0x00000080
+#endif
+
+#ifndef SP_PROT_TLS1_0_CLIENT
+#define SP_PROT_TLS1_0_CLIENT SP_PROT_TLS1_CLIENT
+#endif
+
+#ifndef SP_PROT_TLS1_1_CLIENT
+#define SP_PROT_TLS1_1_CLIENT 0x00000200
+#endif
+
+#ifndef SP_PROT_TLS1_2_CLIENT
+#define SP_PROT_TLS1_2_CLIENT 0x00000800
+#endif
+
+#ifndef SECBUFFER_ALERT
+#define SECBUFFER_ALERT 17
+#endif
+
+/* Both schannel buffer sizes must be > 0 */
+#define CURL_SCHANNEL_BUFFER_INIT_SIZE 4096
+#define CURL_SCHANNEL_BUFFER_FREE_SIZE 1024
+
/* Uncomment to force verbose output
* #define infof(x, y, ...) printf(y, __VA_ARGS__)
* #define failf(x, y, ...) printf(y, __VA_ARGS__)
diff --git a/lib/vtls/schannel.h b/lib/vtls/schannel.h
index 04d640147..4a254df4b 100644
--- a/lib/vtls/schannel.h
+++ b/lib/vtls/schannel.h
@@ -28,54 +28,6 @@
#include "urldata.h"
-#ifndef UNISP_NAME_A
-#define UNISP_NAME_A "Microsoft Unified Security Protocol Provider"
-#endif
-
-#ifndef UNISP_NAME_W
-#define UNISP_NAME_W L"Microsoft Unified Security Protocol Provider"
-#endif
-
-#ifndef UNISP_NAME
-#ifdef UNICODE
-#define UNISP_NAME UNISP_NAME_W
-#else
-#define UNISP_NAME UNISP_NAME_A
-#endif
-#endif
-
-#ifndef SP_PROT_SSL2_CLIENT
-#define SP_PROT_SSL2_CLIENT 0x00000008
-#endif
-
-#ifndef SP_PROT_SSL3_CLIENT
-#define SP_PROT_SSL3_CLIENT 0x00000008
-#endif
-
-#ifndef SP_PROT_TLS1_CLIENT
-#define SP_PROT_TLS1_CLIENT 0x00000080
-#endif
-
-#ifndef SP_PROT_TLS1_0_CLIENT
-#define SP_PROT_TLS1_0_CLIENT SP_PROT_TLS1_CLIENT
-#endif
-
-#ifndef SP_PROT_TLS1_1_CLIENT
-#define SP_PROT_TLS1_1_CLIENT 0x00000200
-#endif
-
-#ifndef SP_PROT_TLS1_2_CLIENT
-#define SP_PROT_TLS1_2_CLIENT 0x00000800
-#endif
-
-#ifndef SECBUFFER_ALERT
-#define SECBUFFER_ALERT 17
-#endif
-
-/* Both schannel buffer sizes must be > 0 */
-#define CURL_SCHANNEL_BUFFER_INIT_SIZE 4096
-#define CURL_SCHANNEL_BUFFER_FREE_SIZE 1024
-
extern const struct Curl_ssl Curl_ssl_schannel;
/* Set the API backend definition to Schannel */
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 91/256: version: if built with more than one SSL backend, report all of them, (continued)
- [GNUnet-SVN] [gnurl] 91/256: version: if built with more than one SSL backend, report all of them, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 88/256: docs/examples: demonstrate how to select SSL backends, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 61/256: vtls: use consistent signature for _random() implementations, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 92/256: vtls: use Curl_ssl_multi pseudo backend only when needed, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 83/256: vtls: fold the backend ID into the Curl_ssl structure, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 68/256: vtls: move md5sum into the Curl_ssl struct, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 45/256: tool_main: turn off MinGW CRT's globbing, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 25/256: system.h: remove all CURL_SIZEOF_* defines, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 96/256: asyn-thread: Improved cleanup after OOM situations, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 42/256: cmake: enable picky compiler options with clang and gcc, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 76/256: vtls: move SSL backends' private constants out of their header files,
gnunet <=
- [GNUnet-SVN] [gnurl] 97/256: unit1606: Fixed shadowed variable warning, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 65/256: vtls: introduce a new struct for SSL backends, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 86/256: vtls: introduce curl_global_sslset(), gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 105/256: curl.h: CURLSSLBACKEND_WOLFSSL used wrong value, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 77/256: getinfo: access SSL internals via Curl_ssl, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 87/256: Add a man page for curl_global_sslset(), gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 103/256: curl/multi.h: remove duplicated closing c++ brace, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 43/256: config-win32: define SIZEOF_LONG, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 94/256: configure: Handle "MultiSSL" specially When versioning symbols, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 57/256: tests: Make sure libtests & unittests call curl_global_cleanup(), gnunet, 2017/10/06