diff options
| author | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-02-03 16:45:39 -0500 |
|---|---|---|
| committer | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-02-05 11:00:53 -0500 |
| commit | cc5a9ba485b988b036974cf682cda35180788446 (patch) | |
| tree | 2f403ef482046f48836ad4acb5a185f60dde4bbb /ssl | |
| parent | 424d5db24803d2e4e1e406eb73262dea76761da4 (diff) | |
| download | openssl-cc5a9ba485b988b036974cf682cda35180788446.zip openssl-cc5a9ba485b988b036974cf682cda35180788446.tar.gz openssl-cc5a9ba485b988b036974cf682cda35180788446.tar.bz2 | |
Restore -no_comp switch for backwards compatible behaviour
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_conf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c index d0935cf..1846155 100644 --- a/ssl/ssl_conf.c +++ b/ssl/ssl_conf.c @@ -581,6 +581,7 @@ static const ssl_conf_cmd_tbl ssl_conf_cmds[] = { SSL_CONF_CMD_SWITCH("no_tls1_1", 0), SSL_CONF_CMD_SWITCH("no_tls1_2", 0), SSL_CONF_CMD_SWITCH("bugs", 0), + SSL_CONF_CMD_SWITCH("no_comp", 0), SSL_CONF_CMD_SWITCH("comp", 0), SSL_CONF_CMD_SWITCH("ecdh_single", SSL_CONF_FLAG_SERVER), SSL_CONF_CMD_SWITCH("no_ticket", 0), @@ -640,7 +641,8 @@ static const ssl_switch_tbl ssl_cmd_switches[] = { {SSL_OP_NO_TLSv1_1, 0}, /* no_tls1_1 */ {SSL_OP_NO_TLSv1_2, 0}, /* no_tls1_2 */ {SSL_OP_ALL, 0}, /* bugs */ - {SSL_OP_NO_COMPRESSION, 1}, /* comp */ + {SSL_OP_NO_COMPRESSION, 0}, /* no_comp */ + {SSL_OP_NO_COMPRESSION, SSL_TFLAG_INV}, /* comp */ {SSL_OP_SINGLE_ECDH_USE, 0}, /* ecdh_single */ {SSL_OP_NO_TICKET, 0}, /* no_ticket */ {SSL_OP_CIPHER_SERVER_PREFERENCE, 0}, /* serverpref */ |