From a189ab91fec2fe1a5755d689603a381eea9529e4 Mon Sep 17 00:00:00 2001 From: Marcel Raad Date: Sun, 8 Jul 2018 16:55:11 +0200 Subject: schannel: make more cipher options conditional They are not defined in the original MinGW's . Closes https://github.com/curl/curl/pull/2721 --- lib/vtls/schannel.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'lib') diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index 0d69a40de..2e2b198c4 100644 --- a/lib/vtls/schannel.c +++ b/lib/vtls/schannel.c @@ -234,29 +234,57 @@ get_alg_id_by_name(char *name) #endif CIPHEROPTION(CALG_RSA_KEYX); CIPHEROPTION(CALG_DES); +#ifdef CALG_3DES_112 CIPHEROPTION(CALG_3DES_112); +#endif CIPHEROPTION(CALG_3DES); CIPHEROPTION(CALG_DESX); CIPHEROPTION(CALG_RC2); CIPHEROPTION(CALG_RC4); CIPHEROPTION(CALG_SEAL); +#ifdef CALG_DH_SF CIPHEROPTION(CALG_DH_SF); +#endif CIPHEROPTION(CALG_DH_EPHEM); +#ifdef CALG_AGREEDKEY_ANY CIPHEROPTION(CALG_AGREEDKEY_ANY); +#endif +#ifdef CALG_HUGHES_MD5 CIPHEROPTION(CALG_HUGHES_MD5); +#endif CIPHEROPTION(CALG_SKIPJACK); +#ifdef CALG_TEK CIPHEROPTION(CALG_TEK); +#endif CIPHEROPTION(CALG_CYLINK_MEK); CIPHEROPTION(CALG_SSL3_SHAMD5); +#ifdef CALG_SSL3_MASTER CIPHEROPTION(CALG_SSL3_MASTER); +#endif +#ifdef CALG_SCHANNEL_MASTER_HASH CIPHEROPTION(CALG_SCHANNEL_MASTER_HASH); +#endif +#ifdef CALG_SCHANNEL_MAC_KEY CIPHEROPTION(CALG_SCHANNEL_MAC_KEY); +#endif +#ifdef CALG_SCHANNEL_ENC_KEY CIPHEROPTION(CALG_SCHANNEL_ENC_KEY); +#endif +#ifdef CALG_PCT1_MASTER CIPHEROPTION(CALG_PCT1_MASTER); +#endif +#ifdef CALG_SSL2_MASTER CIPHEROPTION(CALG_SSL2_MASTER); +#endif +#ifdef CALG_TLS1_MASTER CIPHEROPTION(CALG_TLS1_MASTER); +#endif +#ifdef CALG_RC5 CIPHEROPTION(CALG_RC5); +#endif +#ifdef CALG_HMAC CIPHEROPTION(CALG_HMAC); +#endif CIPHEROPTION(CALG_TLS1PRF); #ifdef CALG_HASH_REPLACE_OWF CIPHEROPTION(CALG_HASH_REPLACE_OWF); -- cgit v1.2.3