March 2017 - tor-commits - lists.torproject.org

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 22 Mar '17

22 Mar '17

commit 18edd92270deb667e4f29330a1d7bab44e7914e8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 22 13:15:23 2017 +0000 Update translations for whisperback_completed --- el/el.po | 61 +++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/el/el.po b/el/el.po index 61d34f9..0b685b9 100644 --- a/el/el.po +++ b/el/el.po @@ -4,6 +4,7 @@ # # Translators: # Achillefs Zogias <achillefs76(a)hotmail.com>, 2016 +# Adrian Pappas <pappasadrian(a)gmail.com>, 2017 # anvo <fragos.george(a)hotmail.com>, 2012 # metamec, 2015 # Nisok Kosin <nikos.efthimiou(a)gmail.com>, 2012 @@ -13,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2016-03-30 07:50+0000\n" -"Last-Translator: Achillefs Zogias <achillefs76(a)hotmail.com>\n" +"POT-Creation-Date: 2017-03-20 12:09+0000\n" +"PO-Revision-Date: 2017-03-22 13:04+0000\n" +"Last-Translator: Adrian Pappas <pappasadrian(a)gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,40 +46,56 @@ msgid "" "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" msgstr "Αυτη η %s μεταβλητη δεν βρεθηκε σε κανενα αρχειο ρυθμισεων /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -#: ../whisperBack/gui.py:148 +#: ../whisperBack/gui.py:110 +msgid "Name of the affected software" +msgstr "Όνομα του προσβεβλημένου λογισμικού" + +#: ../whisperBack/gui.py:112 +msgid "Exact steps to reproduce the error" +msgstr "Ακριβή βήματα για την αναπαραγωγή του προβλήματος " + +#: ../whisperBack/gui.py:114 +msgid "Actual result and description of the error" +msgstr "Το καθαυτό αποτέλεσμα και περιγραφή του πρόβληματος" + +#: ../whisperBack/gui.py:116 +msgid "Desired result" +msgstr "Επιθυμητό αποτέλεσμα" + +#: ../whisperBack/gui.py:152 msgid "Unable to load a valid configuration." msgstr "Αδύνατον να το φορτωθούν έγκυρες ρυθμίσεις. " -#: ../whisperBack/gui.py:214 +#: ../whisperBack/gui.py:218 msgid "Sending mail..." msgstr "Αποστολή του mail..." -#: ../whisperBack/gui.py:215 +#: ../whisperBack/gui.py:219 msgid "Sending mail" msgstr "Αποστολή του mail" #. pylint: disable=C0301 -#: ../whisperBack/gui.py:217 +#: ../whisperBack/gui.py:221 msgid "This could take a while..." msgstr "Αυτό μπορεί να πάρει λίγο χρόνο..." -#: ../whisperBack/gui.py:232 +#: ../whisperBack/gui.py:236 msgid "The contact email adress doesn't seem valid." msgstr "Η διεύθυνση επικοινωνίας δεν φαίνεται να είναι έγκυρη" -#: ../whisperBack/gui.py:249 +#: ../whisperBack/gui.py:253 msgid "Unable to send the mail: SMTP error." msgstr "Δεν είναι δυνατόν να σταλεί το mail: σφάλμα SMTP " -#: ../whisperBack/gui.py:251 +#: ../whisperBack/gui.py:255 msgid "Unable to connect to the server." msgstr "Αδύνατη η σύνδεση με τον διακομιστή" -#: ../whisperBack/gui.py:253 +#: ../whisperBack/gui.py:257 msgid "Unable to create or to send the mail." msgstr "Αδύνατη η δημιουργία ή η αποστολή mail" -#: ../whisperBack/gui.py:256 +#: ../whisperBack/gui.py:260 msgid "" "\n" "\n" @@ -87,20 +104,20 @@ msgid "" "If it does not work, you will be offered to save the bug report." msgstr "\n\nΗ αναφορά σφάλματος δεν μπόρεσε να σταλεί, λόγω προβλημάτων σύνδεσης. Παρακαλούμε προσπαθήστε να συνδεθείτε ξανά και πατήστε \"Αποστολή πάλι\". \n\nΑν δεν δουλέψει, θα δοθεί η επιλογή αποθήκευσης της αναφοράς του σφάλματος. " -#: ../whisperBack/gui.py:269 +#: ../whisperBack/gui.py:273 msgid "Your message has been sent." msgstr "Το μήνυμα σας έχει σταλεί" -#: ../whisperBack/gui.py:276 +#: ../whisperBack/gui.py:280 msgid "An error occured during encryption." msgstr "Εμφανίστηκε ένα σφάλμα κατά την κρυπτογράφηση" -#: ../whisperBack/gui.py:296 +#: ../whisperBack/gui.py:300 #, python-format msgid "Unable to save %s." msgstr "Αδύνατη η αποθήκευση %s" -#: ../whisperBack/gui.py:319 +#: ../whisperBack/gui.py:323 #, python-format msgid "" "The bug report could not be sent, likely due to network problems.\n" @@ -110,27 +127,27 @@ msgid "" "Do you want to save the bug report to a file?" msgstr "Η αναφορά σφάλματος δεν μπορούσε να σταλεί, λόγω προβλημάτων σύνδεσης.\n\nΕναλλακτικά, μπορείτε να αποθηκεύσετε την αναφορά του σφάλματος ως αρχείο σε έναν δίσκο USB και να προσπαθήσετε να μας το στείλετε στο %s μέσω του ηλεκτρονικού σας λογαριασμού από άλλο σύστημα. Σημειώστε ότι το μήνυμα δεν θα σταλεί ανώνυμα με αυτή την επιλογή εκτός και αν κάνετε οι ίδιοι κάποια πρόσθετα βηματα ( π.χ. να χρησιμοποιήσετε το Tor με έναν λογαριασμό email \"μιας χρήσης\").\n\nΘέλετε να αποθηκεύσετε την αναφορά του σφάλματος ως αρχείο;" -#: ../whisperBack/gui.py:379 ../data/whisperback.ui.h:21 +#: ../whisperBack/gui.py:383 ../data/whisperback.ui.h:21 msgid "WhisperBack" msgstr "WhisperBack" -#: ../whisperBack/gui.py:380 ../data/whisperback.ui.h:2 +#: ../whisperBack/gui.py:384 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." msgstr "Στείλε τα σχόλια σας σε κρυπτογραφημένο mail." -#: ../whisperBack/gui.py:383 +#: ../whisperBack/gui.py:387 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" msgstr "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" -#: ../whisperBack/gui.py:384 +#: ../whisperBack/gui.py:388 msgid "Tails developers <tails(a)boum.org>" msgstr "Tails developers <tails(a)boum.org>" -#: ../whisperBack/gui.py:385 +#: ../whisperBack/gui.py:389 msgid "translator-credits" msgstr "translator-credits" -#: ../whisperBack/gui.py:412 +#: ../whisperBack/gui.py:417 msgid "This doesn't seem to be a valid URL or OpenPGP key." msgstr "Αυτό δεν φαίνετε να είναι έγκυρο URL ή κλειδί OpenPGP"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 22 Mar '17

22 Mar '17

commit ced4e5247d4f72849bd9b3a276edfc6c5d1e0a8a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 22 13:15:17 2017 +0000 Update translations for whisperback --- el/el.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/el/el.po b/el/el.po index 5d9efdc..0b685b9 100644 --- a/el/el.po +++ b/el/el.po @@ -4,6 +4,7 @@ # # Translators: # Achillefs Zogias <achillefs76(a)hotmail.com>, 2016 +# Adrian Pappas <pappasadrian(a)gmail.com>, 2017 # anvo <fragos.george(a)hotmail.com>, 2012 # metamec, 2015 # Nisok Kosin <nikos.efthimiou(a)gmail.com>, 2012 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-03-21 08:24+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-03-22 13:04+0000\n" +"Last-Translator: Adrian Pappas <pappasadrian(a)gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,19 +48,19 @@ msgstr "Αυτη η %s μεταβλητη δεν βρεθηκε σε κανεν #: ../whisperBack/gui.py:110 msgid "Name of the affected software" -msgstr "" +msgstr "Όνομα του προσβεβλημένου λογισμικού" #: ../whisperBack/gui.py:112 msgid "Exact steps to reproduce the error" -msgstr "" +msgstr "Ακριβή βήματα για την αναπαραγωγή του προβλήματος " #: ../whisperBack/gui.py:114 msgid "Actual result and description of the error" -msgstr "" +msgstr "Το καθαυτό αποτέλεσμα και περιγραφή του πρόβληματος" #: ../whisperBack/gui.py:116 msgid "Desired result" -msgstr "" +msgstr "Επιθυμητό αποτέλεσμα" #: ../whisperBack/gui.py:152 msgid "Unable to load a valid configuration."

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 22 Mar '17

22 Mar '17

commit d7c15a767d6938853339a2a9c80b1a65cf8a9bb9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 22 07:18:18 2017 +0000 Update translations for tor-browser-manual --- de/de.po | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/de/de.po b/de/de.po index f055cfd..25cb5dd 100644 --- a/de/de.po +++ b/de/de.po @@ -12,12 +12,13 @@ # Christian Humm <christian.lehberger(a)googlemail.com>, 2017 # kan torkel <kantorkel(a)hamburg.freifunk.net>, 2017 # max weber <hfr(a)posteo.de>, 2017 +# nautilusx <mail.ka(a)mailbox.org>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: max weber <hfr(a)posteo.de>, 2017\n" +"Last-Translator: nautilusx <mail.ka(a)mailbox.org>, 2017\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -562,6 +563,8 @@ msgid "" "external ref='media/first-time/proxy_question.png' " "md5='30853b3e86cfd386bbc32e5b8b45a378'" msgstr "" +"external ref='media/first-time/proxy_question.png' " +"md5='30853b3e86cfd386bbc32e5b8b45a378'" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -573,6 +576,8 @@ msgid "" "external ref='media/first-time/proxy.png' " "md5='13f21a351cd0aa1cf11aada690f3dc90'" msgstr "" +"external ref='media/first-time/proxy.png' " +"md5='13f21a351cd0aa1cf11aada690f3dc90'" #: index.page:6 msgid "Tor Browser User Manual" @@ -725,6 +730,8 @@ msgid "" "external ref='media/managing-identities/circuit_full.png' " "md5='bd46d22de952fee42643be46d3f95928'" msgstr "" +"external ref='media/managing-identities/circuit_full.png' " +"md5='bd46d22de952fee42643be46d3f95928'" #: managing-identities.page:48 msgid "" @@ -793,6 +800,8 @@ msgid "" "external ref='media/managing-identities/new_identity.png' " "md5='15b01e35fa83185d94b57bf0ccf09d76'" msgstr "" +"external ref='media/managing-identities/new_identity.png' " +"md5='15b01e35fa83185d94b57bf0ccf09d76'" #: managing-identities.page:105 msgid "" @@ -891,6 +900,8 @@ msgid "" "external ref='media/onionsites/onion_url.png' " "md5='f97f7fe10f07c3959c4430934974bbaa'" msgstr "" +"external ref='media/onionsites/onion_url.png' " +"md5='f97f7fe10f07c3959c4430934974bbaa'" #: onionsites.page:50 msgid "" @@ -982,6 +993,8 @@ msgid "" "external ref='media/plugins/noscript_menu.png' " "md5='df9e684b76a3c2e2bdcb879a19c20471'" msgstr "" +"external ref='media/plugins/noscript_menu.png' " +"md5='df9e684b76a3c2e2bdcb879a19c20471'" #: plugins.page:47 msgid "" @@ -1042,6 +1055,8 @@ msgid "" "external ref='media/secure-connections/https.png' " "md5='364bcbde7a649b0cea9ae178007c1a50'" msgstr "" +"external ref='media/secure-connections/https.png' " +"md5='364bcbde7a649b0cea9ae178007c1a50'" #: secure-connections.page:26 msgid ""

1 0

[meek/master] Add support for dynamic reloading of certificates. (Go 1.6+)
by dcf＠torproject.org 22 Mar '17

22 Mar '17

commit f7f792f28ebc3520e06b124083a768cb32e4c88d Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sun Apr 10 06:26:36 2016 +0000 Add support for dynamic reloading of certificates. (Go 1.6+) Entirely untested, probably correct. The callback used to feed the TLS Listener the certificate was introduced in Go 1.6, so that version or newer is now required. --- meek-server/certificate.go | 114 +++++++++++++++++++++++++++++++++++++++++++++ meek-server/meek-server.go | 14 +++--- 2 files changed, 122 insertions(+), 6 deletions(-) diff --git a/meek-server/certificate.go b/meek-server/certificate.go new file mode 100644 index 0000000..2c57d85 --- /dev/null +++ b/meek-server/certificate.go @@ -0,0 +1,114 @@ +// certificate.go - Certificate management for meek-server. + +// +build go1.6 + +package main + +import ( + "crypto/tls" + "log" + "os" + "sync" + "time" +) + +const certLoadErrorRateLimit = 1 * time.Minute + +type certContext struct { + sync.Mutex + + certFile string + keyFile string + + certFileInfo os.FileInfo + keyFileInfo os.FileInfo + cachedCert *tls.Certificate + + lastWarnAt time.Time +} + +func newCertContext(certFilename, keyFilename string) (*certContext, error) { + ctx := new(certContext) + ctx.certFile = certFilename + ctx.keyFile = keyFilename + if _, err := ctx.reloadCertificate(); err != nil { + return nil, err + } + return ctx, nil +} + +func (ctx *certContext) reloadCertificate() (*tls.Certificate, error) { + doReload := true + + // XXX/Yawning: I assume compared to everything else related to TLS + // handshakes, stat() is cheap. If not, ratelimit here. gettimeofday() + // is vDSO-ed so it would be significantly faster than the syscalls. + + var err error + var cfInfo, kfInfo os.FileInfo + if cfInfo, err = os.Stat(ctx.certFile); err == nil { + kfInfo, err = os.Stat(ctx.keyFile) + } + + ctx.Lock() + defer ctx.Unlock() + + // Grab the cached certificate, compare the modification times if able. + cert := ctx.cachedCert + if err != nil { + // If stat fails, we likely aren't going to be able to reload, so + // return early. + return cert, err + } else if ctx.cachedCert != nil { + // Only compare the file times if there's actually a cached cert, + // and reload the cert if either the key or the certificate have + // been modified. + doReload = !ctx.certFileInfo.ModTime().Equal(cfInfo.ModTime()) || !ctx.keyFileInfo.ModTime().Equal(kfInfo.ModTime()) + } + + // Attempt to load the updated certificate, if required. + if doReload { + newCert, err := tls.LoadX509KeyPair(ctx.certFile, ctx.keyFile) + if err != nil { + // If the load fails, return the old certificate, so that it can + // be used till the load succeeds. + return cert, err + } + + // If the user regenerates the cert/key between the stat() and + // LoadX509KeyPair calls, this will race, but will self-correct + // after the next reloadCertificate() call because doReload will + // be true. + + ctx.cachedCert = &newCert + ctx.certFileInfo = cfInfo + ctx.keyFileInfo = kfInfo + + cert = ctx.cachedCert + } + return cert, nil +} + +func (ctx *certContext) getCertificate(clientHello *tls.ClientHelloInfo) (*tls.Certificate, error) { + cert, err := ctx.reloadCertificate() + if err != nil { + // Failure to reload the certificate is a non-fatal error as this + // may be a filesystem related race condition. There is nothing + // preventing the next callback from hopefully succeeding, so rate + // limit an error log. + now := time.Now() + if now.After(ctx.lastWarnAt.Add(certLoadErrorRateLimit)) { + ctx.lastWarnAt = now + log.Printf("failed to reload certificate: %v", err) + } + } + + // This should NEVER happen because we will continue to use the old + // certificate on load failure, and we will never be calling the + // listener GetCertificate() callback if the initial load fails. + if cert == nil { + panic("no cached certificate available") + } + + return cert, nil +} diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index ab7730a..eb7adc9 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -264,6 +264,11 @@ func (state *State) ExpireSessions() { } func listenTLS(network string, addr *net.TCPAddr, certFilename, keyFilename string) (net.Listener, error) { + ctx, err := newCertContext(certFilename, keyFilename) + if err != nil { + return nil, err + } + // This is cribbed from the source of net/http.Server.ListenAndServeTLS. // We have to separate the Listen and Serve parts because we need to // report the listening address before entering Serve (which is an @@ -272,12 +277,9 @@ func listenTLS(network string, addr *net.TCPAddr, certFilename, keyFilename stri config := &tls.Config{} config.NextProtos = []string{"http/1.1"} - var err error - config.Certificates = make([]tls.Certificate, 1) - config.Certificates[0], err = tls.LoadX509KeyPair(certFilename, keyFilename) - if err != nil { - return nil, err - } + // Install a GetCertificate callback that ensures that the certificate is + // up to date. + config.GetCertificate = ctx.getCertificate conn, err := net.ListenTCP(network, addr) if err != nil {

1 0

[meek/master] Tests for certContext.
by dcf＠torproject.org 22 Mar '17

22 Mar '17

commit fe142d4ee313772a7713dbe1fc994880d6a1fdf6 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 21 23:48:31 2017 -0700 Tests for certContext. --- meek-server/certificate_test.go | 312 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 312 insertions(+) diff --git a/meek-server/certificate_test.go b/meek-server/certificate_test.go new file mode 100644 index 0000000..94e18f0 --- /dev/null +++ b/meek-server/certificate_test.go @@ -0,0 +1,312 @@ +package main + +import ( + "bytes" + "crypto/rand" + "crypto/tls" + "encoding/hex" + "io/ioutil" + "os" + "path/filepath" + "testing" + "time" +) + +// openssl genpkey -out key1.pem -algorithm EC -pkeyopt ec_paramgen_curve:P-256 -pkeyopt ec_param_enc:named_curve +const key1PEM = `-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgwBuadiHWuhiCwUHK +pvzM0MYVySH8FE5T/76qoDBozzChRANCAAQao88iJDj284z5YsSOwynblbNfhRHL +dhInn3bl8dYUr0s88q7yaOHW0riAYAX8Q/G5zoP/P1MgNPFMYV76eSY4 +-----END PRIVATE KEY-----` + +// openssl req -out cert1.pem -x509 -new -nodes -key key1.pem -days 1 -subj "/CN=meek-server.example.com" +const cert1PEM = `-----BEGIN CERTIFICATE----- +MIIBjjCCATSgAwIBAgIJAKpvM1Hu/AeyMAoGCCqGSM49BAMCMCIxIDAeBgNVBAMM +F21lZWstc2VydmVyLmV4YW1wbGUuY29tMB4XDTE3MDMyMTIyNTM0N1oXDTE3MDMy +MjIyNTM0N1owIjEgMB4GA1UEAwwXbWVlay1zZXJ2ZXIuZXhhbXBsZS5jb20wWTAT +BgcqhkjOPQIBBggqhkjOPQMBBwNCAAQao88iJDj284z5YsSOwynblbNfhRHLdhIn +n3bl8dYUr0s88q7yaOHW0riAYAX8Q/G5zoP/P1MgNPFMYV76eSY4o1MwUTAdBgNV +HQ4EFgQU/FIFX5DX58BFhNBSWV0ulWmS+XIwHwYDVR0jBBgwFoAU/FIFX5DX58BF +hNBSWV0ulWmS+XIwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNIADBFAiEA +mylhVbnAd0KEQoaIEH1whj9oUxlk2kWU5G8daG5uUjMCIBW6fwv0cbYmyzspCMqJ +eib1vgFnhGTI44K05cunpXJ+ +-----END CERTIFICATE-----` + +// openssl genpkey -out key2.pem -algorithm EC -pkeyopt ec_paramgen_curve:P-256 -pkeyopt ec_param_enc:named_curve +const key2PEM = `-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgUbNm7exkEPKMv/DT +B3UMv6XevnD2E99W3Rp8L/a1v12hRANCAATqnza9H9uNa8EvoKm2GOLvw25kR7OA +oVHZiyaXdBeB480FBUtRmWUukLZFxp/QStd4OCwaOwWGtXGlspM2LEum +-----END PRIVATE KEY-----` + +// openssl req -out cert2.pem -x509 -new -nodes -key key2.pem -days 1 -subj "/CN=meek-server.example.com" +const cert2PEM = `-----BEGIN CERTIFICATE----- +MIIBjzCCATSgAwIBAgIJAKvKZ4vqwpySMAoGCCqGSM49BAMCMCIxIDAeBgNVBAMM +F21lZWstc2VydmVyLmV4YW1wbGUuY29tMB4XDTE3MDMyMTIyNTQzN1oXDTE3MDMy +MjIyNTQzN1owIjEgMB4GA1UEAwwXbWVlay1zZXJ2ZXIuZXhhbXBsZS5jb20wWTAT +BgcqhkjOPQIBBggqhkjOPQMBBwNCAATqnza9H9uNa8EvoKm2GOLvw25kR7OAoVHZ +iyaXdBeB480FBUtRmWUukLZFxp/QStd4OCwaOwWGtXGlspM2LEumo1MwUTAdBgNV +HQ4EFgQUdqTMumWa7f965k/SLgWJT0tIlcswHwYDVR0jBBgwFoAUdqTMumWa7f96 +5k/SLgWJT0tIlcswDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNJADBGAiEA +yOhMqBPZLpqnjTGD1OgOc1N1SkS53bdWAazAZgLgwvICIQC7hFOK1j74Frh+1l3h +kLn8Jbjpp6jzNBhQhVHF/nj3CQ== +-----END CERTIFICATE-----` + +const badSyntax = "hello world\n" + +// Backdate file times so any modifications will make them appear different; +// otherwise immediately overwriting the files may happen quickly enough that +// the times don't change. +func backdateFile(filename string) error { + info, err := os.Stat(filename) + if err != nil { + return err + } + timestamp := info.ModTime().Add(-10 * time.Second) + return os.Chtimes(filename, timestamp, timestamp) +} + +func mustBackdateFile(filename string) { + err := backdateFile(filename) + if err != nil { + panic(err) + } +} + +// Return the path to a newly created temporary file with the given contents. +func makeTempFileFromContents(contents []byte) (string, error) { + f, err := ioutil.TempFile("", "meek-server-certificate-test-") + if err != nil { + return "", err + } + defer f.Close() + + _, err = f.Write(contents) + if err != nil { + return f.Name(), err + } + + err = backdateFile(f.Name()) + + return f.Name(), err +} + +func mustMakeTempFileFromContents(contents []byte) string { + f, err := makeTempFileFromContents(contents) + if err != nil { + panic(err) + } + return f +} + +// Return a random filename that is unlikely to exist. +func makeNonexistentFilename() string { + bytes := make([]byte, 8) + _, err := rand.Read(bytes) + if err != nil { + panic(err) + } + return filepath.Join(os.TempDir(), hex.EncodeToString(bytes)) +} + +// Call tls.X509KeyPair and panic if it fails. +func mustLoadCertificate(certPEM, keyPEM []byte) *tls.Certificate { + cert, err := tls.X509KeyPair(certPEM, keyPEM) + if err != nil { + panic(err) + } + return &cert +} + +func mustWriteFile(filename string, data []byte) { + err := ioutil.WriteFile(filename, data, 0600) + if err != nil { + panic(err) + } +} + +// A bunch of temporary certificate filenames and the like. +type testFiles struct { + cert1 *tls.Certificate + cert2 *tls.Certificate + + key1Filename string + key2Filename string + cert1Filename string + cert2Filename string + badSyntaxFilename string + nonexistentFilename string +} + +func loadTestFiles() *testFiles { + var files testFiles + + files.cert1 = mustLoadCertificate([]byte(cert1PEM), []byte(key1PEM)) + files.cert2 = mustLoadCertificate([]byte(cert2PEM), []byte(key2PEM)) + + files.key1Filename = mustMakeTempFileFromContents([]byte(key1PEM)) + files.key2Filename = mustMakeTempFileFromContents([]byte(key2PEM)) + files.cert1Filename = mustMakeTempFileFromContents([]byte(cert1PEM)) + files.cert2Filename = mustMakeTempFileFromContents([]byte(cert2PEM)) + files.badSyntaxFilename = mustMakeTempFileFromContents([]byte(badSyntax)) + files.nonexistentFilename = makeNonexistentFilename() + + return &files +} + +// Delete temporary files created by loadTestFiles (to be called in a defer +// handler). +func (files *testFiles) Cleanup() { + os.Remove(files.key1Filename) + os.Remove(files.key2Filename) + os.Remove(files.cert1Filename) + os.Remove(files.cert2Filename) + os.Remove(files.badSyntaxFilename) +} + +// Check if two certificate chains are equal. +func certificatesEqual(cert1, cert2 *tls.Certificate) bool { + if len(cert1.Certificate) != len(cert2.Certificate) { + return false + } + for i := range cert1.Certificate { + if !bytes.Equal(cert1.Certificate[i], cert2.Certificate[i]) { + return false + } + } + return true +} + +// Call ctx.reloadCertificate and check if the certificate and error status are +// as expected. +func checkCertificate(t *testing.T, ctx *certContext, expectedCert *tls.Certificate, expectedError bool) { + cert, err := ctx.reloadCertificate() + if expectedError && err == nil { + t.Errorf("expected error, got %v\n", err) + } else if !expectedError && err != nil { + t.Errorf("expected no error, got %v\n", err) + } + if !certificatesEqual(cert, expectedCert) { + t.Errorf("certificate was other than expected") + } +} + +func TestNewCertContext(t *testing.T) { + files := loadTestFiles() + defer files.Cleanup() + + var ctx *certContext + var err error + + // Test with one or both files nonexistent. + ctx, err = newCertContext(files.nonexistentFilename, files.nonexistentFilename) + if err == nil { + t.Errorf("did not raise error on nonexistent cert and key") + } + ctx, err = newCertContext(files.cert1Filename, files.nonexistentFilename) + if err == nil { + t.Errorf("did not raise error on nonexistent cert") + } + ctx, err = newCertContext(files.nonexistentFilename, files.key1Filename) + if err == nil { + t.Errorf("did not raise error on nonexistent key") + } + + // Test with bad syntax. + ctx, err = newCertContext(files.badSyntaxFilename, files.badSyntaxFilename) + if err == nil { + t.Errorf("did not raise error on bad-syntax cert and key") + } + ctx, err = newCertContext(files.cert1Filename, files.badSyntaxFilename) + if err == nil { + t.Errorf("did not raise error on bad-syntax cert") + } + ctx, err = newCertContext(files.badSyntaxFilename, files.key1Filename) + if err == nil { + t.Errorf("did not raise error on bad-syntax key") + } + + // Test with certificate and key that don't match. + ctx, err = newCertContext(files.cert1Filename, files.key2Filename) + if err == nil { + t.Errorf("did not raise error on mismatched cert and key") + } + ctx, err = newCertContext(files.cert2Filename, files.key1Filename) + if err == nil { + t.Errorf("did not raise error on mismatched cert and key") + } + + // Test with everything good. + ctx, err = newCertContext(files.cert1Filename, files.key1Filename) + if ctx == nil || err != nil { + t.Fatalf("raised an error: %s", err) + } +} + +// Test that reloadCertificate continues returning the old certificate if files +// are deleted. +func TestDelete(t *testing.T) { + files := loadTestFiles() + defer files.Cleanup() + + var ctx *certContext + var err error + + ctx, err = newCertContext(files.cert1Filename, files.key1Filename) + if ctx == nil || err != nil { + t.Fatalf("raised an error: %s", err) + } + checkCertificate(t, ctx, files.cert1, false) + // Try removing the cert file; cert should be the same but now raise an error. + os.Remove(files.cert1Filename) + checkCertificate(t, ctx, files.cert1, true) + + ctx, err = newCertContext(files.cert2Filename, files.key2Filename) + if ctx == nil || err != nil { + t.Fatalf("raised an error: %s", err) + } + checkCertificate(t, ctx, files.cert2, false) + // Try removing the key file; cert should be the same but now raise an error. + os.Remove(files.key2Filename) + checkCertificate(t, ctx, files.cert2, true) +} + +// Test replacing the contents of cert and key files. +func TestReplace(t *testing.T) { + files := loadTestFiles() + defer files.Cleanup() + + var ctx *certContext + var err error + + ctx, err = newCertContext(files.cert1Filename, files.key1Filename) + if ctx == nil || err != nil { + t.Fatalf("raised an error: %s", err) + } + checkCertificate(t, ctx, files.cert1, false) + + // Replace cert file with junk. + mustWriteFile(files.cert1Filename, []byte(badSyntax)) + checkCertificate(t, ctx, files.cert1, true) + // Put it back to normal. + mustWriteFile(files.cert1Filename, []byte(cert1PEM)) + checkCertificate(t, ctx, files.cert1, false) + + // Replace key file with junk. + mustWriteFile(files.key1Filename, []byte(badSyntax)) + checkCertificate(t, ctx, files.cert1, true) + // Put it back to normal. + mustWriteFile(files.key1Filename, []byte(key1PEM)) + checkCertificate(t, ctx, files.cert1, false) + + mustBackdateFile(files.cert1Filename) + mustBackdateFile(files.key1Filename) + checkCertificate(t, ctx, files.cert1, false) + + // Replace cert1 with cert2 contents; expect to still get cert1, with an error. + mustWriteFile(files.cert1Filename, []byte(cert2PEM)) + checkCertificate(t, ctx, files.cert1, true) + // Replace key1 with key2 contents; now we expect to be using cert2. + mustWriteFile(files.key1Filename, []byte(key2PEM)) + checkCertificate(t, ctx, files.cert2, false) +}

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 22 Mar '17

22 Mar '17

commit 9afb0a81d62b0b77d5879180b4c81032b5405f89 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 22 06:48:25 2017 +0000 Update translations for tor-browser-manual_completed --- zh_CN/zh_CN.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index e7b2e7b..cef7cd5 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -1,12 +1,13 @@ # Translators: # Mingye Wang <arthur200126(a)gmail.com>, 2016 # YF <yfdyh000(a)gmail.com>, 2017 +# Chi-Hsun Tsai <chihsun.tsai(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: YF <yfdyh000(a)gmail.com>, 2017\n" +"Last-Translator: Chi-Hsun Tsai <chihsun.tsai(a)gmail.com>, 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -834,7 +835,7 @@ msgstr "洋葱服务" msgid "" "Onion services (formerly known as “hidden services”) are services (like " "websites) that are only accessible through the Tor network." -msgstr "洋葱服务（旧名为“隐身服务”）是一种只能透过洋葱路由网络访问的网络服务（例如网站）。" +msgstr "洋葱服务 (旧名为“隐身服务”) 是一种只能透过洋葱路由网络访问的网络服务 (例如网站)。" #: onionsites.page:16 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 22 Mar '17

22 Mar '17

commit adbc1ee34406e5bbc951a5215ff8d421962846df Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 22 06:48:20 2017 +0000 Update translations for tor-browser-manual --- zh_CN/zh_CN.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index e7b2e7b..cef7cd5 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -1,12 +1,13 @@ # Translators: # Mingye Wang <arthur200126(a)gmail.com>, 2016 # YF <yfdyh000(a)gmail.com>, 2017 +# Chi-Hsun Tsai <chihsun.tsai(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: YF <yfdyh000(a)gmail.com>, 2017\n" +"Last-Translator: Chi-Hsun Tsai <chihsun.tsai(a)gmail.com>, 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -834,7 +835,7 @@ msgstr "洋葱服务" msgid "" "Onion services (formerly known as “hidden services”) are services (like " "websites) that are only accessible through the Tor network." -msgstr "洋葱服务（旧名为“隐身服务”）是一种只能透过洋葱路由网络访问的网络服务（例如网站）。" +msgstr "洋葱服务 (旧名为“隐身服务”) 是一种只能透过洋葱路由网络访问的网络服务 (例如网站)。" #: onionsites.page:16 msgid ""

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 22 Mar '17

22 Mar '17

commit e203f18ae15a84d54b394b13ed87012a1c80b545 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 22 04:46:36 2017 +0000 Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd index 86c18bf..0977b3d 100644 --- a/zh_CN/torbutton.dtd +++ b/zh_CN/torbutton.dtd @@ -43,7 +43,7 @@ <!ENTITY torbutton.prefs.sec_some_jit_desc "禁用某些 JavaScript 性能优化。"> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、类型推断、ASM.JS。"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT。"> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本可能会暂缓执行。"> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本可能会缓执行。"> <!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。"> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "禁用 MathML。"> <!ENTITY torbutton.prefs.sec_medium "中等">

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 22 Mar '17

22 Mar '17

commit 1668989591d2d32fb85695cba0a63db89b460d79 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 22 00:46:18 2017 +0000 Update translations for tails-misc_completed --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index 43be11a..dd9ac7d 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-06 12:07+0100\n" -"PO-Revision-Date: 2017-03-17 15:59+0000\n" +"PO-Revision-Date: 2017-03-22 00:44+0000\n" "Last-Translator: Chi-Hsun Tsai <chihsun.tsai(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 22 Mar '17

22 Mar '17

commit 9cae17024ecc00b40065f01426ba747ba0dbfdf1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 22 00:46:11 2017 +0000 Update translations for tails-misc --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index 43be11a..dd9ac7d 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-06 12:07+0100\n" -"PO-Revision-Date: 2017-03-17 15:59+0000\n" +"PO-Revision-Date: 2017-03-22 00:44+0000\n" "Last-Translator: Chi-Hsun Tsai <chihsun.tsai(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0