aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2014-02-10 09:35:03 +0100
committerIngela Anderton Andin <ingela@erlang.org>2014-02-10 09:35:03 +0100
commit1918d8fead3a8d4bfd177f68806db539911ad808 (patch)
tree12781f3f4d00ad00519c56f7aa032b9e776ba94d /lib/ssl
parent0cbf6ec7444df2c0441debc6bcd5aba0bbc7104d (diff)
parent8588180dce9aa7fffbba8c580d67e857796c6e5d (diff)
downloadotp-1918d8fead3a8d4bfd177f68806db539911ad808.tar.gz
otp-1918d8fead3a8d4bfd177f68806db539911ad808.tar.bz2
otp-1918d8fead3a8d4bfd177f68806db539911ad808.zip
Merge branch 'ia/public_key/specs'
* ia/public_key/specs: public_key: Export some dialyzer types
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/src/ssl_internal.hrl10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
index 102215119d..64b89e9f95 100644
--- a/lib/ssl/src/ssl_internal.hrl
+++ b/lib/ssl/src/ssl_internal.hrl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -82,13 +82,13 @@
validate_extensions_fun,
depth :: integer(),
certfile :: binary(),
- cert :: der_encoded(),
+ cert :: public_key:der_encoded(),
keyfile :: binary(),
- key :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', der_encoded()},
+ key :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', public_key:der_encoded()},
password :: string(),
- cacerts :: [der_encoded()],
+ cacerts :: [public_key:der_encoded()],
cacertfile :: binary(),
- dh :: der_encoded(),
+ dh :: public_key:der_encoded(),
dhfile :: binary(),
user_lookup_fun, % server option, fun to lookup the user
psk_identity :: binary(),