diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2014-10-20 18:10:26 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2014-10-20 18:10:26 +0000 |
| commit | 5c460b65dc15a76ae1de311d297c35cdf100112e (patch) | |
| tree | 501a6c22c244682cef9ae92d57f882b0ca803817 /cups/tls-sspi.c | |
| parent | 63aefcd517fd9dc5734620c876b5e7cb86f7ea11 (diff) | |
| download | cups-5c460b65dc15a76ae1de311d297c35cdf100112e.tar.gz | |
Fix builds with VC++ 2008
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12213 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/tls-sspi.c')
| -rw-r--r-- | cups/tls-sspi.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c index a9664e250..a819a961e 100644 --- a/cups/tls-sspi.c +++ b/cups/tls-sspi.c @@ -1750,21 +1750,39 @@ http_sspi_find_credentials( * Set supported protocols (can also be overriden in the registry...) */ +#ifdef SP_PROT_TLS1_2_SERVER if (http->mode == _HTTP_MODE_SERVER) { if (tls_options & _HTTP_TLS_ALLOW_SSL3) - SchannelCred.grbitEnabledProtocols = SP_PROT_TLS_1_2_SERVER | SP_PROT_TLS_1_1_SERVER | SP_PROT_TLS_1_0_SERVER | SP_PROT_SSL3_SERVER; + SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_SERVER | SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_0_SERVER | SP_PROT_SSL3_SERVER; else - SchannelCred.grbitEnabledProtocols = SP_PROT_TLS_1_2_SERVER | SP_PROT_TLS_1_1_SERVER | SP_PROT_TLS_1_0_SERVER; + SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_SERVER | SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_0_SERVER; } else { if (tls_options & _HTTP_TLS_ALLOW_SSL3) - SchannelCred.grbitEnabledProtocols = SP_PROT_TLS_1_2_CLIENT | SP_PROT_TLS_1_1_CLIENT | SP_PROT_TLS_1_0_CLIENT | SP_PROT_SSL3_CLIENT; + SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_0_CLIENT | SP_PROT_SSL3_CLIENT; else - SchannelCred.grbitEnabledProtocols = SP_PROT_TLS_1_2_CLIENT | SP_PROT_TLS_1_1_CLIENT | SP_PROT_TLS_1_0_CLIENT; + SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_0_CLIENT; } +#else + if (http->mode == _HTTP_MODE_SERVER) + { + if (tls_options & _HTTP_TLS_ALLOW_SSL3) + SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_SERVER | SP_PROT_SSL3_SERVER; + else + SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_SERVER; + } + else + { + if (tls_options & _HTTP_TLS_ALLOW_SSL3) + SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_CLIENT | SP_PROT_SSL3_CLIENT; + else + SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_CLIENT; + } +#endif /* SP_PROT_TLS1_2_SERVER */ + /* TODO: Support _HTTP_TLS_ALLOW_RC4 option; right now we'll rely on Windows registry to enable/disable RC4... */ /* |