diff options
| author | Erlang/OTP <[email protected]> | 2016-04-26 12:01:03 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-04-26 12:01:03 +0200 |
| commit | fbcbe079db40e63c1d9dc264139e3c4cc08c1cdd (patch) | |
| tree | c36a5801165fcabec8936876c004cdfa6419d099 /lib/ssl/src/ssl_internal.hrl | |
| parent | 237c335b55d1c18191b0dadde42492a2bea9fd82 (diff) | |
| parent | 0f3070badc2ae32515cdfbb29ee8a56853e4825d (diff) | |
| download | otp-fbcbe079db40e63c1d9dc264139e3c4cc08c1cdd.tar.gz otp-fbcbe079db40e63c1d9dc264139e3c4cc08c1cdd.tar.bz2 otp-fbcbe079db40e63c1d9dc264139e3c4cc08c1cdd.zip | |
Merge branch 'ingela/ssl/config-signature-algs/OTP-13261' into maint-18
* ingela/ssl/config-signature-algs/OTP-13261:
ssl: Prepare for release
ssl: Add option signature_algs
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 8c7ed9c0d1..20f0b7d0da 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -135,7 +135,8 @@ padding_check = true :: boolean(), fallback = false :: boolean(), crl_check :: boolean() | peer | best_effort, - crl_cache + crl_cache, + signature_algs }). -record(socket_options, |