diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-12-02 09:37:36 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-12-02 09:37:36 +0100 |
| commit | 826b9ae8b655f18fc2a74f2c9147fb4163a78770 (patch) | |
| tree | 12b276f0f28db3dbea19d884ada8ef2e7b81a077 /lib/ssl/src/ssl_internal.hrl | |
| parent | d0dc399c5e40980847e462a6c1bc375d02a3a9ca (diff) | |
| parent | 62ed44035a05091ab4b3438738e717140d115234 (diff) | |
| download | otp-826b9ae8b655f18fc2a74f2c9147fb4163a78770.tar.gz otp-826b9ae8b655f18fc2a74f2c9147fb4163a78770.tar.bz2 otp-826b9ae8b655f18fc2a74f2c9147fb4163a78770.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 85724de4bd..75efb64e3f 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -24,6 +24,8 @@ -include_lib("public_key/include/public_key.hrl"). +-define(SECRET_PRINTOUT, "***"). + -type reason() :: term(). -type reply() :: term(). -type msg() :: term(). @@ -36,6 +38,7 @@ -type issuer() :: tuple(). -type serialnumber() :: integer(). -type cert_key() :: {reference(), integer(), issuer()}. +-type secret_printout() :: list(). %% basic binary constructors -define(BOOLEAN(X), X:8/unsigned-big-integer). @@ -81,16 +84,16 @@ validate_extensions_fun, depth :: integer(), certfile :: binary(), - cert :: public_key:der_encoded(), + cert :: public_key:der_encoded() | secret_printout(), keyfile :: binary(), - key :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', public_key:der_encoded()}, - password :: string(), - cacerts :: [public_key:der_encoded()], + key :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', public_key:der_encoded()} | secret_printout(), + password :: string() | secret_printout(), + cacerts :: [public_key:der_encoded()] | secret_printout(), cacertfile :: binary(), - dh :: public_key:der_encoded(), - dhfile :: binary(), + dh :: public_key:der_encoded() | secret_printout(), + dhfile :: binary() | secret_printout(), user_lookup_fun, % server option, fun to lookup the user - psk_identity :: binary(), + psk_identity :: binary() | secret_printout() , srp_identity, % client option {User, Password} ciphers, % %% Local policy for the server if it want's to reuse the session |