diff options
| author | Micael Karlberg <[email protected]> | 2011-04-06 15:11:00 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-06 15:11:00 +0200 |
| commit | 4346b5dae76052e8c06b1cda70d561b10c1c486d (patch) | |
| tree | 8de6b459b429aa24e1bd9738a4fb3b6e07a083a8 /lib/ssl/src/ssl_handshake.hrl | |
| parent | 3bc0fccb951ffb0909d2824b65d58ad31ad16cc5 (diff) | |
| parent | d8dcd70f386de09109ca1f6f817a381cd1387769 (diff) | |
| download | otp-4346b5dae76052e8c06b1cda70d561b10c1c486d.tar.gz otp-4346b5dae76052e8c06b1cda70d561b10c1c486d.tar.bz2 otp-4346b5dae76052e8c06b1cda70d561b10c1c486d.zip | |
Merge branch 'dev' into bmk/inets/inet56_integration
Diffstat (limited to 'lib/ssl/src/ssl_handshake.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.hrl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_handshake.hrl b/lib/ssl/src/ssl_handshake.hrl index 8ae4d2332e..fb0ebac7d1 100644 --- a/lib/ssl/src/ssl_handshake.hrl +++ b/lib/ssl/src/ssl_handshake.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2010. All Rights Reserved. +%% Copyright Ericsson AB 2007-2011. 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 @@ -29,9 +29,8 @@ -include_lib("public_key/include/public_key.hrl"). -type algo_oid() :: ?'rsaEncryption' | ?'id-dsa'. --type public_key() :: #'RSAPublicKey'{} | integer(). -type public_key_params() :: #'Dss-Parms'{} | term(). --type public_key_info() :: {algo_oid(), public_key(), public_key_params()}. +-type public_key_info() :: {algo_oid(), #'RSAPublicKey'{} | integer() , public_key_params()}. -record(session, { session_id, |