diff options
author | Ingela Anderton Andin <[email protected]> | 2010-08-24 08:57:57 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2010-08-24 08:57:57 +0200 |
commit | 574a68e84c92a8a44ea2e5d18a1cd2025892d496 (patch) | |
tree | 7ab50c40c457d500cdc2432ca3cc974d8f0959b1 /lib/ssl/src/ssl_internal.hrl | |
parent | 7ed6bbd4e8bb88958bd45f85e3ef8af39c9f894f (diff) | |
parent | 12dfe961aeaf1a826d851361a24519e54d8ef119 (diff) | |
download | otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.tar.gz otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.tar.bz2 otp-574a68e84c92a8a44ea2e5d18a1cd2025892d496.zip |
Merge branch 'ia/public_key_api/OTP-8722' into dev
* ia/public_key_api/OTP-8722:
Revise the public_key API
Resolved, version is now 0.8.
Conflicts:
lib/public_key/vsn.mk
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
-rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index ddace02dea..337403531e 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -96,12 +96,12 @@ -type from() :: term(). -type host() :: string() | tuple(). -type port_num() :: integer(). --type session_id() :: binary(). +-type session_id() :: 0 | binary(). -type tls_version() :: {integer(), integer()}. -type tls_atom_version() :: sslv3 | tlsv1. -type cache_ref() :: term(). -type certdb_ref() :: term(). --type key_algo() :: rsa | dhe_rsa | dhe_dss. +-type key_algo() :: null | rsa | dhe_rsa | dhe_dss. -type enum_algo() :: integer(). -type public_key() :: #'RSAPublicKey'{} | integer(). -type public_key_params() :: #'Dss-Parms'{} | term(). |