diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-18 11:30:46 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-18 15:29:38 +0100 |
| commit | 9fa531fa5d901ec1fa9249b25ae301d94f2ef51e (patch) | |
| tree | 726713e122a8bc3be2ec747082a2121434355d8a /lib/ssl/src/ssl_internal.hrl | |
| parent | d89ac6959f8f5c9f8d4960f84e23e34e9da25323 (diff) | |
| parent | 3479136b0a14fc213dfb34c9d44b8350d9f50ff3 (diff) | |
| download | otp-9fa531fa5d901ec1fa9249b25ae301d94f2ef51e.tar.gz otp-9fa531fa5d901ec1fa9249b25ae301d94f2ef51e.tar.bz2 otp-9fa531fa5d901ec1fa9249b25ae301d94f2ef51e.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/dtls_connection.erl
lib/ssl/src/ssl_connection.erl
lib/ssl/src/ssl_connection.hrl
lib/ssl/src/tls_connection.erl
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 159b5dad32..085a045169 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -122,7 +122,7 @@ cert :: public_key:der_encoded() | secret_printout() | 'undefined', keyfile :: binary(), key :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', - public_key:der_encoded()} | key_map() | secret_printout() | 'undefined', + public_key:der_encoded()} | ssl:key() | secret_printout() | 'undefined', password :: string() | secret_printout() | 'undefined', cacerts :: [public_key:der_encoded()] | secret_printout() | 'undefined', cacertfile :: binary(), @@ -196,15 +196,6 @@ connection_cb }). --type key_map() :: #{algorithm := rsa | dss | ecdsa, - %% engine and key_id ought to - %% be :=, but putting it in - %% the spec gives dialyzer warning - %% of correct code! - engine => crypto:engine_ref(), - key_id => crypto:key_id(), - password => crypto:password() - }. -type state_name() :: hello | abbreviated | certify | cipher | connection. -type gen_fsm_state_return() :: {next_state, state_name(), term()} | {next_state, state_name(), term(), timeout()} | |