Skip to content

Commit

Permalink
Bug 1267926 - Remove sid check now that SSLv2 is gone, r=ekr
Browse files Browse the repository at this point in the history
--HG--
extra : rebase_source : 0ec4581f549e092b4151f4cdf70989ce825e3a45
extra : amend_source : 47e216228fe1c4cdbd660016f4fed52e44378734
  • Loading branch information
martinthomson committed Apr 27, 2016
1 parent c24c595 commit f82e47d
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions lib/ssl/tls13con.c
Expand Up @@ -428,13 +428,8 @@ tls13_AllowPskCipher(const sslSocket *ss, const ssl3CipherSuiteDef *cipher_def)
sslSessionID *sid = ss->sec.ci.sid;
const ssl3CipherSuiteDef *cached_cipher_def;

/* This is zero when called from ssl3_ConstructV2CipherSpecsHack.
* TODO(ekr@rtfm.com): remove when SSLv2 is removed. Bug 1228555.
*/
if (!sid)
return PR_FALSE;

/* Verify that this was cached. */
PORT_Assert(sid);
if (sid->cached == never_cached)
return PR_FALSE;

Expand Down

0 comments on commit f82e47d

Please sign in to comment.