August 2013 - tor-commits - lists.torproject.org

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 01 Aug '13

01 Aug '13

commit e9f4a96385a472fa43b19043177c2d265022a8bc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 1 13:16:34 2013 +0000 Update translations for tails-misc --- zh_CN.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index 87e5425..6f55766 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-07-19 22:21+0200\n" -"PO-Revision-Date: 2013-07-31 11:10+0000\n" +"POT-Creation-Date: 2013-07-30 19:08+0200\n" +"PO-Revision-Date: 2013-08-01 13:10+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -330,14 +330,14 @@ msgstr "警告" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:79 msgid "Do you really want to launch the Unsafe Browser?" -msgstr "是否确定启动不安全的浏览器？" +msgstr "是否确定启动非安全浏览器？" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81 msgid "" "Network activity within the Unsafe Browser is not anonymous. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." -msgstr "不安全浏览器中的网络活动是非匿名的。仅再需要时使用不安全浏览器，例如必须登录或注册以激活互联网连接。" +msgstr "非浏览器中的网络活动是非匿名的。仅再需要时使用不安全浏览器，例如必须登录或注册以激活互联网连接。" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82 msgid "_Launch" @@ -349,7 +349,7 @@ msgstr "退出" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:93 msgid "Starting the Unsafe Browser..." -msgstr "正在启动不安全浏览器..." +msgstr "正在启动非安全浏览器..." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:94 msgid "This may take a while, so please be patient." @@ -362,17 +362,17 @@ msgstr "设置 chroot 失败。" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:181 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" -msgstr "不安全浏览器" +msgstr "非安全浏览器" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:221 msgid "Shutting down the Unsafe Browser..." -msgstr "正在关闭不安全浏览器..." +msgstr "正在关闭非安全浏览器..." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." -msgstr "可能需要一会儿。正常关闭之前无法重启不安全浏览器。" +msgstr "可能需要一会儿。正常关闭之前无法重启非安全浏览器。" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:234 msgid "Failed to restart Tor."

1 0

[tor-launcher/master] Update strings from translations.
by mikeperry＠torproject.org 01 Aug '13

01 Aug '13

commit fb97857c0e06eaa5d69ea4f9f7a75a330dad2331 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Aug 1 14:37:17 2013 +0200 Update strings from translations. --- src/chrome/locale/de/network-settings.dtd | 12 ++--- src/chrome/locale/de/progress.dtd | 6 +-- src/chrome/locale/es/torlauncher.properties | 8 ++-- src/chrome/locale/fa/network-settings.dtd | 4 +- src/chrome/locale/fa/progress.dtd | 4 +- src/chrome/locale/fa/torlauncher.properties | 2 +- src/chrome/locale/fr/network-settings.dtd | 40 ++++++++--------- src/chrome/locale/fr/progress.dtd | 2 +- src/chrome/locale/fr/torlauncher.properties | 16 +++---- src/chrome/locale/nl/network-settings.dtd | 64 +++++++++++++-------------- src/chrome/locale/nl/progress.dtd | 6 +-- src/chrome/locale/nl/torlauncher.properties | 30 ++++++------- 12 files changed, 97 insertions(+), 97 deletions(-) diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index bfaecb6..4cafd51 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -2,13 +2,13 @@  -<!ENTITY torsettings.prompt "Bevor das Tor Browser Bundle versucht eine Verbindung zum Tor-Netzwerk herzustellen, müssen Sie Informationen über ihren Interneanschluss bereitstellen."> +<!ENTITY torsettings.prompt "Bevor das Tor Browser Bundle versucht eine Verbindung zum Tor-Netzwerk herzustellen, müssen Sie Informationen über ihren Internetanschluss bereitstellen."> <!ENTITY torSettings.yes "Ja"> <!ENTITY torSettings.no "Nein"> <!ENTITY torSettings.firstQuestion "Welches der nachfolgenden beschreibt ihre Situation am besten?"> -<!ENTITY torSettings.configurePrompt1 "Die Internetverbindung dieses Computers ist Zensiert, Gefiltert oder benötigt einen Proxy"> +<!ENTITY torSettings.configurePrompt1 "Die Internetverbindung dieses Computers ist zensiert, gefiltert oder benötigt einen Proxy."> <!ENTITY torSettings.configurePrompt2 "Ich muss die Netzwerkeinstellungen konfigurieren."> <!ENTITY torSettings.configure "Konfiguriere"> <!ENTITY torSettings.connectPrompt1 "Die Internetverbindung dieses Computers ist frei von Hindernissen."> @@ -26,7 +26,7 @@  -<!ENTITY torsettings.startingTor "Warte auf Tor start..."> +<!ENTITY torsettings.startingTor "Warte auf den Start von Tor …"> <!ENTITY torsettings.optional "Optional"> @@ -43,12 +43,12 @@ <!ENTITY torsettings.firewall.checkbox "Die Verbindung dieses Computers geht durch eine Firewall, die nur bestimmte Ports zulässt"> <!ENTITY torsettings.firewall.allowedPorts "Erlaubte Ports:"> <!ENTITY torsettings.useBridges.checkbox "Mein Internet Service Provider (ISP) blockiert Verbindungen zum Tor-Netzwerk"> -<!ENTITY torsettings.useBridges.label "Eine oder mehrere Bidges im Format Adresse:Port hinzufügen."> +<!ENTITY torsettings.useBridges.label "Eine oder mehrere Bridges im Format Adresse:Port hinzufügen."> <!ENTITY torsettings.useBridges.placeholder "Adresse:Port"> <!ENTITY torsettings.copyLog "Tor-Log in die Zwischenablage kopieren"> -<!ENTITY torsettings.bridgeHelpTitle "Hilfe zu Bridge-Relais"> +<!ENTITY torsettings.bridgeHelpTitle "Hilfe zu Bridge-Relays"> <!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden können, ist es möglich das ihr ISP oder eine andere Organisation Tor blockiert.&#160; Dieses Problem kann meist mit der benutzung von Bridge-Relais, die versteckt und damit schwerer zu blocken sind, umgangen werden."> -<!ENTITY torsettings.bridgeHelp2 "Um einige Bridge-Relais zu erhalten, besuchen Sie mit dem Browser folgende Seite: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp2 "Um einige Bridge-Relays zu erhalten, besuchen Sie mit dem Browser folgende Seite: https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3 "Eine andere Möglichkeit an Bridge-Relais zu kommen, ist eine Email mit dem inhalt 'get bridges' and bridges(a)torproject.org zu schicken.&#160; Allerdings muss diese Email, um es potentiellen angreifern schwerer zu machen, von einer der folgenden Adressen geschickt werden: gmail.com oder yahoo.com"> <!ENTITY torsettings.bridgeHelp4 "Bridge-Relais können auch mithilfe einer Email an help(a)rt.torproject.org angefordert werden."> diff --git a/src/chrome/locale/de/progress.dtd b/src/chrome/locale/de/progress.dtd index f7166d7..a4aed69 100644 --- a/src/chrome/locale/de/progress.dtd +++ b/src/chrome/locale/de/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Einstellungen Öffnen"> -<!ENTITY torprogress.heading "Verbindung zum Tor-Netzwerk herstellen"> -<!ENTITY torprogress.pleaseWait "Der Tor-Browser wird sich öffnen, sobald eine Verbind zum Tor-Netzwerk hergestellt ist."> +<!ENTITY torprogress.openSettings "Einstellungen öffnen"> +<!ENTITY torprogress.heading "Mit dem Tor-Netzwerk verbinden"> +<!ENTITY torprogress.pleaseWait "Der Tor-Browser wird sich öffnen, sobald eine Verbindung zum Tor-Netzwerk hergestellt ist."> diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index ecccf6f..4b95de7 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -1,21 +1,21 @@ ### Copyright (c) 2013, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Lanzador de Tor +torlauncher.error_title=Arranque de Tor torlauncher.tor_exited=Tor se cerró inesperadamente. -torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor. +torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor torlauncher.tor_failed_to_start=Tor no pudo iniciarse. torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión de red Tor.\n\n%S torlauncher.unable_to_start_tor=No fue posible iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el fichero ejecutable de Tor. -torlauncher.torrc_missing=No se encuentra el fichero de configuración 'torrc'. +torlauncher.torrc_missing=No se encuentra el archivo "torrc" torlauncher.datadir_missing=El directorio de datos de Tor no existe. torlauncher.password_hash_missing=Fallo al obtener la contraseña cifrada. torlauncher.failed_to_get_settings=No se pudo recuperar las preferencias de Tor.\n\n%S -torlauncher.failed_to_save_settings=No se pudo salvar las preferencias de Tor.\n\n%S +torlauncher.failed_to_save_settings=No fue posible guardar los ajustes de Tor.\n\n%S torlauncher.ensure_tor_is_running=Por favor, asegúrese de que Tor se está ejecutando. torlauncher.error_proxy_addr_missing=Debe especificar tanto una dirección IP o nombre de máquina ('hostname') como un número de puerto para configurar Tor para que utilice un 'proxy' para acceder a la Internet. diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 8d526c2..6aed4df 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -31,9 +31,9 @@ <!ENTITY torsettings.optional ""> <!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> +<!ENTITY torsettings.useProxy.type "نوع پراکسی:"> <!ENTITY torsettings.useProxy.address "آدرس:"> -<!ENTITY torsettings.useProxy.address.placeholder ""> +<!ENTITY torsettings.useProxy.address.placeholder "آدرس آی پی یا نام میزبان"> <!ENTITY torsettings.useProxy.port "پورت:"> <!ENTITY torsettings.useProxy.username "نام کاربری:"> <!ENTITY torsettings.useProxy.password "رمز عبور"> diff --git a/src/chrome/locale/fa/progress.dtd b/src/chrome/locale/fa/progress.dtd index 81dfdfe..cd7ca8d 100644 --- a/src/chrome/locale/fa/progress.dtd +++ b/src/chrome/locale/fa/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "وضعیت تور"> -<!ENTITY torprogress.openSettings ""> +<!ENTITY torprogress.openSettings "تنظیمات‌را باز کنید"> <!ENTITY torprogress.heading "درحال اتصال به شبکه تُر"> -<!ENTITY torprogress.pleaseWait ""> +<!ENTITY torprogress.pleaseWait "مرورگر تور باز می‌شود بعد از این که ارتباطی با شبکهٔ تور برقرار شده‌باشد."> diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index e5ef76d..79b1565 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -10,7 +10,7 @@ # torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S # torlauncher.tor_missing=The Tor executable is missing. -# torlauncher.torrc_missing=The torrc file is missing. +torlauncher.torrc_missing=فایل torrc پیدا نشده‌است. # torlauncher.datadir_missing=The Tor data directory does not exist. # torlauncher.password_hash_missing=Failed to get hashed password. diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 634a8e1..37e1339 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -7,22 +7,22 @@ <!ENTITY torSettings.yes "Oui"> <!ENTITY torSettings.no "Non"> -<!ENTITY torSettings.firstQuestion "Laquelle des phrases suivantes décrit le mieux votre situation?"> -<!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée, filtrée ou détournée."> -<!ENTITY torSettings.configurePrompt2 "J'ai besoin de configuré les paramètres réseau. "> +<!ENTITY torSettings.firstQuestion "Laquelle des phrases suivantes décrit le mieux votre situation ?"> +<!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée, filtrée ou nécessite un proxy."> +<!ENTITY torSettings.configurePrompt2 "J'ai besoin de configurer les paramètres réseau. "> <!ENTITY torSettings.configure "Configurer"> -<!ENTITY torSettings.connectPrompt1 "La connexion internet de cet ordinateur est libre de tous obstacles."> -<!ENTITY torSettings.connectPrompt2 "Je voudrai me connecté directement au réseau Tor."> -<!ENTITY torSettings.connect "Connecter"> +<!ENTITY torSettings.connectPrompt1 "Rien n'entrave la connexion Internet de cet ordinateur."> +<!ENTITY torSettings.connectPrompt2 "Je souhaite me connecter directement au réseau Tor."> +<!ENTITY torSettings.connect "Se connecter"> <!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur à besoin d'un proxy pour accéder à internet ?">  -<!ENTITY torSettings.proxyHelp "Si vous n'êtes pas certain de répondre correctement à cette question regardez les paramètres Internet d'un autre navigateur afin de vérifier si vous utilisez un proxy."> +<!ENTITY torSettings.proxyHelp "Si vous ne savez pas comment répondre à cette question, vous pouvez regarder les paramètres de connexion d'un autre navigateur afin de voir s'il est configuré pour utiliser un proxy."> <!ENTITY torSettings.enterProxy "Entrez les paramètres de votre proxy."> -<!ENTITY torSettings.firewallQuestion "Est-ce que votre connexion Internet passe à travers un pare-feu qui ne vous autorise à vous connecter qu'à travers certains ports ?"> -<!ENTITY torSettings.firewallHelp "Si vous n'êtes pas certain de répondre correctement à cette question choisissez Non. Si vous rencontrez des problèmes pour vous connecter au réseau Tor, changez vos paramètres."> -<!ENTITY torSettings.enterFirewall "Entrez la liste de ports, séparés par des virgules, qui sont autorisés par votre pare-feu."> -<!ENTITY torSettings.bridgeQuestion "Si la connexion Internet de cet ordinateur est censurée, vous devrez obtenir et utiliser des pont-relais.&#160; Sinon, cliquez simplement sur Connect."> +<!ENTITY torSettings.firewallQuestion "Est-ce que votre connexion Internet est filtré par un pare-feu qui n'autorise les connexions que vers certains ports ?"> +<!ENTITY torSettings.firewallHelp "Si vous ne savez par comment répondre à cette question, choisissez Non. Vous pourrez changer ce paramètre plus tard en cas de problèmes de connexion au réseau Tor."> +<!ENTITY torSettings.enterFirewall "Entrez la liste de ports, séparés par des virgules, qui sont autorisés par le pare-feu."> +<!ENTITY torSettings.bridgeQuestion "Si la connexion Internet de cet ordinateur est censurée, il est nécessaire d'obtenir des adresses de bridges. Si ce n'est pas le cas, cliquez simplement sur « Se connecter ».">  @@ -31,7 +31,7 @@ <!ENTITY torsettings.optional "Optionnel"> <!ENTITY torsettings.useProxy.checkbox "Cet ordinateur a besoin d'utiliser un proxy pour accéder à Internet"> -<!ENTITY torsettings.useProxy.type "Type de proxy"> +<!ENTITY torsettings.useProxy.type "Type de proxy :"> <!ENTITY torsettings.useProxy.address "Adresse :"> <!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d'hôte"> <!ENTITY torsettings.useProxy.port "Port :"> @@ -42,13 +42,13 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui autorise uniquement les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> -<!ENTITY torsettings.useBridges.checkbox "Mon Fournisseur d'Accès Internet (FAI) bloque les connexions au réseau Tor"> -<!ENTITY torsettings.useBridges.label "Entrez une ou plusieurs passerelles relais sous la forme adresse:port"> +<!ENTITY torsettings.useBridges.checkbox "Mon Fournisseur d'Accès à Internet (FAI) bloque les connexions au réseau Tor"> +<!ENTITY torsettings.useBridges.label "Entrez un ou plusieurs bridges sous la forme « adresse:port »"> <!ENTITY torsettings.useBridges.placeholder "adresse:port"> -<!ENTITY torsettings.copyLog "Copier les logs de Tor dans le Press-papier"> -<!ENTITY torsettings.bridgeHelpTitle "Aide pour les passerelles relais"> -<!ENTITY torsettings.bridgeHelp1 "Si vous êtes dans l'incapacité de vous connecter au réseau Tor cela peut venir du fait que votre Fournisseur d'Accès Internet (FAI) bloque Tor. La plupart du temps vous pouvez contourner ce problème en utilisant les passerelles Tor qui sont des relais cachés, plus difficiles à bloquer."> -<!ENTITY torsettings.bridgeHelp2 "Pour obtenir quelques passerelles relais utilisez un navigateur web pour aller sur la page suivante : https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3 "Une autre façon de trouver les adresses publiques de ponts est d'envoyer un mail à bridges(a)torproject.org avec la ligne "get bridges" dans le corps de l'e-mail. Toutefois, afin que nous puissions rendre plus difficile pour un attaquant d'apprendre beaucoup d'adresses de ponts, vous devez adresser cette demande à partir d'une adresse e-mail appartenant à l'un des domaines suivants: gmail.com ou yahoo.com"> -<!ENTITY torsettings.bridgeHelp4 "Vous pouvez également demander un pont-relais en envoyant un e-mail à help(a)rt.torproject.org."> +<!ENTITY torsettings.copyLog "Copier le journal des messages de Tor dans le presse-papier"> +<!ENTITY torsettings.bridgeHelpTitle "Aide pour les bridges"> +<!ENTITY torsettings.bridgeHelp1 "S'il est impossible de se connecter au réseau Tor, cela peut être le signe que votre Fournisseur d'Accès à Internet (FAI) ou une autre entité bloque Tor. La plupart du temps, vous pouvez contourner ce problème en utilisant les « bridges » Tor. Ce sont des relais cachés qui sont plus difficiles à bloquer."> +<!ENTITY torsettings.bridgeHelp2 "Pour obtenir des adresses de bridges, utilisez un navigateur web pour aller sur la page : https://bridges.torproject.org/"> +<!ENTITY torsettings.bridgeHelp3 "Une autre manière de trouver des adresses de bridges publics est d'envoyer un mail à bridges(a)torproject.org avec la ligne "get bridges" dans le corps de l'email. Toutefois, pour que cela soit plus difficile pour un attaquant de découvrir beaucoup d'adresses, les demandes doivent provenir d'une adresse email appartenant à l'un des domaines suivants : gmail.com ou yahoo.com."> +<!ENTITY torsettings.bridgeHelp4 "Vous pouvez également demander des adresses de bridges en écrivant à help-fr(a)rt.torproject.org."> diff --git a/src/chrome/locale/fr/progress.dtd b/src/chrome/locale/fr/progress.dtd index 3686a23..1c59e1e 100644 --- a/src/chrome/locale/fr/progress.dtd +++ b/src/chrome/locale/fr/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Status de Tor"> +<!ENTITY torprogress.dialog.title "État de Tor"> <!ENTITY torprogress.openSettings "Ouvrir les paramètres"> <!ENTITY torprogress.heading "Connexion au réseau Tor"> <!ENTITY torprogress.pleaseWait "Le Navigateur Tor s'ouvrira après que la connexion au réseau Tor soit établie."> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 9a47316..e77215d 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -3,28 +3,28 @@ torlauncher.error_title=Lanceur Tor -torlauncher.tor_exited=Tor s'est fermé de manière innatendue. +torlauncher.tor_exited=Le programme Tor s'est terminé de manière inatendue. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. torlauncher.tor_bootstrap_failed=Tor n'a pas réussi à établir une connexion au réseau Tor.\n\n%S -torlauncher.unable_to_start_tor=Impossible de démarrer Tor. +torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S torlauncher.tor_missing=L'exécutable Tor est introuvable. torlauncher.torrc_missing=Le fichier torrc est manquant. -torlauncher.datadir_missing=Le répertoire de données Tor n'existe pas. +torlauncher.datadir_missing=Le répertoire de données de Tor n'existe pas. torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe chiffré. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S torlauncher.failed_to_save_settings=Impossible de sauvegarder les paramètres de Tor.\n\n%S torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor est lancé. -torlauncher.error_proxy_addr_missing=Vous devez spécifier une adresse IP ou un nom d'hôte et un numéro de port, pour configurer Tor afin qu'il utilise un proxy pour accéder à l'Internet. +torlauncher.error_proxy_addr_missing=Pour configurer Tor afin qu'il utilise un proxy, vous devez spécifier une adresse IP ou un nom d'hôte ainsi qu'un numéro de port. torlauncher.error_proxy_type_missing=Vous devez sélectionner un type de proxy. -torlauncher.error_bridges_missing=Vous devez spécifier une ou plusieurs passerelles. +torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs bridges. -torlauncher.connect=Connecter +torlauncher.connect=Se connecter torlauncher.quit=Quitter torlauncher.quit_win=Sortir -torlauncher.done=Terminer +torlauncher.done=Terminé -torlauncher.forAssistance=Pour obtenir de l'aide contactez %S +torlauncher.forAssistance=Pour obtenir de l'aide, contactez %S diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index 0821f05..267a311 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -1,54 +1,54 @@ -<!ENTITY torsettings.dialog.title ""> +<!ENTITY torsettings.dialog.title "Tor Netwerk Instellingen">  -<!ENTITY torsettings.prompt ""> +<!ENTITY torsettings.prompt "Vooraleer het Tor Browser Pakket probeert om een verbinding met het Tor netwerk te maken, moet je informatie over de internetverbinding van deze computer opgeven."> <!ENTITY torSettings.yes "Ja"> <!ENTITY torSettings.no "Nee"> -<!ENTITY torSettings.firstQuestion ""> -<!ENTITY torSettings.configurePrompt1 ""> -<!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt1 ""> -<!ENTITY torSettings.connectPrompt2 ""> -<!ENTITY torSettings.connect ""> +<!ENTITY torSettings.firstQuestion "Welke van de volgende beschrijft het best jouw situatie?"> +<!ENTITY torSettings.configurePrompt1 "De internetverbinding van deze computer wordt gecensureerd, gefilterd of geproxyed."> +<!ENTITY torSettings.configurePrompt2 "Ik moet netwerkinstellingen configureren."> +<!ENTITY torSettings.configure "Configureer"> +<!ENTITY torSettings.connectPrompt1 "De internetverbinding van deze computer is vrij van obstakels."> +<!ENTITY torSettings.connectPrompt2 "Ik zou graag rechtstreeks met het Tor netwerk verbinden."> +<!ENTITY torSettings.connect "Verbind"> -<!ENTITY torSettings.proxyQuestion ""> +<!ENTITY torSettings.proxyQuestion "Heeft deze computer een proxy nodig om met het internet te verbinden?">  -<!ENTITY torSettings.proxyHelp ""> -<!ENTITY torSettings.enterProxy ""> -<!ENTITY torSettings.firewallQuestion ""> -<!ENTITY torSettings.firewallHelp ""> -<!ENTITY torSettings.enterFirewall ""> -<!ENTITY torSettings.bridgeQuestion ""> +<!ENTITY torSettings.proxyHelp "Als je niet zeker bent over het antwoord op deze vraag, bekijk dan de verbindingsinstellingen van een andere browser om te zien of die is ingesteld om gebruik te maken van een proxy."> +<!ENTITY torSettings.enterProxy "Voer de proxy-instellingen in."> +<!ENTITY torSettings.firewallQuestion "Loopt de internetverbinding van deze computer door een firewall die enkel toegang tot bepaalde poorten toestaat?"> +<!ENTITY torSettings.firewallHelp "Als je niet zeker bent hoe je deze vraag moet beantwoorden, kies dan Nee. Als je op problemen botst tijdens het verbinden met het Tor netwerk, verander dan deze instelling."> +<!ENTITY torSettings.enterFirewall "Voer de poorten in die toegestaan zijn door de firewall, gescheiden door komma's."> +<!ENTITY torSettings.bridgeQuestion "Als de internetverbinding van deze computer gecensureerd wordt, zal je bridge relays &#160; moeten verkrijgen en gebruiken. Als dit niet het geval is, klik op Verbind.">  -<!ENTITY torsettings.startingTor ""> +<!ENTITY torsettings.startingTor "Aan het wachten tot Tor gestart is..."> -<!ENTITY torsettings.optional ""> +<!ENTITY torsettings.optional "Optioneel"> -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> +<!ENTITY torsettings.useProxy.checkbox "Deze computer moet een proxy gebruiken om het internet te raadplegen."> +<!ENTITY torsettings.useProxy.type "Proxy Type:"> <!ENTITY torsettings.useProxy.address "Adres:"> -<!ENTITY torsettings.useProxy.address.placeholder ""> +<!ENTITY torsettings.useProxy.address.placeholder "IP adres of hostnaam"> <!ENTITY torsettings.useProxy.port "Poort:"> <!ENTITY torsettings.useProxy.username "Gebruikersnaam:"> <!ENTITY torsettings.useProxy.password "Wachtwoord:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox ""> +<!ENTITY torsettings.firewall.checkbox "Deze computer gebruikt een firewall die enkel verbindingen tot bepaalde poorten toestaat."> <!ENTITY torsettings.firewall.allowedPorts "Toegestane poorten:"> -<!ENTITY torsettings.useBridges.checkbox ""> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> - -<!ENTITY torsettings.copyLog ""> -<!ENTITY torsettings.bridgeHelpTitle ""> -<!ENTITY torsettings.bridgeHelp1 ""> -<!ENTITY torsettings.bridgeHelp2 ""> -<!ENTITY torsettings.bridgeHelp3 ""> -<!ENTITY torsettings.bridgeHelp4 ""> +<!ENTITY torsettings.useBridges.checkbox "Mijn Internet Service Provider (ISP) blokkeert verbindingen naar het Tor netwerk"> +<!ENTITY torsettings.useBridges.label "Voer één of meerdere bridge relays in volgens het formaat adres:poort."> +<!ENTITY torsettings.useBridges.placeholder "adres:poort"> + +<!ENTITY torsettings.copyLog "Kopieer Tor log naar het klembord"> +<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Hulp"> +<!ENTITY torsettings.bridgeHelp1 "Als je niet kan verbinden met het Tor netwerk, dan is het mogelijk dat je Internet Service Provider (ISP) of en ander agentschap Tor &#160; blokkeert. Vaak kan je dit probleem omzeilen door gebruik te maken van Tor Bridges. Dit zijn verborgen relays die moeilijker te blokkeren zijn."> +<!ENTITY torsettings.bridgeHelp2 "Om enkele bridge relays te verkrijgen gebruik je een web browser om de volgende pagina te bezoeken: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3 "Een andere manier om openbare bridge addressen te verkrijgen is door e-mail te sturen naar bridges(a)torproject.org met de woorden 'get bridges' als losstaande tekst in het berichtgedeelte van de e-mail. &#160; Echter: om het moelijker te maken voor een aanvaller om veel bridge adressen te verkrijgen, moet je deze e-mail versturen vanaf een e-mailadres uit één van de volgende domeinen: gmail.com of yahoo.com."> +<!ENTITY torsettings.bridgeHelp4 "Je kan ook bridge relays opvragen door een e-mail te sturen naar help(a)rt.torproject.org."> diff --git a/src/chrome/locale/nl/progress.dtd b/src/chrome/locale/nl/progress.dtd index b993b12..c46a5f2 100644 --- a/src/chrome/locale/nl/progress.dtd +++ b/src/chrome/locale/nl/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor status"> -<!ENTITY torprogress.openSettings ""> -<!ENTITY torprogress.heading "Verbinden met het Tor-netwerk"> -<!ENTITY torprogress.pleaseWait ""> +<!ENTITY torprogress.openSettings "Open Instellingen"> +<!ENTITY torprogress.heading "Bezig met verbinden met het Tor-netwerk"> +<!ENTITY torprogress.pleaseWait "De Tor Browser zal geopend worden zodra een verbinding met het Tor-netwerk gemaakt is."> diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 6cd1f95..2624048 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -1,30 +1,30 @@ ### Copyright (c) 2013, The Tor Project, Inc. ### See LICENSE for licensing information. -# torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor Starter -# torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -# torlauncher.tor_failed_to_start=Tor failed to start. -# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S +torlauncher.tor_exited=Tor is onverwacht afgesloten. +torlauncher.tor_controlconn_failed=Kon niet verbinden met een Tor controlepoort. +torlauncher.tor_failed_to_start=Tor kon niet starten. +torlauncher.tor_bootstrap_failed=Tor slaagde er niet in een verbinding met het Tor netwerk te maken.\n\n%S -# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -# torlauncher.tor_missing=The Tor executable is missing. -# torlauncher.torrc_missing=The torrc file is missing. -# torlauncher.datadir_missing=The Tor data directory does not exist. -# torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.unable_to_start_tor=Kon Tor niet starten.\n\n%S +torlauncher.tor_missing=Het Tor uitvoerbare bestand ontbreekt. +torlauncher.torrc_missing=Het torrc bestand ontbreekt. +torlauncher.datadir_missing=De Tor data map bestaat niet. +torlauncher.password_hash_missing=Ophalen van een gehashed wachtwoord is mislukt. -# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -# torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=Kon Tor instellingen niet ophalen.\n\n%S +torlauncher.failed_to_save_settings=Kon Tor instellingen niet opslaan.\n\n%S +torlauncher.ensure_tor_is_running=Controleer dat Tor actief is alstublieft. torlauncher.error_proxy_addr_missing=Je moet zowel een IP-adres of hostnaam en een poortnummer invoeren om Tor te configureren om een proxy te gebruiken om toegang te krijgen tot het internet. torlauncher.error_proxy_type_missing=Je moet het proxy-type kiezen. torlauncher.error_bridges_missing=Je moet één of meerdere bridges opgeven. -# torlauncher.connect=Connect +torlauncher.connect=Verbind torlauncher.quit=Stop torlauncher.quit_win=Sluit af torlauncher.done=OK -# torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Voor hulp, contacteer %S

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 01 Aug '13

01 Aug '13

commit 9e0b99d73e8e225191cf0c356576032e7dada3cc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 1 10:46:34 2013 +0000 Update translations for tails-misc --- ru.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ru.po b/ru.po index 18e94d0..582acbb 100644 --- a/ru.po +++ b/ru.po @@ -4,13 +4,14 @@ # # Translators: # varnav, 2013 +# Арефьев Денис <jujjer(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-07-19 22:21+0200\n" -"PO-Revision-Date: 2013-07-26 12:00+0000\n" -"Last-Translator: varnav\n" +"POT-Creation-Date: 2013-07-30 19:08+0200\n" +"PO-Revision-Date: 2013-08-01 10:40+0000\n" +"Last-Translator: Арефьев Денис <jujjer(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +39,7 @@ msgstr "<h1>Помогите нам исправить эту ошибку!</h1> #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" -msgstr "" +msgstr "OpenPGP апплет шифрования" #: config/chroot_local-includes/usr/local/bin/gpgApplet:139 msgid "Exit" @@ -50,7 +51,7 @@ msgstr "О.." #: config/chroot_local-includes/usr/local/bin/gpgApplet:192 msgid "Encrypt Clipboard with _Passphrase" -msgstr "" +msgstr "Шифрование буфера обмена с _Passphrase" #: config/chroot_local-includes/usr/local/bin/gpgApplet:195 msgid "Sign/Encrypt Clipboard with Public _Keys" @@ -62,7 +63,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:204 msgid "_Manage Keys" -msgstr "" +msgstr "_Manage Keys" #: config/chroot_local-includes/usr/local/bin/gpgApplet:244 msgid "The clipboard does not contain valid input data."

1 0

[flashproxy/master] Use M2Crypto connect in place of Python ssl.wrap_socket.
by dcf＠torproject.org 01 Aug '13

01 Aug '13

commit 454b735af24797ef639affd69c933d1d28717764 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 11 14:33:52 2013 -0700 Use M2Crypto connect in place of Python ssl.wrap_socket. ssl.wrap_socket doesn't provide enough access to the certificate chain; you can do getpeercert but you can't get at intermediate certificates. I tried to copy the important OpenSSL calls from newPySSLObject in http://svn.python.org/projects/python/trunk/Modules/_ssl.c, which is what gets called indirectly when you do ssl.wrap_socket. --- facilitator/facilitator-email-poller | 37 +++++++++++++++++++++++++++------ flashproxy-reg-appspot | 38 ++++++++++++++++++++++++++++------ flashproxy-reg-email | 19 +++++++++++------ 3 files changed, 76 insertions(+), 18 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 2b03799..a2b5cd6 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -19,7 +19,7 @@ import time import fac from hashlib import sha1 -from M2Crypto import X509 +from M2Crypto import SSL, X509 DEFAULT_IMAP_HOST = "imap.gmail.com" DEFAULT_IMAP_PORT = 993 @@ -83,15 +83,41 @@ class options(object): imaplib_debug = False use_certificate_pin = True +# Like socket.create_connection in that it tries resolving different address +# families, but doesn't connect the socket. +def create_socket(address, timeout = None, source_address = None): + host, port = address + addrs = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM) + if not addrs: + raise error("getaddrinfo returns an empty list") + err = None + for addr in addrs: + try: + s = socket.socket(addr[0], addr[1], addr[2]) + if timeout is not None and type(timeout) == float: + s.settimeout(timeout) + if source_address is not None: + s.bind(source_address) + return s + except Exception, e: + err = e + raise err + class IMAP4_SSL_REQUIRED(imaplib.IMAP4_SSL): """A subclass of of IMAP4_SSL that uses ssl_version=ssl.PROTOCOL_TLSv1 and cert_reqs=ssl.CERT_REQUIRED.""" def open(self, host = "", port = imaplib.IMAP4_SSL_PORT): + ctx = SSL.Context("tlsv1") + ctx.set_verify(SSL.verify_peer, 2) + ret = ctx.load_verify_locations(self.certfile) + assert ret == 1 + self.host = host self.port = port - self.sock = socket.create_connection((host, port)) - self.sslobj = ssl.wrap_socket(self.sock, ssl_version=ssl.PROTOCOL_TLSv1, - cert_reqs=ssl.CERT_REQUIRED, ca_certs=self.certfile) + self.sock = create_socket((self.host, self.port)) + + self.sslobj = SSL.Connection(ctx, self.sock) + self.sslobj.connect((self.host, self.port)) self.file = self.sslobj.makefile('rb') def usage(f = sys.stdout): @@ -337,8 +363,7 @@ def imap_login(): ca_certs_file.close() # Check that the public key is what we expect. - cert_der = imap.ssl().getpeercert(binary_form=True) - cert = X509.load_cert_string(cert_der, format=X509.FORMAT_DER) + cert = imap.ssl().get_peer_cert() pubkey_der = cert.get_pubkey().as_der() pubkey_digest = sha1(pubkey_der).digest() diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index 16d0e7f..fc960e9 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -16,9 +16,10 @@ import urllib2 from hashlib import sha1 try: - from M2Crypto import X509 + from M2Crypto import SSL, X509 except ImportError: # Defer the error reporting so that --help works even without M2Crypto. + SSL = None X509 = None DEFAULT_REMOTE_ADDRESS = None @@ -187,29 +188,54 @@ def generate_url(addr): raise ValueError("%s exited with status %d" % (FLASHPROXY_REG_URL, p.returncode)) return stdout.strip() +# Like socket.create_connection in that it tries resolving different address +# families, but doesn't connect the socket. +def create_socket(address, timeout = None, source_address = None): + host, port = address + addrs = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM) + if not addrs: + raise error("getaddrinfo returns an empty list") + err = None + for addr in addrs: + try: + s = socket.socket(addr[0], addr[1], addr[2]) + if timeout is not None and type(timeout) == float: + s.settimeout(timeout) + if source_address is not None: + s.bind(source_address) + return s + except Exception, e: + err = e + raise err + # Certificate validation and pinning for urllib2. Inspired by # http://web.archive.org/web/20110125104752/http://www.muchtooscrawled.com/20…. class PinHTTPSConnection(httplib.HTTPSConnection): def connect(self): - sock = socket.create_connection((self.host, self.port), self.timeout, self.source_address) + sock = create_socket((self.host, self.port), self.timeout, self.source_address) if self._tunnel_host: self.sock = sock self._tunnel() + ctx = SSL.Context("tlsv1") + ctx.set_verify(SSL.verify_peer, 2) + ca_certs_fd, ca_certs_path = tempfile.mkstemp(prefix="flashproxy-reg-appspot-", dir=get_state_dir(), suffix=".crt") try: os.write(ca_certs_fd, CA_CERTS) os.close(ca_certs_fd) - self.sock = ssl.wrap_socket(sock, ssl_version=ssl.PROTOCOL_TLSv1, - cert_reqs=ssl.CERT_REQUIRED, ca_certs=ca_certs_path) + ret = ctx.load_verify_locations(ca_certs_path) + assert ret == 1 finally: os.unlink(ca_certs_path) + self.sock = SSL.Connection(ctx, sock) + self.sock.connect((self.host, self.port)) + # Check that the public key is what we expect. - cert_der = self.sock.getpeercert(binary_form=True) - cert = X509.load_cert_string(cert_der, format=X509.FORMAT_DER) + cert = self.sock.get_peer_cert() pubkey_der = cert.get_pubkey().as_der() pubkey_digest = sha1(pubkey_der).digest() diff --git a/flashproxy-reg-email b/flashproxy-reg-email index 2d3cba9..a3c27ad 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -13,7 +13,7 @@ import tempfile from hashlib import sha1 try: - from M2Crypto import BIO, RSA, X509 + from M2Crypto import BIO, RSA, SSL, X509 except ImportError: # Defer the error reporting so that --help works even without M2Crypto. X509 = None @@ -257,6 +257,9 @@ if options.debug: smtp.set_debuglevel(1) try: + ctx = SSL.Context("tlsv1") + ctx.set_verify(SSL.verify_peer, 2) + ca_certs_fd, ca_certs_path = tempfile.mkstemp(prefix="flashproxy-reg-email-", dir=get_state_dir(), suffix=".crt") try: @@ -270,15 +273,19 @@ try: code, msg = smtp.docmd("STARTTLS") if code != 220: raise ValueError("Got code %d after STARTTLS" % code) - smtp.sock = ssl.wrap_socket(smtp.sock, ssl_version=ssl.PROTOCOL_TLSv1, - cert_reqs=ssl.CERT_REQUIRED, ca_certs=ca_certs_path) - smtp.file = smtp.sock.makefile() + ret = ctx.load_verify_locations(ca_certs_path) + assert ret == 1 finally: os.unlink(ca_certs_path) + smtp.sock = SSL.Connection(ctx, smtp.sock) + smtp.sock.setup_ssl() + smtp.sock.set_connect_state() + smtp.sock.connect_ssl() + smtp.file = smtp.sock.makefile() + # Check that the public key is what we expect. - cert_der = smtp.sock.getpeercert(binary_form=True) - cert = X509.load_cert_string(cert_der, format=X509.FORMAT_DER) + cert = smtp.sock.get_peer_cert() pubkey_der = cert.get_pubkey().as_der() pubkey_digest = sha1(pubkey_der).digest()

1 0

[flashproxy/master] ChangeLog for intermediate certificate pins.
by dcf＠torproject.org 01 Aug '13

01 Aug '13

commit 4fee3689d7d838c271744b1fff7a49792cbcc01d Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 31 20:12:13 2013 -0700 ChangeLog for intermediate certificate pins. --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 37c8b01..19c1bd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,12 @@ don't log IP addresses by default. Patch by Arlo Breault. Fixes bug 9185. + o Certificate pins now match against the public keys of intermediate + certificates, not only those of leaves. This will help with + flashproxy-reg-appspot, whose leaf key was often changing. It also + allows us to copy pin digests directly from the Chromium source + code. Patch by David Fifield. Fixed bug 9167. + Changes in version 1.1 o Programs that use certificate pins now take a --disable-pin option that causes pins to be ignored.

1 0

[flashproxy/master] Check every certificate's public key, not only the leaf's.
by dcf＠torproject.org 01 Aug '13

01 Aug '13

commit e234f31d8c1017672a2000925a0e8ff4f32feda8 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 11 15:26:51 2013 -0700 Check every certificate's public key, not only the leaf's. I put the Chromium kSPKIHash_Google1024 as the only allowed key, as that's the one I see right now. --- facilitator/facilitator-email-poller | 29 +++++++++++++++++------------ flashproxy-reg-appspot | 32 +++++++++++++++++--------------- flashproxy-reg-email | 24 +++++++++++++++++------- 3 files changed, 51 insertions(+), 34 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index a2b5cd6..8b9f10a 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -64,9 +64,11 @@ A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y # SHA-1 digest of expected public keys. Any of these is valid. See # http://www.imperialviolet.org/2011/05/04/pinning.html for the reason behind # hashing the public key, not the entire certificate. -PUBKEY_SHA1 = tuple(x.decode("hex") for x in ( - "63c445c009328b663cdff9cb68f6c523ac7b6c2b", -)) +PUBKEY_SHA1 = ( + # https://src.chromium.org/viewvc/chrome/trunk/src/net/http/transport_securit… + # kSPKIHash_Google1024 + "\x40\xc5\x40\x1d\x6f\x8c\xba\xf0\x8b\x00\xed\xef\xb1\xee\x87\xd0\x05\xb3\xb9\xcd", +) LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" @@ -362,15 +364,18 @@ def imap_login(): finally: ca_certs_file.close() - # Check that the public key is what we expect. - cert = imap.ssl().get_peer_cert() - pubkey_der = cert.get_pubkey().as_der() - pubkey_digest = sha1(pubkey_der).digest() - - if options.use_certificate_pin and pubkey_digest not in PUBKEY_SHA1: - expected = "(" + ", ".join(x.encode("hex") for x in PUBKEY_SHA1) + ")" - raise ValueError("Public key does not match pin: got %s but expected any of %s" % - (pubkey_digest.encode("hex"), expected)) + if options.use_certificate_pin: + found = [] + for cert in imap.ssl().get_peer_cert_chain(): + pubkey_der = cert.get_pubkey().as_der() + pubkey_digest = sha1(pubkey_der).digest() + if pubkey_digest in PUBKEY_SHA1: + break + found.append(pubkey_digest) + else: + found = "(" + ", ".join(x.encode("hex") for x in found) + ")" + expected = "(" + ", ".join(x.encode("hex") for x in PUBKEY_SHA1) + ")" + raise ValueError("Public key does not match pin: got %s but expected any of %s" % (found, expected)) log(u"logging in as %s" % options.email_addr) imap.login(options.email_addr, email_password) diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index fc960e9..2ca3467 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -63,12 +63,11 @@ A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y # SHA-1 digest of expected public keys. Any of these is valid. See # http://www.imperialviolet.org/2011/05/04/pinning.html for the reason behind # hashing the public key, not the entire certificate. -PUBKEY_SHA1 = tuple(x.decode("hex") for x in ( - "c70ccd442ff4528c603aefef85206fd693990e09", - "1697e17a8a3317f031721b7b6293cd50643bbbd3", - "291e750bafedac444486327e50f26f64d840991a", - "1e3f66cfa0eb03136297fdb238ad6619c30ff375", -)) +PUBKEY_SHA1 = ( + # https://src.chromium.org/viewvc/chrome/trunk/src/net/http/transport_securit… + # kSPKIHash_Google1024 + "\x40\xc5\x40\x1d\x6f\x8c\xba\xf0\x8b\x00\xed\xef\xb1\xee\x87\xd0\x05\xb3\xb9\xcd", +) class options(object): address_family = socket.AF_UNSPEC @@ -234,15 +233,18 @@ class PinHTTPSConnection(httplib.HTTPSConnection): self.sock = SSL.Connection(ctx, sock) self.sock.connect((self.host, self.port)) - # Check that the public key is what we expect. - cert = self.sock.get_peer_cert() - pubkey_der = cert.get_pubkey().as_der() - pubkey_digest = sha1(pubkey_der).digest() - - if options.use_certificate_pin and pubkey_digest not in PUBKEY_SHA1: - expected = "(" + ", ".join(x.encode("hex") for x in PUBKEY_SHA1) + ")" - raise ValueError("Public key does not match pin: got %s but expected any of %s" % - (pubkey_digest.encode("hex"), expected)) + if options.use_certificate_pin: + found = [] + for cert in self.sock.get_peer_cert_chain(): + pubkey_der = cert.get_pubkey().as_der() + pubkey_digest = sha1(pubkey_der).digest() + if pubkey_digest in PUBKEY_SHA1: + break + found.append(pubkey_digest) + else: + found = "(" + ", ".join(x.encode("hex") for x in found) + ")" + expected = "(" + ", ".join(x.encode("hex") for x in PUBKEY_SHA1) + ")" + raise ValueError("Public key does not match pin: got %s but expected any of %s" % (found, expected)) class PinHTTPSHandler(urllib2.HTTPSHandler): def https_open(self, req): diff --git a/flashproxy-reg-email b/flashproxy-reg-email index a3c27ad..6d3f092 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -60,9 +60,11 @@ A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y # SHA-1 digest of expected public keys. Any of these is valid. See # http://www.imperialviolet.org/2011/05/04/pinning.html for the reason behind # hashing the public key, not the entire certificate. -PUBKEY_SHA1 = tuple(x.decode("hex") for x in ( - "69ba4a72fc198b2203ecdf0c75493e4d5300dac9", -)) +PUBKEY_SHA1 = ( + # https://src.chromium.org/viewvc/chrome/trunk/src/net/http/transport_securit… + # kSPKIHash_Google1024 + "\x40\xc5\x40\x1d\x6f\x8c\xba\xf0\x8b\x00\xed\xef\xb1\xee\x87\xd0\x05\xb3\xb9\xcd", +) # Registrations are encrypted with this public key before being emailed. Only # the facilitator operators should have the corresponding private key. Given a @@ -284,10 +286,18 @@ try: smtp.sock.connect_ssl() smtp.file = smtp.sock.makefile() - # Check that the public key is what we expect. - cert = smtp.sock.get_peer_cert() - pubkey_der = cert.get_pubkey().as_der() - pubkey_digest = sha1(pubkey_der).digest() + if options.use_certificate_pin: + found = [] + for cert in smtp.sock.get_peer_cert_chain(): + pubkey_der = cert.get_pubkey().as_der() + pubkey_digest = sha1(pubkey_der).digest() + if pubkey_digest in PUBKEY_SHA1: + break + found.append(pubkey_digest) + else: + found = "(" + ", ".join(x.encode("hex") for x in found) + ")" + expected = "(" + ", ".join(x.encode("hex") for x in PUBKEY_SHA1) + ")" + raise ValueError("Public key does not match pin: got %s but expected any of %s" % (found, expected)) if options.use_certificate_pin and pubkey_digest not in PUBKEY_SHA1: expected = "(" + ", ".join(x.encode("hex") for x in PUBKEY_SHA1) + ")"

1 0

[tor/master] Merge remote-tracking branch 'arma/bug9354' into maint-0.2.4
by nickm＠torproject.org 01 Aug '13

01 Aug '13

commit 0a0f93d277046a524740ad110060abf8ed137b8f Merge: 5a5147d ff6bb13 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 31 21:48:48 2013 -0400 Merge remote-tracking branch 'arma/bug9354' into maint-0.2.4 changes/bug9354 | 5 +++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 2 +- src/or/entrynodes.c | 17 +++++++++++++---- src/or/or.h | 3 ++- 5 files changed, 25 insertions(+), 8 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 01 Aug '13

01 Aug '13

commit 83a859e24ced67663ea46f3bd05d53b29f6797c0 Merge: 5405688 0a0f93d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 31 21:49:30 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9354 | 5 +++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 2 +- src/or/entrynodes.c | 17 +++++++++++++---- src/or/or.h | 3 ++- 5 files changed, 25 insertions(+), 8 deletions(-)

1 0

[tor/master] NumDirectoryGuards now tracks NumEntryGuards by default
by nickm＠torproject.org 01 Aug '13

01 Aug '13

commit ff6bb13c02b3bb217ac8d48d5a20953f1b188d46 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jul 30 12:05:39 2013 -0400 NumDirectoryGuards now tracks NumEntryGuards by default Now a user who changes only NumEntryGuards will get the behavior she expects. Fixes bug 9354; bugfix on 0.2.4.8-alpha. --- changes/bug9354 | 5 +++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 2 +- src/or/entrynodes.c | 17 +++++++++++++---- src/or/or.h | 3 ++- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/changes/bug9354 b/changes/bug9354 new file mode 100644 index 0000000..68fc81a --- /dev/null +++ b/changes/bug9354 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Make the default behavior of NumDirectoryGuards be to track + NumEntryGuards. Now a user who changes only NumEntryGuards will get + the behavior she expects. Fixes bug 9354; bugfix on 0.2.4.8-alpha. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d5fab04..86e9afc 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1043,7 +1043,8 @@ The following options are useful only for clients (that is, if fraction of your paths. (Default: 1) **UseEntryGuardsAsDirectoryGuards** **0**|**1**:: - If this option is set to 1, we try to use our entry guards as directory + If this option is set to 1, and UseEntryGuards is also set to 1, + we try to use our entry guards as directory guards, and failing that, pick more nodes to act as our directory guards. This helps prevent an adversary from enumerating clients. It's only available for clients (non-relay, non-bridge) that aren't configured to @@ -1056,7 +1057,8 @@ The following options are useful only for clients (that is, if **NumDirectoryGuards** __NUM__:: If UseEntryGuardsAsDirectoryGuards is enabled, we try to make sure we - have at least NUM routers to use as directory guards. (Default: 3) + have at least NUM routers to use as directory guards. If this option + is set to 0, use the value from NumEntryGuards. (Default: 0) **GuardLifetime** __N__ **days**|**weeks**|**months**:: If nonzero, and UseEntryGuards is set, minimum time to keep a guard before diff --git a/src/or/config.c b/src/or/config.c index bf82643..72ceea3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -314,7 +314,7 @@ static config_var_t option_vars_[] = { OBSOLETE("NoPublish"), VAR("NodeFamily", LINELIST, NodeFamilies, NULL), V(NumCPUs, UINT, "0"), - V(NumDirectoryGuards, UINT, "3"), + V(NumDirectoryGuards, UINT, "0"), V(NumEntryGuards, UINT, "3"), V(ORListenAddress, LINELIST, NULL), VPORT(ORPort, LINELIST, NULL), diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 7a1f67d..f1af75a 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -415,14 +415,24 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, return node; } +/** Choose how many entry guards or directory guards we'll use. If + * for_directory is true, we return how many directory guards to + * use; else we return how many entry guards to use. */ +static int +decide_num_guards(const or_options_t *options, int for_directory) +{ + if (for_directory && options->NumDirectoryGuards != 0) + return options->NumDirectoryGuards; + return options->NumEntryGuards; +} + /** If the use of entry guards is configured, choose more entry guards * until we have enough in the list. */ static void pick_entry_guards(const or_options_t *options, int for_directory) { int changed = 0; - const int num_needed = for_directory ? options->NumDirectoryGuards : - options->NumEntryGuards; + const int num_needed = decide_num_guards(options, for_directory); tor_assert(entry_guards); @@ -962,8 +972,7 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, int need_capacity = state ? state->need_capacity : 0; int preferred_min, consider_exit_family = 0; int need_descriptor = !for_directory; - const int num_needed = for_directory ? options->NumDirectoryGuards : - options->NumEntryGuards; + const int num_needed = decide_num_guards(options, for_directory); if (chosen_exit) { nodelist_add_node_and_family(exit_family, chosen_exit); diff --git a/src/or/or.h b/src/or/or.h index 0b8d057..3dc96b9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3769,7 +3769,8 @@ typedef struct { int NumEntryGuards; /**< How many entry guards do we try to establish? */ int UseEntryGuardsAsDirGuards; /** Boolean: Do we try to get directory info * from a smallish number of fixed nodes? */ - int NumDirectoryGuards; /**< How many dir guards do we try to establish? */ + int NumDirectoryGuards; /**< How many dir guards do we try to establish? + * If 0, use value from NumEntryGuards. */ int RephistTrackTime; /**< How many seconds do we keep rephist info? */ int FastFirstHopPK; /**< If Tor believes it is safe, should we save a third * of our PK time by sending CREATE_FAST cells? */

1 0

[tor/maint-0.2.4] NumDirectoryGuards now tracks NumEntryGuards by default
by nickm＠torproject.org 01 Aug '13

01 Aug '13

commit ff6bb13c02b3bb217ac8d48d5a20953f1b188d46 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jul 30 12:05:39 2013 -0400 NumDirectoryGuards now tracks NumEntryGuards by default Now a user who changes only NumEntryGuards will get the behavior she expects. Fixes bug 9354; bugfix on 0.2.4.8-alpha. --- changes/bug9354 | 5 +++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 2 +- src/or/entrynodes.c | 17 +++++++++++++---- src/or/or.h | 3 ++- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/changes/bug9354 b/changes/bug9354 new file mode 100644 index 0000000..68fc81a --- /dev/null +++ b/changes/bug9354 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Make the default behavior of NumDirectoryGuards be to track + NumEntryGuards. Now a user who changes only NumEntryGuards will get + the behavior she expects. Fixes bug 9354; bugfix on 0.2.4.8-alpha. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d5fab04..86e9afc 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1043,7 +1043,8 @@ The following options are useful only for clients (that is, if fraction of your paths. (Default: 1) **UseEntryGuardsAsDirectoryGuards** **0**|**1**:: - If this option is set to 1, we try to use our entry guards as directory + If this option is set to 1, and UseEntryGuards is also set to 1, + we try to use our entry guards as directory guards, and failing that, pick more nodes to act as our directory guards. This helps prevent an adversary from enumerating clients. It's only available for clients (non-relay, non-bridge) that aren't configured to @@ -1056,7 +1057,8 @@ The following options are useful only for clients (that is, if **NumDirectoryGuards** __NUM__:: If UseEntryGuardsAsDirectoryGuards is enabled, we try to make sure we - have at least NUM routers to use as directory guards. (Default: 3) + have at least NUM routers to use as directory guards. If this option + is set to 0, use the value from NumEntryGuards. (Default: 0) **GuardLifetime** __N__ **days**|**weeks**|**months**:: If nonzero, and UseEntryGuards is set, minimum time to keep a guard before diff --git a/src/or/config.c b/src/or/config.c index bf82643..72ceea3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -314,7 +314,7 @@ static config_var_t option_vars_[] = { OBSOLETE("NoPublish"), VAR("NodeFamily", LINELIST, NodeFamilies, NULL), V(NumCPUs, UINT, "0"), - V(NumDirectoryGuards, UINT, "3"), + V(NumDirectoryGuards, UINT, "0"), V(NumEntryGuards, UINT, "3"), V(ORListenAddress, LINELIST, NULL), VPORT(ORPort, LINELIST, NULL), diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 7a1f67d..f1af75a 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -415,14 +415,24 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, return node; } +/** Choose how many entry guards or directory guards we'll use. If + * for_directory is true, we return how many directory guards to + * use; else we return how many entry guards to use. */ +static int +decide_num_guards(const or_options_t *options, int for_directory) +{ + if (for_directory && options->NumDirectoryGuards != 0) + return options->NumDirectoryGuards; + return options->NumEntryGuards; +} + /** If the use of entry guards is configured, choose more entry guards * until we have enough in the list. */ static void pick_entry_guards(const or_options_t *options, int for_directory) { int changed = 0; - const int num_needed = for_directory ? options->NumDirectoryGuards : - options->NumEntryGuards; + const int num_needed = decide_num_guards(options, for_directory); tor_assert(entry_guards); @@ -962,8 +972,7 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, int need_capacity = state ? state->need_capacity : 0; int preferred_min, consider_exit_family = 0; int need_descriptor = !for_directory; - const int num_needed = for_directory ? options->NumDirectoryGuards : - options->NumEntryGuards; + const int num_needed = decide_num_guards(options, for_directory); if (chosen_exit) { nodelist_add_node_and_family(exit_family, chosen_exit); diff --git a/src/or/or.h b/src/or/or.h index 0b8d057..3dc96b9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3769,7 +3769,8 @@ typedef struct { int NumEntryGuards; /**< How many entry guards do we try to establish? */ int UseEntryGuardsAsDirGuards; /** Boolean: Do we try to get directory info * from a smallish number of fixed nodes? */ - int NumDirectoryGuards; /**< How many dir guards do we try to establish? */ + int NumDirectoryGuards; /**< How many dir guards do we try to establish? + * If 0, use value from NumEntryGuards. */ int RephistTrackTime; /**< How many seconds do we keep rephist info? */ int FastFirstHopPK; /**< If Tor believes it is safe, should we save a third * of our PK time by sending CREATE_FAST cells? */

1 0