May 2016 - tor-commits - lists.torproject.org

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 19 May '16

19 May '16

commit d4db492e293b967850407d9d6ebd2c4816da7739 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 19 09:45:34 2016 +0000 Update translations for torbirdy --- hr_HR/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR/torbirdy.properties b/hr_HR/torbirdy.properties index f7c945a..2c6d191 100644 --- a/hr_HR/torbirdy.properties +++ b/hr_HR/torbirdy.properties @@ -6,7 +6,7 @@ torbirdy.enabled.custom=TorBirdy Omogućen: Prilagođeni Proxy torbirdy.enabled.torification=TorBirdy Omogućen: Transparentna Torifikacija torbirdy.enabled.whonix=TorBirdy Omogućen: Whonix torbirdy.disabled=TorBirdy: Onemogućen! -torbirdy.enabled=TorBirdy: Enabled +torbirdy.enabled=TorBirdy: omogućeno torbirdy.email.prompt=TorBirdy je onemogućio Thunderbird-ovog čarobnjaka za autokonfiguraciju kako bi zaštitio Vašu anonimnost.\n\nPreporučene postavke sigurnosti za %S su postavljene.\n\nSad možete konfigurirati i ostale postavke.

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 19 May '16

19 May '16

commit ab180761701a8e0132979d650416ef34b3c61933 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 19 09:45:08 2016 +0000 Update translations for bridgedb_completed --- hr_HR/LC_MESSAGES/bridgedb.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po index 3cb6dab..0d27529 100644 --- a/hr_HR/LC_MESSAGES/bridgedb.po +++ b/hr_HR/LC_MESSAGES/bridgedb.po @@ -5,6 +5,7 @@ # Translators: # Ana B, 2013-2014 # Armando Vega <synaan(a)gmail.com>, 2012 +# Igor <lyricaltumor(a)gmail.com>, 2016 # Igor <lyricaltumor(a)gmail.com>, 2014-2015 # Tomislav Siroglavić <tomsiro(a)gmail.com>, 2014 # gogo <trebelnik2(a)gmail.com>, 2012 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2016-05-19 09:32+0000\n" +"Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,11 +41,11 @@ msgstr "Oprostite! Nešto je pošlo po krivu s Vašim zahtjevom." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "Prijavi Greški" +msgstr "Prijavite grešku" #: bridgedb/https/templates/base.html:82 msgid "Source Code" -msgstr "Izvorni Kod" +msgstr "Izvorni kod" #: bridgedb/https/templates/base.html:85 msgid "Changelog" @@ -56,7 +57,7 @@ msgstr "Kontakt" #: bridgedb/https/templates/bridges.html:35 msgid "Select All" -msgstr "Odaberi Sve" +msgstr "Odaberi sve" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" @@ -83,7 +84,7 @@ msgstr "Čini se da je došlo do greške pri dobavljanju Vašeg QR koda." msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Ovaj QRKod sadrži Vaše linije mostova. Skenirajte ga s čitačem QR koda da bi kopirali linije mostova na mobilne i ostale uređaje." +msgstr "Ovaj QR kod sadrži Vaše linije mostova. Skenirajte ga s čitačem QR koda da bi kopirali linije mostova na mobilne i ostale uređaje." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." @@ -114,7 +115,7 @@ msgstr "Korak %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Dobijte %s mostove %s" +msgstr "Preuzmi %s mostove %s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -137,7 +138,7 @@ msgstr "%sS%samo mi daj mostove!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" -msgstr "Napredne Opcije" +msgstr "Napredne opcije" #: bridgedb/https/templates/options.html:86 msgid "No"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 19 May '16

19 May '16

commit da072dec7c439cd7dae36d0dc4669c24ee0a1adc Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 19 09:45:04 2016 +0000 Update translations for bridgedb --- hr_HR/LC_MESSAGES/bridgedb.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po index 3cb6dab..0d27529 100644 --- a/hr_HR/LC_MESSAGES/bridgedb.po +++ b/hr_HR/LC_MESSAGES/bridgedb.po @@ -5,6 +5,7 @@ # Translators: # Ana B, 2013-2014 # Armando Vega <synaan(a)gmail.com>, 2012 +# Igor <lyricaltumor(a)gmail.com>, 2016 # Igor <lyricaltumor(a)gmail.com>, 2014-2015 # Tomislav Siroglavić <tomsiro(a)gmail.com>, 2014 # gogo <trebelnik2(a)gmail.com>, 2012 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2016-05-19 09:32+0000\n" +"Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,11 +41,11 @@ msgstr "Oprostite! Nešto je pošlo po krivu s Vašim zahtjevom." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "Prijavi Greški" +msgstr "Prijavite grešku" #: bridgedb/https/templates/base.html:82 msgid "Source Code" -msgstr "Izvorni Kod" +msgstr "Izvorni kod" #: bridgedb/https/templates/base.html:85 msgid "Changelog" @@ -56,7 +57,7 @@ msgstr "Kontakt" #: bridgedb/https/templates/bridges.html:35 msgid "Select All" -msgstr "Odaberi Sve" +msgstr "Odaberi sve" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" @@ -83,7 +84,7 @@ msgstr "Čini se da je došlo do greške pri dobavljanju Vašeg QR koda." msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Ovaj QRKod sadrži Vaše linije mostova. Skenirajte ga s čitačem QR koda da bi kopirali linije mostova na mobilne i ostale uređaje." +msgstr "Ovaj QR kod sadrži Vaše linije mostova. Skenirajte ga s čitačem QR koda da bi kopirali linije mostova na mobilne i ostale uređaje." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." @@ -114,7 +115,7 @@ msgstr "Korak %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Dobijte %s mostove %s" +msgstr "Preuzmi %s mostove %s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -137,7 +138,7 @@ msgstr "%sS%samo mi daj mostove!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" -msgstr "Napredne Opcije" +msgstr "Napredne opcije" #: bridgedb/https/templates/options.html:86 msgid "No"

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 19 May '16

19 May '16

commit f04f4ccc482c78e05e778d3ab1de9994e945b48a Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 19 02:15:42 2016 +0000 Update translations for tor-launcher-properties_completed --- de/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/de/torlauncher.properties b/de/torlauncher.properties index 1b50aa5..bbf1be6 100644 --- a/de/torlauncher.properties +++ b/de/torlauncher.properties @@ -3,6 +3,7 @@ torlauncher.error_title=Tor-Starter +torlauncher.tor_exited_during_startup=Tor wurde unerwartet beendet. Dies kann die Folge eines Fehlers in ihrer "torrc"-Datei sein, ein Fehler in Tor, einem anderen Programm in ihrem System oder fehlerhafte Hardware sein. Bis die Ursache beseitigt wurde und Tor neugestartet wurde, wird der Tor Browser nicht starten. torlauncher.tor_exited=Tor wurde unerwartet beendet. Das kann an einem Fehler von Tor selbst, an einem anderen Programm auf ihrem System oder fehlerhaften Geräten liegen. Bis Sie Tor neu starten, kann der Tor-Browser keine Internetseiten mehr erreichen. Wenn das Problem bestehen bleibt, bitte eine Kopie des Tor-Protokolls an die Unterstützungsmannschaft senden. torlauncher.tor_exited2=Das Neustarten von Tor wird die Reiter Ihres Browsers nicht schließen. torlauncher.tor_controlconn_failed=Zum Tor-Kontrollanschluss konnte keine Verbindung hergestellt werden.

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 19 May '16

19 May '16

commit 3c4819ac76e29de69b8eb0b20de8b165481f4ec7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 19 02:15:39 2016 +0000 Update translations for tor-launcher-properties --- de/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torlauncher.properties b/de/torlauncher.properties index eff0a36..bbf1be6 100644 --- a/de/torlauncher.properties +++ b/de/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tor-Starter -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Tor wurde unerwartet beendet. Dies kann die Folge eines Fehlers in ihrer "torrc"-Datei sein, ein Fehler in Tor, einem anderen Programm in ihrem System oder fehlerhafte Hardware sein. Bis die Ursache beseitigt wurde und Tor neugestartet wurde, wird der Tor Browser nicht starten. torlauncher.tor_exited=Tor wurde unerwartet beendet. Das kann an einem Fehler von Tor selbst, an einem anderen Programm auf ihrem System oder fehlerhaften Geräten liegen. Bis Sie Tor neu starten, kann der Tor-Browser keine Internetseiten mehr erreichen. Wenn das Problem bestehen bleibt, bitte eine Kopie des Tor-Protokolls an die Unterstützungsmannschaft senden. torlauncher.tor_exited2=Das Neustarten von Tor wird die Reiter Ihres Browsers nicht schließen. torlauncher.tor_controlconn_failed=Zum Tor-Kontrollanschluss konnte keine Verbindung hergestellt werden.

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 19 May '16

19 May '16

commit 1dfc6e2293ed8da096fcb1316f7fc250bee7f3a8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 19 02:15:34 2016 +0000 Update translations for torbirdy_completed --- de/torbirdy.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/de/torbirdy.properties b/de/torbirdy.properties index fb14ffe..59dcbef 100644 --- a/de/torbirdy.properties +++ b/de/torbirdy.properties @@ -6,6 +6,7 @@ torbirdy.enabled.custom=TorBirdy Aktiv: Benutzerdefiniert torbirdy.enabled.torification=TorBirdy Aktiv: Transparent Torification torbirdy.enabled.whonix=TorBirdy Aktiv: Whonix torbirdy.disabled=TorBirdy: Deaktiviert! +torbirdy.enabled=TorBirdy: Aktiv torbirdy.email.prompt=TorBirdy hat den Assistenten für die Kontenerstellung deaktiviert um Ihre Anonymität zu schützen.\n\nDie empfohlenen Sicherheitseinstellungen wurden für %S aktiviert.\n\nSie können die anderen Kontoeinstellungen manuell konfigurieren.

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 19 May '16

19 May '16

commit 3e19260acb34ace2442a215a0f675d12f2eeac6b Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 19 02:15:30 2016 +0000 Update translations for torbirdy --- de/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torbirdy.properties b/de/torbirdy.properties index 16d1d49..59dcbef 100644 --- a/de/torbirdy.properties +++ b/de/torbirdy.properties @@ -6,7 +6,7 @@ torbirdy.enabled.custom=TorBirdy Aktiv: Benutzerdefiniert torbirdy.enabled.torification=TorBirdy Aktiv: Transparent Torification torbirdy.enabled.whonix=TorBirdy Aktiv: Whonix torbirdy.disabled=TorBirdy: Deaktiviert! -torbirdy.enabled=TorBirdy: Enabled +torbirdy.enabled=TorBirdy: Aktiv torbirdy.email.prompt=TorBirdy hat den Assistenten für die Kontenerstellung deaktiviert um Ihre Anonymität zu schützen.\n\nDie empfohlenen Sicherheitseinstellungen wurden für %S aktiviert.\n\nSie können die anderen Kontoeinstellungen manuell konfigurieren.

1 0

[snowflake/master] lint proxypair
by serene＠torproject.org 19 May '16

19 May '16

commit 361da32ecb87f6b66d96c200b4edd49828902f41 Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu May 12 11:50:54 2016 -0700 lint proxypair --- proxy/proxypair.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index 6471f3a..e6ab563 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -92,8 +92,8 @@ class ProxyPair @relay.label = 'websocket-relay' @relay.onopen = => if @timer - clearTimeout @timer - @timer = 0 + clearTimeout @timer + @timer = 0 log @relay.label + ' connected!' snowflake.ui.setStatus 'connected' @relay.onclose = =>

1 0

[snowflake/master] more complete and improved client rendezvous tests
by serene＠torproject.org 19 May '16

19 May '16

commit 00196bbd7499fb0a2a909dcf8d3f81deaeecd3f6 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed May 18 13:08:10 2016 -0700 more complete and improved client rendezvous tests --- client/client_test.go | 43 +++++++++++++++++++++++++++++++++++-------- client/rendezvous.go | 32 +++++++++++++++++++++----------- client/snowflake.go | 3 ++- 3 files changed, 58 insertions(+), 20 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index 733242b..41dc5e6 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -35,13 +35,14 @@ func (m *MockResponse) Close() error { } type MockTransport struct { + statusOverride int } // Just returns a response with fake SDP answer. func (m *MockTransport) RoundTrip(req *http.Request) (*http.Response, error) { s := ioutil.NopCloser(strings.NewReader(`{"type":"answer","sdp":"fake"}`)) r := &http.Response{ - StatusCode: http.StatusOK, + StatusCode: m.statusOverride, Body: s, } return r, nil @@ -119,16 +120,19 @@ func TestConnect(t *testing.T) { }) Convey("Rendezvous", t, func() { + webrtc.SetLoggingVerbosity(0) + transport := &MockTransport{http.StatusOK} + fakeOffer := webrtc.DeserializeSessionDescription("test") Convey("BrokerChannel with no front domain", func() { - b := NewBrokerChannel("test.broker", "") + b := NewBrokerChannel("test.broker", "", transport) So(b.url, ShouldNotBeNil) So(b.url.Path, ShouldResemble, "test.broker") So(b.transport, ShouldNotBeNil) }) Convey("BrokerChannel with front domain", func() { - b := NewBrokerChannel("test.broker", "front") + b := NewBrokerChannel("test.broker", "front", transport) So(b.url, ShouldNotBeNil) So(b.url.Path, ShouldResemble, "test.broker") So(b.url.Host, ShouldResemble, "front") @@ -136,15 +140,38 @@ func TestConnect(t *testing.T) { }) Convey("BrokerChannel Negotiate responds with answer", func() { - b := NewBrokerChannel("test.broker", "") - sdp := webrtc.DeserializeSessionDescription("test") - // Replace transport with a mock. - b.transport = &MockTransport{} - answer, err := b.Negotiate(sdp) + b := NewBrokerChannel("test.broker", "", transport) + answer, err := b.Negotiate(fakeOffer) So(err, ShouldBeNil) So(answer, ShouldNotBeNil) So(answer.Sdp, ShouldResemble, "fake") }) + Convey("BrokerChannel Negotiate fails with 503", func() { + b := NewBrokerChannel("test.broker", "", + &MockTransport{http.StatusServiceUnavailable}) + answer, err := b.Negotiate(fakeOffer) + So(err, ShouldNotBeNil) + So(answer, ShouldBeNil) + So(err.Error(), ShouldResemble, BrokerError503) + }) + + Convey("BrokerChannel Negotiate fails with 400", func() { + b := NewBrokerChannel("test.broker", "", + &MockTransport{http.StatusBadRequest}) + answer, err := b.Negotiate(fakeOffer) + So(err, ShouldNotBeNil) + So(answer, ShouldBeNil) + So(err.Error(), ShouldResemble, BrokerError400) + }) + + Convey("BrokerChannel Negotiate fails with unexpected", func() { + b := NewBrokerChannel("test.broker", "", + &MockTransport{123}) + answer, err := b.Negotiate(fakeOffer) + So(err, ShouldNotBeNil) + So(answer, ShouldBeNil) + So(err.Error(), ShouldResemble, BrokerErrorUnexpected) + }) }) } diff --git a/client/rendezvous.go b/client/rendezvous.go index 20948af..85549d3 100644 --- a/client/rendezvous.go +++ b/client/rendezvous.go @@ -14,19 +14,34 @@ import ( "github.com/keroserene/go-webrtc" ) +const ( + BrokerError503 string = "No snowflake proxies currently available." + BrokerError400 string = "You sent an invalid offer in the request." + BrokerErrorUnexpected string = "Unexpected error, no answer." +) + // Signalling Channel to the Broker. type BrokerChannel struct { // The Host header to put in the HTTP request (optional and may be // different from the host name in URL). - Host string - url *url.URL + Host string + url *url.URL transport http.RoundTripper // Used to make all requests. } +// We make a copy of DefaultTransport because we want the default Dial +// and TLSHandshakeTimeout settings. But we want to disable the default +// ProxyFromEnvironment setting. +func CreateBrokerTransport() http.RoundTripper { + transport := http.DefaultTransport.(*http.Transport) + transport.Proxy = nil + return transport +} + // Construct a new BrokerChannel, where: // |broker| is the full URL of the facilitating program which assigns proxies // to clients, and |front| is the option fronting domain. -func NewBrokerChannel(broker string, front string) *BrokerChannel { +func NewBrokerChannel(broker string, front string, transport http.RoundTripper) *BrokerChannel { targetURL, err := url.Parse(broker) if nil != err { return nil @@ -38,11 +53,6 @@ func NewBrokerChannel(broker string, front string) *BrokerChannel { bc.url.Host = front } - // We make a copy of DefaultTransport because we want the default Dial - // and TLSHandshakeTimeout settings. But we want to disable the default - // ProxyFromEnvironment setting. - transport := http.DefaultTransport.(*http.Transport) - transport.Proxy = nil bc.transport = transport return bc } @@ -79,10 +89,10 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( return answer, nil case http.StatusServiceUnavailable: - return nil, errors.New("No snowflake proxies currently available.") + return nil, errors.New(BrokerError503) case http.StatusBadRequest: - return nil, errors.New("You sent an invalid offer in the request.") + return nil, errors.New(BrokerError400) default: - return nil, errors.New("Unexpected error, no answer.") + return nil, errors.New(BrokerErrorUnexpected) } } diff --git a/client/snowflake.go b/client/snowflake.go index 8a03148..f32ddc8 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -59,7 +59,8 @@ type SnowflakeChannel interface { // Maintain |SnowflakeCapacity| number of available WebRTC connections, to // transfer to the Tor SOCKS handler when needed. func SnowflakeConnectLoop() { - broker = NewBrokerChannel(brokerURL, frontDomain) + transport := CreateBrokerTransport() + broker = NewBrokerChannel(brokerURL, frontDomain, transport) for { numRemotes := len(webrtcRemotes) if numRemotes >= SnowflakeCapacity {

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] Bug 18885: Disable possible logging of TLS key material
by gk＠torproject.org 19 May '16

19 May '16

commit f5c58c88029648b608d75cdb06d82b06f0d30953 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 17 18:30:08 2016 +0000 Bug 18885: Disable possible logging of TLS key material This is a backport of the bugfix for #1183318 (https://hg.mozilla.org/projects/nss/rev/68d0b829490f) This is working for us as we are building Tor Browser optimized for all the platforms we support. --- security/nss/lib/ssl/Makefile | 7 +++++++ security/nss/lib/ssl/ssl3con.c | 6 ++++++ security/nss/lib/ssl/sslsock.c | 6 ++++++ 3 files changed, 19 insertions(+) diff --git a/security/nss/lib/ssl/Makefile b/security/nss/lib/ssl/Makefile index d56cbf2..abf54c9 100644 --- a/security/nss/lib/ssl/Makefile +++ b/security/nss/lib/ssl/Makefile @@ -39,6 +39,13 @@ CSRCS += unix_err.c endif endif +# Enable key logging by default in debug builds, but not opt builds. +# Logging still needs to be enabled at runtime through env vars. +NSS_ALLOW_SSLKEYLOGFILE ?= $(if $(BUILD_OPT),0,1) +ifeq (1,$(NSS_ALLOW_SSLKEYLOGFILE)) +DEFINES += -DNSS_ALLOW_SSLKEYLOGFILE=1 +endif + ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c index 8f1c547..ac57812 100644 --- a/security/nss/lib/ssl/ssl3con.c +++ b/security/nss/lib/ssl/ssl3con.c @@ -6029,6 +6029,7 @@ done: return unwrappedWrappingKey; } +#ifdef NSS_ALLOW_SSLKEYLOGFILE /* hexEncode hex encodes |length| bytes from |in| and writes it as |length*2| * bytes to |out|. */ static void @@ -6042,6 +6043,7 @@ hexEncode(char *out, const unsigned char *in, unsigned int length) *(out++) = hextable[in[i] & 15]; } } +#endif /* Called from ssl3_SendClientKeyExchange(). */ /* Presently, this always uses PKCS11. There is no bypass for this. */ @@ -6081,6 +6083,7 @@ sendRSAClientKeyExchange(sslSocket * ss, SECKEYPublicKey * svrPubKey) goto loser; } +#ifdef NSS_ALLOW_SSLKEYLOGFILE if (ssl_keylog_iob) { SECStatus extractRV = PK11_ExtractKeyValue(pms); if (extractRV == SECSuccess) { @@ -6112,6 +6115,7 @@ sendRSAClientKeyExchange(sslSocket * ss, SECKEYPublicKey * svrPubKey) } } } +#endif rv = ssl3_AppendHandshakeHeader(ss, client_key_exchange, isTLS ? enc_pms.len + 2 : enc_pms.len); @@ -10989,6 +10993,7 @@ ssl3_SendNextProto(sslSocket *ss) static void ssl3_RecordKeyLog(sslSocket *ss) { +#ifdef NSS_ALLOW_SSLKEYLOGFILE SECStatus rv; SECItem *keyData; char buf[14 /* "CLIENT_RANDOM " */ + @@ -11039,6 +11044,7 @@ ssl3_RecordKeyLog(sslSocket *ss) return; fflush(ssl_keylog_iob); return; +#endif } /* called from ssl3_SendClientSecondRound diff --git a/security/nss/lib/ssl/sslsock.c b/security/nss/lib/ssl/sslsock.c index f735009..de9a1315 100644 --- a/security/nss/lib/ssl/sslsock.c +++ b/security/nss/lib/ssl/sslsock.c @@ -118,7 +118,11 @@ int ssl_lock_readers = 1; /* default true. */ char ssl_debug; char ssl_trace; FILE * ssl_trace_iob; + +#ifdef NSS_ALLOW_SSLKEYLOGFILE FILE * ssl_keylog_iob; +#endif + char lockStatus[] = "Locks are ENABLED. "; #define LOCKSTATUS_OFFSET 10 /* offset of ENABLED */ @@ -3118,6 +3122,7 @@ ssl_SetDefaultsFromEnvironment(void) SSL_TRACE(("SSL: debugging set to %d", ssl_debug)); } #endif /* DEBUG */ +#ifdef NSS_ALLOW_SSLKEYLOGFILE ev = getenv("SSLKEYLOGFILE"); if (ev && ev[0]) { ssl_keylog_iob = fopen(ev, "a"); @@ -3131,6 +3136,7 @@ ssl_SetDefaultsFromEnvironment(void) SSL_TRACE(("SSL: logging SSL/TLS secrets to %s", ev)); } } +#endif #ifndef NO_PKCS11_BYPASS ev = getenv("SSLBYPASS"); if (ev && ev[0]) {

1 0