diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-01-28 11:07:32 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-01-28 11:07:32 +0100 |
| commit | 9b0637d83248699eca1673d9b11a542cb2e63720 (patch) | |
| tree | b72fa3cb493a163178f1a3e113c8c6089b4d86e2 /lib/ssl/src/ssl_internal.hrl | |
| parent | bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861 (diff) | |
| parent | cb16d84c66b6040ca668b2e23ad4e740a3f3d0af (diff) | |
| download | otp-9b0637d83248699eca1673d9b11a542cb2e63720.tar.gz otp-9b0637d83248699eca1673d9b11a542cb2e63720.tar.bz2 otp-9b0637d83248699eca1673d9b11a542cb2e63720.zip | |
Merge branch 'ia/Vagabond/adt-honor-cipher-order/OTP-11621'
* ia/Vagabond/adt-honor-cipher-order/OTP-11621:
Implement 'honor_cipher_order' SSL server-side option
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 0186f9fca2..5a823ec8a4 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -114,7 +114,10 @@ next_protocols_advertised = undefined, %% [binary()], next_protocol_selector = undefined, %% fun([binary()]) -> binary()) log_alert :: boolean(), - server_name_indication = undefined + server_name_indication = undefined, + %% Should the server prefer its own cipher order over the one provided by + %% the client? + honor_cipher_order = false }). -record(config, {ssl, %% SSL parameters |