Unverified Commit 118b074f authored by Johannes Schindelin's avatar Johannes Schindelin Committed by Daniel Stenberg
Browse files

vtls: move SSL backends' private constants out of their header files 



Signed-off-by: default avatarJohannes Schindelin <johannes.schindelin@gmx.de>
parent 5d9fcd21

lib/vtls/openssl.c

+3 −0
Original line number Diff line number Diff line
@@ -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

lib/vtls/openssl.h

+0 −3
Original line number Diff line number Diff line
@@ -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 */

lib/vtls/schannel.c

+48 −0
Original line number Diff line number Diff line
@@ -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__)

lib/vtls/schannel.h

+0 −48
Original line number Diff line number Diff line
@@ -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 */