aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-06-09 11:32:05 +0000
committerlloyd <[email protected]>2010-06-09 11:32:05 +0000
commit62988a246becb98820354190561a8aa00df2f8b9 (patch)
tree8175e94e9a510daabdca1baff0884f8c423bd23c /src
parent4b6521f3dc6c04315a6b3525a429b2b3674a96aa (diff)
Fix comparison to use IVs with a hypothetical negotiated TLS that uses
a larger major version #.
Diffstat (limited to 'src')
-rw-r--r--src/ssl/rec_read.cpp2
-rw-r--r--src/ssl/rec_wri.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ssl/rec_read.cpp b/src/ssl/rec_read.cpp
index 336191557..8b655f5bc 100644
--- a/src/ssl/rec_read.cpp
+++ b/src/ssl/rec_read.cpp
@@ -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;
diff --git a/src/ssl/rec_wri.cpp b/src/ssl/rec_wri.cpp
index 82b63db03..d5358f4c3 100644
--- a/src/ssl/rec_wri.cpp
+++ b/src/ssl/rec_wri.cpp
@@ -89,7 +89,7 @@ void Record_Writer::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;