Unverified Commit a189ab91 authored by Marcel Raad's avatar Marcel Raad
Browse files

schannel: make more cipher options conditional 

They are not defined in the original MinGW's <wincrypt.h>.

Closes https://github.com/curl/curl/pull/2721
parent 8272ec50

lib/vtls/schannel.c

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