diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-18 15:45:39 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-18 15:45:39 +0100 |
| commit | fde162310c3fab0fea924b005a383129acf569c9 (patch) | |
| tree | f5021e065c599258ba9db9a2795562ac144e9c65 /lib/ssl/src/ssl_internal.hrl | |
| parent | 95b694697291d67c3369f79aa8c73809be183019 (diff) | |
| parent | 028df3a72f7b813ef9851799a07ded30b7d3ad55 (diff) | |
| download | otp-fde162310c3fab0fea924b005a383129acf569c9.tar.gz otp-fde162310c3fab0fea924b005a383129acf569c9.tar.bz2 otp-fde162310c3fab0fea924b005a383129acf569c9.zip | |
Merge branch 'ingela/ssl-shrink-state-merge'
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()} | |