diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-10-19 10:35:00 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-10-19 10:35:00 +0200 |
| commit | eb75757a3c8f467a7f17c5be9b63c047cb4e98b5 (patch) | |
| tree | b9a3b3b89a5b63f5805a163b79d21468979e698f /lib/ssl/src/ssl_internal.hrl | |
| parent | 42a5c23e7beabf08ac8d9796da63386a8af95456 (diff) | |
| parent | 28984d18b3305c41b4121d93aa0ff41c90691737 (diff) | |
| download | otp-eb75757a3c8f467a7f17c5be9b63c047cb4e98b5.tar.gz otp-eb75757a3c8f467a7f17c5be9b63c047cb4e98b5.tar.bz2 otp-eb75757a3c8f467a7f17c5be9b63c047cb4e98b5.zip | |
Merge branch 'ia/ssl/DH-ANON/OTP-8870' into dev
* ia/ssl/DH-ANON/OTP-8870:
Anonymous cipher suites
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index ddb05e70f6..d2dee4d861 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -104,7 +104,7 @@ -type tls_atom_version() :: sslv3 | tlsv1. -type cache_ref() :: term(). -type certdb_ref() :: term(). --type key_algo() :: null | rsa | dhe_rsa | dhe_dss. +-type key_algo() :: null | rsa | dhe_rsa | dhe_dss | dh_anon. -type enum_algo() :: integer(). -type public_key() :: #'RSAPublicKey'{} | integer(). -type public_key_params() :: #'Dss-Parms'{} | term(). |