diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-10 14:48:42 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-10 14:48:42 +0100 |
| commit | e21f3eb30a384fab1db839ac6a21a6f2055cfb6f (patch) | |
| tree | 0ff2f3894d3e8e0b372c9eb22b05fc2c23199788 /lib/ssl/src/ssl_internal.hrl | |
| parent | 4d9d6776aadee9e0d27b34460fa5269a6b6988aa (diff) | |
| parent | 7a0a2e9fa132cba32f4a287d03c04e9ff78a44ec (diff) | |
| download | otp-e21f3eb30a384fab1db839ac6a21a6f2055cfb6f.tar.gz otp-e21f3eb30a384fab1db839ac6a21a6f2055cfb6f.tar.bz2 otp-e21f3eb30a384fab1db839ac6a21a6f2055cfb6f.zip | |
Merge branch 'ingela/ssl/engine-API/OTP-14448' into maint
* ingela/ssl/engine-API/OTP-14448:
ssl: Add private key configuration for crypto engine
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 24ac34653e..9bb1cbaeb0 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -95,7 +95,8 @@ certfile :: binary(), cert :: public_key:der_encoded() | secret_printout() | 'undefined', keyfile :: binary(), - key :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', public_key:der_encoded()} | secret_printout() | 'undefined', + key :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', + public_key:der_encoded()} | key_map() | secret_printout() | 'undefined', password :: string() | secret_printout() | 'undefined', cacerts :: [public_key:der_encoded()] | secret_printout() | 'undefined', cacertfile :: binary(), @@ -164,7 +165,15 @@ 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()} | |