diff options
| author | lloyd <[email protected]> | 2010-06-17 21:48:55 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-06-17 21:48:55 +0000 |
| commit | c06b260b3328c5ce4be44c4f1a88feb55ee3dbc4 (patch) | |
| tree | 41b05df5982b5b2e8a23b55972263d2172d6a9fd /src/ssl/rec_read.cpp | |
| parent | 0eecae9f21172c0a74ad62acaf77148c94a25be7 (diff) | |
| parent | 3dde5683f69b9cb9f558bfb18087ce35fbbec78a (diff) | |
propagate from branch 'net.randombit.botan' (head 294e2082ce9231d6165276e2f2a4153a0116aca3)
to branch 'net.randombit.botan.c++0x' (head 0b695fad10f924601e07b009fcd781191fafcb28)
Diffstat (limited to 'src/ssl/rec_read.cpp')
| -rw-r--r-- | src/ssl/rec_read.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ssl/rec_read.cpp b/src/ssl/rec_read.cpp index f07744c2a..3c008641d 100644 --- a/src/ssl/rec_read.cpp +++ b/src/ssl/rec_read.cpp @@ -1,4 +1,4 @@ -/** +/* * TLS Record Reading * (C) 2004-2010 Jack Lloyd * @@ -12,7 +12,7 @@ namespace Botan { -/** +/* * Reset the state */ void Record_Reader::reset() @@ -26,7 +26,7 @@ void Record_Reader::reset() seq_no = 0; } -/** +/* * Set the version to use */ void Record_Reader::set_version(Version_Code version) @@ -38,7 +38,7 @@ void Record_Reader::set_version(Version_Code version) minor = (version & 0xFF); } -/** +/* * Set the keys for reading */ void Record_Reader::set_keys(const CipherSuite& suite, const SessionKeys& keys, @@ -74,7 +74,7 @@ void Record_Reader::set_keys(const CipherSuite& suite, const SessionKeys& keys, ); block_size = block_size_of(cipher_algo); - if(major == 3 && minor >= 2) + if(major > 3 || (major == 3 && minor >= 2)) iv_size = block_size; else iv_size = 0; @@ -106,7 +106,7 @@ void Record_Reader::add_input(const byte input[], u32bit input_size) input_queue.write(input, input_size); } -/** +/* * Retrieve the next record */ u32bit Record_Reader::get_record(byte& msg_type, |