| Index: net/third_party/nss/ssl/sslauth.c
|
| ===================================================================
|
| --- net/third_party/nss/ssl/sslauth.c (revision 227672)
|
| +++ net/third_party/nss/ssl/sslauth.c (working copy)
|
| @@ -100,7 +100,6 @@
|
| sslSocket *ss;
|
| const char *cipherName;
|
| PRBool isDes = PR_FALSE;
|
| - PRBool enoughFirstHsDone = PR_FALSE;
|
|
|
| ss = ssl_FindSocket(fd);
|
| if (!ss) {
|
| @@ -118,14 +117,7 @@
|
| *op = SSL_SECURITY_STATUS_OFF;
|
| }
|
|
|
| - if (ss->firstHsDone) {
|
| - enoughFirstHsDone = PR_TRUE;
|
| - } else if (ss->version >= SSL_LIBRARY_VERSION_3_0 &&
|
| - ssl3_CanFalseStart(ss)) {
|
| - enoughFirstHsDone = PR_TRUE;
|
| - }
|
| -
|
| - if (ss->opt.useSecurity && enoughFirstHsDone) {
|
| + if (ss->opt.useSecurity && ss->enoughFirstHsDone) {
|
| if (ss->version < SSL_LIBRARY_VERSION_3_0) {
|
| cipherName = ssl_cipherName[ss->sec.cipherType];
|
| } else {
|
|
|