diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-11 19:15:42 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-11 19:15:42 +0000 |
| commit | 1441b0ec0efa569d741ae18681c73e2e9cf44a99 (patch) | |
| tree | 929e871b2aac30e6d9ab5c92a7546361babe667b /net/third_party | |
| parent | 245a9117fa8902e8905e1713436dcb820c92c82e (diff) | |
| download | chromium_src-1441b0ec0efa569d741ae18681c73e2e9cf44a99.zip chromium_src-1441b0ec0efa569d741ae18681c73e2e9cf44a99.tar.gz chromium_src-1441b0ec0efa569d741ae18681c73e2e9cf44a99.tar.bz2 | |
Change comment in SSL keylog file.
This addresses wtc's follow-up comment in
https://chromiumcodereview.appspot.com/10509009/
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party')
| -rw-r--r-- | net/third_party/nss/patches/keylog.patch | 9 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/sslsock.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/net/third_party/nss/patches/keylog.patch b/net/third_party/nss/patches/keylog.patch index b40c6ec..10a9285 100644 --- a/net/third_party/nss/patches/keylog.patch +++ b/net/third_party/nss/patches/keylog.patch @@ -153,10 +153,10 @@ index 6780a84..4cf011b 100644 fail: diff --git a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsock.c -index c61ab44..3bd11d2 100644 +index c61ab44..9387a21 100644 --- a/net/third_party/nss/ssl/sslsock.c +++ b/net/third_party/nss/ssl/sslsock.c -@@ -2903,6 +2903,13 @@ ssl_SetDefaultsFromEnvironment(void) +@@ -2903,22 +2903,22 @@ ssl_SetDefaultsFromEnvironment(void) ssl_trace = atoi(ev); SSL_TRACE(("SSL: tracing set to %d", ssl_trace)); } @@ -170,7 +170,10 @@ index c61ab44..3bd11d2 100644 ev = getenv("SSLKEYLOGFILE"); if (ev && ev[0]) { ssl_keylog_iob = fopen(ev, "a"); -@@ -2912,13 +2919,6 @@ ssl_SetDefaultsFromEnvironment(void) + if (ftell(ssl_keylog_iob) == 0) { +- fputs("# pre-master secret log file, generated by NSS\n", ++ fputs("# SSL/TLS secrets log file, generated by NSS\n", + ssl_keylog_iob); } SSL_TRACE(("SSL: logging pre-master secrets to %s", ev)); } diff --git a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsock.c index 3bd11d2..9387a21 100644 --- a/net/third_party/nss/ssl/sslsock.c +++ b/net/third_party/nss/ssl/sslsock.c @@ -2914,7 +2914,7 @@ ssl_SetDefaultsFromEnvironment(void) if (ev && ev[0]) { ssl_keylog_iob = fopen(ev, "a"); if (ftell(ssl_keylog_iob) == 0) { - fputs("# pre-master secret log file, generated by NSS\n", + fputs("# SSL/TLS secrets log file, generated by NSS\n", ssl_keylog_iob); } SSL_TRACE(("SSL: logging pre-master secrets to %s", ev)); |