diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-12-01 10:28:24 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-12-01 10:28:24 +0100 |
| commit | 6a0877cc8ff8157e055d6216dfee2293c648601c (patch) | |
| tree | 487fb9579e28aaebdb95ef203f2b3351c5a16b71 /lib/ssl/src/ssl_handshake.hrl | |
| parent | 7369151bc24d9d3b0b1ebed19a1a7d0df9101a81 (diff) | |
| parent | 3326cab005954dc6ba6c6596f77b5882b77f6be2 (diff) | |
| download | otp-6a0877cc8ff8157e055d6216dfee2293c648601c.tar.gz otp-6a0877cc8ff8157e055d6216dfee2293c648601c.tar.bz2 otp-6a0877cc8ff8157e055d6216dfee2293c648601c.zip | |
Merge branch 'ia/ssl-and-public_key-doc-and-dialyzer-fixes' into dev
* ia/ssl-and-public_key-doc-and-dialyzer-fixes:
Fixed guard and test case
Fixed broken links in the documentation and dialyzer warnings
Diffstat (limited to 'lib/ssl/src/ssl_handshake.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.hrl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_handshake.hrl b/lib/ssl/src/ssl_handshake.hrl index 74fba3786c..68a7802ef2 100644 --- a/lib/ssl/src/ssl_handshake.hrl +++ b/lib/ssl/src/ssl_handshake.hrl @@ -26,6 +26,13 @@ -ifndef(ssl_handshake). -define(ssl_handshake, true). +-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()}. + -record(session, { session_id, peer_certificate, |