diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2018-03-16 14:38:27 -0700 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2018-03-19 09:16:29 -0700 |
| commit | 985548d9a7de8cde72ea0b5a81f6f0854d049454 (patch) | |
| tree | f82a2c6d750e2ab5873e0ab6a1b71cd7a2631e1f /cups/tls-sspi.c | |
| parent | cbcd27119edc01ce3009d6a90d47abf2d486b61d (diff) | |
| download | libcups-pie-dr1-dev.tar.gz | |
Update libcups to v2.2.6android-p-preview-3android-p-preview-2android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devp-preview-2
Test: Printed a page using this library (using the default print
service)
Fixes: 71766736
Change-Id: I24874e9b4c95102c5d9a0d709326748c0433ca24
Diffstat (limited to 'cups/tls-sspi.c')
| -rw-r--r-- | cups/tls-sspi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c index 46f6e790..6eaec4c8 100644 --- a/cups/tls-sspi.c +++ b/cups/tls-sspi.c @@ -2,7 +2,7 @@ * TLS support for CUPS on Windows using the Security Support Provider * Interface (SSPI). * - * Copyright 2010-2015 by Apple Inc. + * Copyright 2010-2017 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -913,7 +913,8 @@ _httpTLSRead(http_t *http, /* I - HTTP connection */ void _httpTLSSetOptions(int options) /* I - Options */ { - tls_options = options; + if (!(options & _HTTP_TLS_SET_DEFAULT) || tls_options < 0) + tls_options = options; } @@ -1795,7 +1796,7 @@ http_sspi_find_credentials( } #endif /* SP_PROT_TLS1_2_SERVER */ - /* TODO: Support _HTTP_TLS_ALLOW_RC4 and _HTTP_TLS_ALLOW_DH options; right now we'll rely on Windows registry to enable/disable RC4/DH... */ + /* TODO: Support _HTTP_TLS_ALLOW_RC4, _HTTP_TLS_ALLOW_DH, and _HTTP_TLS_DENY_CBC options; right now we'll rely on Windows registry to enable/disable RC4/DH/CBC... */ /* * Create an SSPI credential. |