Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1328318, Allow configuration of SSL/TLS version ranges to silenty…
… succeed if a reduced range is selected because of policies or limitations, test part, partial r=ekr, final r=martin.thomson
  • Loading branch information
kaie committed May 4, 2017
1 parent 25c883e commit d67e90f
Show file tree
Hide file tree
Showing 9 changed files with 457 additions and 8 deletions.
6 changes: 6 additions & 0 deletions cpputil/tls_parser.h
Expand Up @@ -17,6 +17,8 @@
#endif
#include "databuffer.h"

#include "sslt.h"

namespace nss_test {

const uint8_t kTlsChangeCipherSpecType = 20;
Expand Down Expand Up @@ -133,6 +135,10 @@ class TlsParser {
size_t offset_;
};

inline std::ostream& operator<<(std::ostream& os, SSLProtocolVariant v) {
return os << ((v == ssl_variant_stream) ? "TLS" : "DTLS");
}

} // namespace nss_test

#endif
6 changes: 6 additions & 0 deletions gtests/nss_bogo_shim/nss_bogo_shim.cc
Expand Up @@ -265,6 +265,12 @@ class TestAgent {
rv = SSL_VersionRangeSet(ssl_fd_, &vrange);
if (rv != SECSuccess) return false;

SSLVersionRange verify_vrange;
rv = SSL_VersionRangeGet(ssl_fd_, &verify_vrange);
if (rv != SECSuccess) return false;
if (vrange.min != verify_vrange.min || vrange.max != verify_vrange.max)
return false;

rv = SSL_OptionSet(ssl_fd_, SSL_NO_CACHE, false);
if (rv != SECSuccess) return false;

Expand Down
1 change: 1 addition & 0 deletions gtests/ssl_gtest/manifest.mn
Expand Up @@ -39,6 +39,7 @@ CPPSRCS = \
ssl_staticrsa_unittest.cc \
ssl_v2_client_hello_unittest.cc \
ssl_version_unittest.cc \
ssl_versionpolicy_unittest.cc \
test_io.cc \
tls_agent.cc \
tls_connect.cc \
Expand Down
1 change: 1 addition & 0 deletions gtests/ssl_gtest/ssl_gtest.gyp
Expand Up @@ -36,6 +36,7 @@
'ssl_staticrsa_unittest.cc',
'ssl_v2_client_hello_unittest.cc',
'ssl_version_unittest.cc',
'ssl_versionpolicy_unittest.cc',
'test_io.cc',
'tls_agent.cc',
'tls_connect.cc',
Expand Down

0 comments on commit d67e90f

Please sign in to comment.