diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-03-24 10:58:21 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-03-24 10:58:21 +0100 |
| commit | c4ba2c49508a02f2eef9624b06a9b91583e70e2c (patch) | |
| tree | 679f594f5559314a888c15f3b82118c97ddb42fd /lib/ssl/src/ssl_handshake.hrl | |
| parent | e243040fabd2701995cc4565250674d972403db2 (diff) | |
| parent | fbaa5e3ddf028ba0e2b58a19609817ee17b10c6f (diff) | |
| download | otp-c4ba2c49508a02f2eef9624b06a9b91583e70e2c.tar.gz otp-c4ba2c49508a02f2eef9624b06a9b91583e70e2c.tar.bz2 otp-c4ba2c49508a02f2eef9624b06a9b91583e70e2c.zip | |
Merge branch 'ia/public_key/encode-decode-ssh/OTP-9144' into dev
* ia/public_key/encode-decode-ssh/OTP-9144:
Implemented encode/decode support for ssh public key files
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, |