diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-05-27 10:45:08 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-05-27 10:45:08 +0200 |
| commit | 48085e18c31bd303f07d9d75cff282361e38ca8b (patch) | |
| tree | f2215cb4831350ea20ffaae5b603a6142a892614 /lib/ssl/src/ssl_record.hrl | |
| parent | f0510a55fdc2591ea71107f77e36d6fc7b001874 (diff) | |
| parent | df0c5663dd944a3dd06936105d0696a704c20e4e (diff) | |
| download | otp-48085e18c31bd303f07d9d75cff282361e38ca8b.tar.gz otp-48085e18c31bd303f07d9d75cff282361e38ca8b.tar.bz2 otp-48085e18c31bd303f07d9d75cff282361e38ca8b.zip | |
Merge branch 'kennethlakin/beast-mitigation-options/PR-1041/OTP-13629'
* kennethlakin/beast-mitigation-options/PR-1041/OTP-13629:
ssl: Add BEAST mitigation selection option
Diffstat (limited to 'lib/ssl/src/ssl_record.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_record.hrl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_record.hrl b/lib/ssl/src/ssl_record.hrl index d34d144343..87fde35258 100644 --- a/lib/ssl/src/ssl_record.hrl +++ b/lib/ssl/src/ssl_record.hrl @@ -40,7 +40,9 @@ %% RFC 5746 secure_renegotiation, client_verify_data, - server_verify_data + server_verify_data, + %% How to do BEAST mitigation? + beast_mitigation }). -record(connection_states, { |