Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1208405 - fix build and null deref, r=mt,ttaubert
--HG--
extra : rebase_source : 74a9aeb014a1b13d3457088118fe45b721b9696f
extra : amend_source : 84996339f2ea9769d0f694f0b88b31d572cdf174
extra : histedit_source : 78c06b573af709b4e201e3c5910638288c5128b3
  • Loading branch information
franziskuskiefer committed Oct 24, 2016
1 parent d29d2a3 commit b1a908f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions external_tests/ssl_gtest/ssl_gtest.gyp
Expand Up @@ -12,15 +12,21 @@
'type': 'executable',
'sources': [
'libssl_internals.c',
'ssl_0rtt_unittest.cc',
'ssl_agent_unittest.cc',
'ssl_auth_unittest.cc',
'ssl_cert_ext_unittest.cc',
'ssl_ciphersuite_unittest.cc',
'ssl_damage_unittest.cc',
'ssl_dhe_unittest.cc',
'ssl_drop_unittest.cc',
'ssl_ecdh_unittest.cc',
'ssl_ems_unittest.cc',
'ssl_extension_unittest.cc',
'ssl_gtest.cc',
'ssl_hrr_unittest.cc',
'ssl_loopback_unittest.cc',
'ssl_record_unittest.cc',
'ssl_resumption_unittest.cc',
'ssl_skip_unittest.cc',
'ssl_staticrsa_unittest.cc',
Expand Down
4 changes: 2 additions & 2 deletions lib/ssl/tls13con.c
Expand Up @@ -1136,13 +1136,13 @@ tls13_NegotiateKeyExchange(sslSocket *ss, TLS13KeyShareEntry **clientShare)
}
}

SSL_TRC(3, ("%d: TLS13[%d]: group = %d", preferredGroup->name));

if (!preferredGroup) {
FATAL_ERROR(ss, SSL_ERROR_NO_CYPHER_OVERLAP, handshake_failure);
return SECFailure;
}

SSL_TRC(3, ("%d: TLS13[%d]: group = %d", preferredGroup->name));

if (!entry) {
return tls13_SendHelloRetryRequest(ss, preferredGroup);
}
Expand Down

0 comments on commit b1a908f

Please sign in to comment.