diff options
author | Ingela Anderton Andin <[email protected]> | 2013-06-05 09:39:34 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2013-06-05 09:39:34 +0200 |
commit | 854a124e4cf4067b22032c53e1d26125bdc4208f (patch) | |
tree | 5309b00ab02478f962ef2cadc3a9274e8156ad91 /lib/ssl/src/ssl_record.hrl | |
parent | bef52cfebbbdc1f11f23387883a1e64a5d98fccc (diff) | |
parent | f509fb7cef82413b19db0734a314c216b30a415c (diff) | |
download | otp-854a124e4cf4067b22032c53e1d26125bdc4208f.tar.gz otp-854a124e4cf4067b22032c53e1d26125bdc4208f.tar.bz2 otp-854a124e4cf4067b22032c53e1d26125bdc4208f.zip |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/ssl/src/ssl_record.hrl')
-rw-r--r-- | lib/ssl/src/ssl_record.hrl | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/lib/ssl/src/ssl_record.hrl b/lib/ssl/src/ssl_record.hrl index f73da92a52..2fd17f9c35 100644 --- a/lib/ssl/src/ssl_record.hrl +++ b/lib/ssl/src/ssl_record.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2012. All Rights Reserved. +%% Copyright Ericsson AB 2007-2013. 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 @@ -143,34 +143,6 @@ -define(LOWEST_MAJOR_SUPPORTED_VERSION, 3). --record(ssl_tls, { %% From inet driver - port, - type, - version, - fragment - }). - -%% -record(tls_plain_text, { -%% type, -%% version, % #protocol_version{} -%% length, % unit 16 -%% fragment % opaque -%% }). - -%% -record(tls_compressed, { -%% type, -%% version, -%% length, % unit 16 -%% fragment % opaque -%% }). - -%% -record(tls_cipher_text, { -%% type, -%% version, -%% length, -%% cipher, -%% fragment -%% }). -record(generic_stream_cipher, { content, % opaque content[TLSCompressed.length]; |