diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-22 10:18:49 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-22 10:18:49 +0100 |
| commit | 53dea65ae6665d5d14c0d313c1f639637a3f0405 (patch) | |
| tree | 60f74599bbfa18f883b37390033232fd5cc3a640 /lib/ssl/src/ssl_cipher_format.erl | |
| parent | cb9b1267f2465a129a1f5de5cf812bcfd5a7a9f4 (diff) | |
| parent | 3058ef6bb7a2a3f96cfde819976ee7a52be65364 (diff) | |
| download | otp-53dea65ae6665d5d14c0d313c1f639637a3f0405.tar.gz otp-53dea65ae6665d5d14c0d313c1f639637a3f0405.tar.bz2 otp-53dea65ae6665d5d14c0d313c1f639637a3f0405.zip | |
Merge branch 'ingela/ssl/doc-enhancements' into maint
* ingela/ssl/doc-enhancements:
ssl: Enhance documentation after "use-spec-rewrite"
Diffstat (limited to 'lib/ssl/src/ssl_cipher_format.erl')
| -rw-r--r-- | lib/ssl/src/ssl_cipher_format.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_cipher_format.erl b/lib/ssl/src/ssl_cipher_format.erl index f7af96583f..1d28e1e3b4 100644 --- a/lib/ssl/src/ssl_cipher_format.erl +++ b/lib/ssl/src/ssl_cipher_format.erl @@ -34,15 +34,15 @@ -type internal_cipher() :: null | ssl:cipher(). -type internal_hash() :: null | ssl:hash(). --type internal_key_algo() :: null | ssl:key_algo(). --type internal_erl_cipher_suite() :: #{key_exchange := internal_key_algo(), +-type internal_kex_algo() :: null | ssl:kex_algo(). +-type internal_erl_cipher_suite() :: #{key_exchange := internal_kex_algo(), cipher := internal_cipher(), mac := internal_hash() | aead, prf := internal_hash() | default_prf %% Old cipher suites, version dependent }. --type old_erl_cipher_suite() :: {ssl:key_algo(), internal_cipher(), internal_hash()} % Pre TLS 1.2 +-type old_erl_cipher_suite() :: {ssl:kex_algo(), internal_cipher(), internal_hash()} % Pre TLS 1.2 %% TLS 1.2, internally PRE TLS 1.2 will use default_prf - | {ssl:key_algo(), internal_cipher(), internal_hash(), + | {ssl:kex_algo(), internal_cipher(), internal_hash(), internal_hash() | default_prf}. -type cipher_suite() :: binary(). -type openssl_cipher_suite() :: string(). |