#define _HTTP_RESOLVE_FQDN 2 /* Resolve to a FQDN */
#define _HTTP_RESOLVE_FAXOUT 4 /* Resolve FaxOut service? */
-#define _HTTP_TLS_NONE 0 /* No TLS options */
-#define _HTTP_TLS_ALLOW_RC4 1 /* Allow RC4 cipher suites */
-#define _HTTP_TLS_ALLOW_SSL3 2 /* Allow SSL 3.0 */
-#define _HTTP_TLS_ALLOW_DH 4 /* Allow DH/DHE key negotiation */
-#define _HTTP_TLS_DENY_TLS10 16 /* Deny TLS 1.0 */
-#define _HTTP_TLS_DENY_CBC 32 /* Deny CBC cipher suites */
-#define _HTTP_TLS_ONLY_TLS10 64 /* Only use TLS 1.0 */
+#define _HTTP_TLS_UNCHANGED 0 /* Don't change TLS options */
+#define _HTTP_TLS_NONE 1 /* No TLS options */
+#define _HTTP_TLS_ALLOW_RC4 2 /* Allow RC4 cipher suites */
+#define _HTTP_TLS_ALLOW_SSL3 4 /* Allow SSL 3.0 */
+#define _HTTP_TLS_ALLOW_DH 8 /* Allow DH/DHE key negotiation */
+#define _HTTP_TLS_DENY_TLS10 16 /* Deny TLS 1.0 */
+#define _HTTP_TLS_DENY_CBC 32 /* Deny CBC cipher suites */
+#define _HTTP_TLS_ONLY_TLS10 64 /* Only use TLS 1.0 */
/*
extern size_t _httpTLSPending(http_t *http);
extern int _httpTLSRead(http_t *http, char *buf, int len);
extern int _httpTLSSetCredentials(http_t *http);
-extern void _httpTLSSetOptions(int options);
+extern void _httpTLSSetOptions(unsigned int options);
extern int _httpTLSStart(http_t *http);
extern void _httpTLSStop(http_t *http);
extern int _httpTLSWrite(http_t *http, const char *buf, int len);
* Local globals...
*/
-static int tls_auto_create = 0;
- /* Auto-create self-signed certs? */
-static char *tls_common_name = NULL;
- /* Default common name */
+static int tls_auto_create = 0; /* Auto-create self-signed certs? */
+static char *tls_common_name = NULL; /* Default common name */
#ifdef HAVE_SECKEYCHAINOPEN
-static int tls_cups_keychain = 0;
- /* Opened the CUPS keychain? */
-static SecKeychainRef tls_keychain = NULL;
- /* Server cert keychain */
+static int tls_cups_keychain = 0; /* Opened the CUPS keychain? */
+static SecKeychainRef tls_keychain = NULL; /* Server cert keychain */
#else
-static SecIdentityRef tls_selfsigned = NULL;
- /* Temporary self-signed cert */
+static SecIdentityRef tls_selfsigned = NULL; /* Temporary self-signed cert */
#endif /* HAVE_SECKEYCHAINOPEN */
-static char *tls_keypath = NULL;
- /* Server cert keychain path */
-static _cups_mutex_t tls_mutex = _CUPS_MUTEX_INITIALIZER;
- /* Mutex for keychain/certs */
-static int tls_options = -1;/* Options for TLS connections */
+static char *tls_keypath = NULL; /* Server cert keychain path */
+static _cups_mutex_t tls_mutex = _CUPS_MUTEX_INITIALIZER; /* Mutex for keychain/certs */
+static unsigned int tls_options = _HTTP_TLS_NONE; /* Options for TLS connections */
/*
*/
void
-_httpTLSSetOptions(int options) /* I - Options */
+_httpTLSSetOptions(unsigned int options) /* I - Options */
{
tls_options = options;
}
DEBUG_printf(("3_httpTLSStart(http=%p)", (void *)http));
- if (tls_options < 0)
+ if ((tls_options == _HTTP_TLS_UNCHANGED) || (tls_options == _HTTP_TLS_NONE))
{
DEBUG_puts("4_httpTLSStart: Setting defaults.");
_cupsSetDefaults();
* Local globals...
*/
-static int tls_auto_create = 0;
- /* Auto-create self-signed certs? */
-static char *tls_common_name = NULL;
- /* Default common name */
-static gnutls_x509_crl_t tls_crl = NULL;/* Certificate revocation list */
-static char *tls_keypath = NULL;
- /* Server cert keychain path */
-static _cups_mutex_t tls_mutex = _CUPS_MUTEX_INITIALIZER;
- /* Mutex for keychain/certs */
-static int tls_options = -1;/* Options for TLS connections */
+static int tls_auto_create = 0; /* Auto-create self-signed certs? */
+static char *tls_common_name = NULL; /* Default common name */
+static gnutls_x509_crl_t tls_crl = NULL; /* Certificate revocation list */
+static char *tls_keypath = NULL; /* Server cert keychain path */
+static _cups_mutex_t tls_mutex = _CUPS_MUTEX_INITIALIZER; /* Mutex for keychain/certs */
+static unsigned int tls_options = _HTTP_TLS_NONE; /* Options for TLS connections */
/*
*/
void
-_httpTLSSetOptions(int options) /* I - Options */
+_httpTLSSetOptions(unsigned int options) /* I - Options */
{
tls_options = options;
}
DEBUG_printf(("3_httpTLSStart(http=%p)", http));
- if (tls_options < 0)
+ if ((tls_options == _HTTP_TLS_UNCHANGED) || (tls_options == _HTTP_TLS_NONE))
{
DEBUG_puts("4_httpTLSStart: Setting defaults.");
_cupsSetDefaults();
strlcpy(priority_string, "NORMAL", sizeof(priority_string));
if (tls_options & _HTTP_TLS_DENY_TLS10)
- strlcat(priority_string, ":+VERS-TLS-ALL:-VERS-TLS1.0:-VERS-SSL3.0", sizeof(priority_string));
+ strlcat(priority_string, ":+VERS-TLS-ALL:!VERS-TLS1.0:!VERS-SSL3.0", sizeof(priority_string));
else if (tls_options & _HTTP_TLS_ALLOW_SSL3)
strlcat(priority_string, ":+VERS-TLS-ALL", sizeof(priority_string));
else if (tls_options & _HTTP_TLS_ONLY_TLS10)
- strlcat(priority_string, ":-VERS-TLS-ALL:-VERS-SSL3.0:+VERS-TLS1.0", sizeof(priority_string));
+ strlcat(priority_string, ":!VERS-TLS-ALL:!VERS-SSL3.0:+VERS-TLS1.0", sizeof(priority_string));
else
- strlcat(priority_string, ":+VERS-TLS-ALL:-VERS-SSL3.0", sizeof(priority_string));
+ strlcat(priority_string, ":+VERS-TLS-ALL:!VERS-SSL3.0", sizeof(priority_string));
- if (!(tls_options & _HTTP_TLS_ALLOW_RC4))
- strlcat(priority_string, ":-ARCFOUR-128", sizeof(priority_string));
+ if (tls_options & _HTTP_TLS_ALLOW_RC4)
+ strlcat(priority_string, ":+ARCFOUR-128", sizeof(priority_string));
+ else
+ strlcat(priority_string, ":!ARCFOUR-128", sizeof(priority_string));
- if (!(tls_options & _HTTP_TLS_ALLOW_DH))
+ if (tls_options & _HTTP_TLS_ALLOW_DH)
+ strlcat(priority_string, ":+ANON-DH", sizeof(priority_string));
+ else
strlcat(priority_string, ":!ANON-DH", sizeof(priority_string));
- if (!(tls_options & _HTTP_TLS_DENY_CBC))
+ if (tls_options & _HTTP_TLS_DENY_CBC)
strlcat(priority_string, ":!AES-128-CBC:!AES-256-CBC:!CAMELLIA-128-CBC:!CAMELLIA-256-CBC:!3DES-CBC", sizeof(priority_string));
#ifdef HAVE_GNUTLS_PRIORITY_SET_DIRECT
* Local globals...
*/
-static int tls_options = -1;/* Options for TLS connections */
+static unsigned int tls_options = _HTTP_TLS_NONE; /* Options for TLS connections */
/*
*/
void
-_httpTLSSetOptions(int options) /* I - Options */
+_httpTLSSetOptions(unsigned int options) /* I - Options */
{
tls_options = options;
}
DEBUG_printf(("3_httpTLSStart(http=%p)", http));
- if (tls_options < 0)
+ if ((tls_options == _HTTP_TLS_UNCHANGED) || (tls_options == _HTTP_TLS_NONE))
{
DEBUG_puts("4_httpTLSStart: Setting defaults.");
_cupsSetDefaults();
cg->validate_certs = cc.validate_certs;
#ifdef HAVE_SSL
- _httpTLSSetOptions(cc.ssl_options);
+ if (cc.ssl_options != _HTTP_TLS_UNCHANGED)
+ {
+ _httpTLSSetOptions(cc.ssl_options);
+ }
#endif /* HAVE_SSL */
}
* SSLOptions [AllowRC4] [AllowSSL3] [AllowDH] [DenyTLS1.0] [None]
*/
- int options = _HTTP_TLS_NONE; /* SSL/TLS options */
- char temp[256], /* Copy of value */
- *start, /* Start of option */
- *end; /* End of option */
+ unsigned int options = _HTTP_TLS_UNCHANGED; /* SSL/TLS options */
+ char temp[256], /* Copy of value */
+ *start, /* Start of option */
+ *end; /* End of option */
strlcpy(temp, value, sizeof(temp));
<dd style="margin-left: 5.0em"><dt><b>SSLOptions None</b>
<dd style="margin-left: 5.0em">Sets encryption options.
By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites.
-The <i>AllowDH</i> option enables cipher suites using plain Diffie-Hellman key negotiation.
-The <i>AllowRC4</i> option enables the 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer ones.
-The <i>AllowSSL3</i> option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+The <i>AllowDH</i> option enables cipher suites using the horribly insecure anonymous Diffie-Hellman key negotiation which is vulnerable to man-in-the-middle attacks.
+The <i>AllowRC4</i> option enables the insecure 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer ones.
+The <i>AllowSSL3</i> option enables the insecure SSL v3.0 protocol, which is required for some older clients that do not support TLS v1.0.
The <i>DenyCBC</i> option disables all CBC cipher suites.
The <i>DenyTLS1.0</i> option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
<dt><a name="SSLPort"></a><b>SSLPort </b><i>port</i>
\fBSSLOptions None\fR
Sets encryption options.
By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites.
-The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key negotiation.
-The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer ones.
-The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+The \fIAllowDH\fR option enables cipher suites using the horribly insecure anonymous Diffie-Hellman key negotiation which is vulnerable to man-in-the-middle attacks.
+The \fIAllowRC4\fR option enables the insecure 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer ones.
+The \fIAllowSSL3\fR option enables the insecure SSL v3.0 protocol, which is required for some older clients that do not support TLS v1.0.
The \fIDenyCBC\fR option disables all CBC cipher suites.
The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
.\"#SSLPort