diff options
| author | Kai Engert <kaie@kuix.de> | 2016-04-22 01:27:13 +0200 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2016-04-22 01:27:13 +0200 |
| commit | ff12b4e38e30cacbee6931a54adefea6d57a2c2d (patch) | |
| tree | b9a15cd0956380f2993e6b0c9749426c211c3eb9 | |
| parent | e0989a004c3863b4c3a7694cc45c3b7e9a39df0a (diff) | |
| download | nss-hg-ff12b4e38e30cacbee6931a54adefea6d57a2c2d.tar.gz | |
Backed out changeset a8ed4278b46a, Bug 1183318
| -rw-r--r-- | lib/ssl/ssl3con.c | 4 | ||||
| -rw-r--r-- | lib/ssl/sslsock.c | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/lib/ssl/ssl3con.c b/lib/ssl/ssl3con.c index 494c7cad3..0a734fe36 100644 --- a/lib/ssl/ssl3con.c +++ b/lib/ssl/ssl3con.c @@ -6384,7 +6384,6 @@ sendRSAClientKeyExchange(sslSocket *ss, SECKEYPublicKey *svrPubKey) goto loser; } -#ifndef DISABLE_SSLKEYLOGFILE if (ssl_keylog_iob) { SECStatus extractRV = PK11_ExtractKeyValue(pms); if (extractRV == SECSuccess) { @@ -6416,7 +6415,6 @@ sendRSAClientKeyExchange(sslSocket *ss, SECKEYPublicKey *svrPubKey) } } } -#endif rv = ssl3_AppendHandshakeHeader(ss, client_key_exchange, isTLS ? enc_pms.len + 2 @@ -11728,7 +11726,6 @@ ssl3_SendNextProto(sslSocket *ss) static void ssl3_RecordKeyLog(sslSocket *ss) { -#ifndef DISABLE_SSLKEYLOGFILE SECStatus rv; SECItem *keyData; char buf[14 /* "CLIENT_RANDOM " */ + @@ -11779,7 +11776,6 @@ ssl3_RecordKeyLog(sslSocket *ss) return; fflush(ssl_keylog_iob); return; -#endif } /* called from ssl3_SendClientSecondRound diff --git a/lib/ssl/sslsock.c b/lib/ssl/sslsock.c index b970133ae..72ea901b3 100644 --- a/lib/ssl/sslsock.c +++ b/lib/ssl/sslsock.c @@ -127,11 +127,7 @@ int ssl_lock_readers = 1; /* default true. */ char ssl_debug; char ssl_trace; FILE *ssl_trace_iob; - -#ifndef DISABLE_SSLKEYLOGFILE FILE *ssl_keylog_iob; -#endif - char lockStatus[] = "Locks are ENABLED. "; #define LOCKSTATUS_OFFSET 10 /* offset of ENABLED */ @@ -3296,7 +3292,6 @@ ssl_SetDefaultsFromEnvironment(void) SSL_TRACE(("SSL: debugging set to %d", ssl_debug)); } #endif /* DEBUG */ -#ifndef DISABLE_SSLKEYLOGFILE ev = PR_GetEnvSecure("SSLKEYLOGFILE"); if (ev && ev[0]) { ssl_keylog_iob = fopen(ev, "a"); @@ -3310,7 +3305,6 @@ ssl_SetDefaultsFromEnvironment(void) SSL_TRACE(("SSL: logging SSL/TLS secrets to %s", ev)); } } -#endif #ifndef NO_PKCS11_BYPASS ev = PR_GetEnvSecure("SSLBYPASS"); if (ev && ev[0]) { |