February 2014 - tor-commits - lists.torproject.org

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 16 Feb '14

16 Feb '14

commit fa4a979fa8f28d3cbf64a2a77b0d859c5437293e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 16 03:45:32 2014 +0000 Update translations for tor-launcher-network-settings --- ja/network-settings.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd index 06f9d10..7e1d61d 100644 --- a/ja/network-settings.dtd +++ b/ja/network-settings.dtd @@ -49,11 +49,11 @@ <!ENTITY torsettings.copyLog "Torのログをクリップボードにコピー"> <!ENTITY torsettings.bridgeHelpTitle "ブリッジリレーのヘルプ"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Tor ネットワークに接続できないなら、あなたのインターネットサービスプロバイダー(ISP)や別の機関が Tor をブロックしている可能性があります。&#160; ブロックが比較的困難なリストされていないリレーである Tor ブリッジを使用することでこの問題を回避できることもあります。"> +<!ENTITY torsettings.bridgeHelp1B "ブリッジアドレスを取得する三種の方法は:"> +<!ENTITY torsettings.bridgeHelp2Heading "ウェブ経由"> +<!ENTITY torsettings.bridgeHelp2 "ウェブを使用して、https://bridges.torproject.orgを開く"> +<!ENTITY torsettings.bridgeHelp3Heading "メール自動応答システム経由"> +<!ENTITY torsettings.bridgeHelp3 "メッセージの本文に 'get bridges' という行を付けて bridges(a)torproject.org にメールを送信する。.&#160;ただし、攻撃者が多くのブリッジアドレスを把握するのを困難にするために、 gmail.com または yahoo.com のメールアドレスからこのリクエストを送信する必要があります。"> +<!ENTITY torsettings.bridgeHelp4Heading "ヘルプデスク経由"> +<!ENTITY torsettings.bridgeHelp4 "最後の頼みの綱として、 help(a)rt.torproject.org に丁寧なメールメッセージを送信して、ブリッジアドレスをリクエストすることができます。&#160; 人間が各リクエストに対応する必要があることにご注意ください。">

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 16 Feb '14

16 Feb '14

commit cdae1e5769291c230d9360be2ecaf9c2a3ed021b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 16 02:45:19 2014 +0000 Update translations for tails-persistence-setup --- ko/ko.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ko/ko.po b/ko/ko.po index 6d415e2..82f00b9 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-01-18 21:00+0100\n" -"PO-Revision-Date: 2014-02-13 16:20+0000\n" +"PO-Revision-Date: 2014-02-16 02:40+0000\n" "Last-Translator: Dr.what <javrick6(a)naver.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" @@ -24,11 +24,11 @@ msgstr "개인 정보" #: ../lib/Tails/Persistence/Configuration/Presets.pm:50 msgid "Keep files stored in the `Persistent' directory" -msgstr "" +msgstr "영속적 디텍토리에 보관된 파일 유지" #: ../lib/Tails/Persistence/Configuration/Presets.pm:58 msgid "GnuPG" -msgstr "" +msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" @@ -36,7 +36,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" -msgstr "" +msgstr "SSH 클라이언트" #: ../lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "SSH keys, configuration and known hosts" @@ -68,7 +68,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Network Connections" -msgstr "" +msgstr "네트워크 연결" #: ../lib/Tails/Persistence/Configuration/Presets.pm:110 msgid "Configuration of network devices and connections" @@ -100,7 +100,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Lists" -msgstr "" +msgstr "APT 목록" #: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Lists downloaded by APT"

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 16 Feb '14

16 Feb '14

commit 3aae035e72738f95c20935c93e3269e2c48501f4 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 16 02:15:35 2014 +0000 Update translations for tor-launcher-network-settings_completed --- es/network-settings.dtd | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/es/network-settings.dtd b/es/network-settings.dtd index 83fb0cf..c31f1e1 100644 --- a/es/network-settings.dtd +++ b/es/network-settings.dtd @@ -49,7 +49,12 @@ <!ENTITY torsettings.copyLog "Copiar el registro de mensajes ('log') de Tor al portapapeles"> <!ENTITY torsettings.bridgeHelpTitle "Ayuda de Repetidores Puente ('Bridge Relays')"> -<!ENTITY torsettings.bridgeHelp1 "Si no es capaz de conectar con la red Tor, podría ser que su Proveedor de Servicios de Internet (ISP), u otra agencia, esté bloqueando Tor.&#160; A menudo puede evitar este problema usando puentes Tor ('bridges'), que son repetidores 'ocultos' más difíciles de bloquear"> -<!ENTITY torsettings.bridgeHelp2 "Para obtener algunas direcciones de puentes, utilice un navegador web para visitar la siguiente página: "> -<!ENTITY torsettings.bridgeHelp3 "Otra manera de encontrar direcciones de puentes ('bridges') públicas es mandar un correo a bridges(a)torproject.org con la línea 'get bridges' por si misma en el cuerpo del mensaje.&#160; Sin embargo, para ponerle más difícil a un atacante conocer muchas direcciones de puentes, debe envíar esta solicitud desde una dirección de correo electrónico de uno de los siguientes dominios (con soporte DKIM): gmail.com o yahoo.com "> -<!ENTITY torsettings.bridgeHelp4 "También puede solicitar repetidores puente ('bridge relays') mandando un correo a help(a)rt.torproject.org"> +<!ENTITY torsettings.bridgeHelp1 "Si no puede conectar a la red Tor, podría ser que su proveedor de servicios de Internet (ISP) u otra agencia, esté bloqueando Tor.&#160; A menudo, puede evitar este problema usando puentes ('bridges') de Tor, que son repetidores ('relays') de salida de la red Tor que no son publicitados, y es más difícil que sean bloqueados."> +<!ENTITY torsettings.bridgeHelp1B "Aquí tiene tres formas de obtener direcciones de repetidores puente:"> +<!ENTITY torsettings.bridgeHelp2Heading "Mediante la web"> +<!ENTITY torsettings.bridgeHelp2 "Use un navegador web para visitar https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Mediante el correo electrónico automático"> +<!ENTITY torsettings.bridgeHelp3 "Envíe un correo a bridges(a)torproject.org con la línea 'get bridges' por si misma en el cuerpo del mensaje.&#160; Sin embargo, para hacer más difícil a un atacante aprender muchas direcciones de puentes, ha de enviar esta solicitud desde una dirección de correo de gmail.com o yahoo.com que facilitan comprobaciones de suplantación."> +<!ENTITY torsettings.bridgeHelp4Heading "Mediante el gabinete de ayuda"> +<!ENTITY torsettings.bridgeHelp4 "Como último recurso, puede pedir direcciones de repetidores puente enviando un cortés mensaje de correo a help(a)rt.torproject.org .&#160; +Por favor observe que es una persona la que tendrá que responder a cada petición.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 16 Feb '14

16 Feb '14

commit fdd39c61627de9a57a9b2864806ccb0ee6c04a82 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 16 02:15:32 2014 +0000 Update translations for tor-launcher-network-settings --- es/network-settings.dtd | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/es/network-settings.dtd b/es/network-settings.dtd index 518563a..c31f1e1 100644 --- a/es/network-settings.dtd +++ b/es/network-settings.dtd @@ -54,6 +54,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "Mediante la web"> <!ENTITY torsettings.bridgeHelp2 "Use un navegador web para visitar https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Mediante el correo electrónico automático"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp3 "Envíe un correo a bridges(a)torproject.org con la línea 'get bridges' por si misma en el cuerpo del mensaje.&#160; Sin embargo, para hacer más difícil a un atacante aprender muchas direcciones de puentes, ha de enviar esta solicitud desde una dirección de correo de gmail.com o yahoo.com que facilitan comprobaciones de suplantación."> +<!ENTITY torsettings.bridgeHelp4Heading "Mediante el gabinete de ayuda"> +<!ENTITY torsettings.bridgeHelp4 "Como último recurso, puede pedir direcciones de repetidores puente enviando un cortés mensaje de correo a help(a)rt.torproject.org .&#160; +Por favor observe que es una persona la que tendrá que responder a cada petición.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 16 Feb '14

16 Feb '14

commit 3cfd9ac853a8a4a790db3b08281283813db4cc75 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 16 01:45:33 2014 +0000 Update translations for tor-launcher-network-settings --- es/network-settings.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/es/network-settings.dtd b/es/network-settings.dtd index e8549fd..518563a 100644 --- a/es/network-settings.dtd +++ b/es/network-settings.dtd @@ -49,11 +49,11 @@ <!ENTITY torsettings.copyLog "Copiar el registro de mensajes ('log') de Tor al portapapeles"> <!ENTITY torsettings.bridgeHelpTitle "Ayuda de Repetidores Puente ('Bridge Relays')"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp1 "Si no puede conectar a la red Tor, podría ser que su proveedor de servicios de Internet (ISP) u otra agencia, esté bloqueando Tor.&#160; A menudo, puede evitar este problema usando puentes ('bridges') de Tor, que son repetidores ('relays') de salida de la red Tor que no son publicitados, y es más difícil que sean bloqueados."> +<!ENTITY torsettings.bridgeHelp1B "Aquí tiene tres formas de obtener direcciones de repetidores puente:"> +<!ENTITY torsettings.bridgeHelp2Heading "Mediante la web"> +<!ENTITY torsettings.bridgeHelp2 "Use un navegador web para visitar https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Mediante el correo electrónico automático"> <!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request.">

1 0

[flashproxy/master] more FreeBSD compatibility fixes for some build scripts
by infinity0＠torproject.org 15 Feb '14

15 Feb '14

commit 1432fd2ca896522613be1e4bc8f40712b2a61f96 Author: Ximin Luo <infinity0(a)torproject.org> Date: Sat Feb 15 18:00:10 2014 +0000 more FreeBSD compatibility fixes for some build scripts --- mkman.sh | 12 +++++++++--- version.sh | 5 ++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/mkman.sh b/mkman.sh index 40bc372..cd4ecff 100755 --- a/mkman.sh +++ b/mkman.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Wrapper around help2man that takes input from stdin. set -o errexit @@ -31,9 +31,15 @@ help2man_fixup() { s/\\fI\-/\\fB\-/g; # change ALL-CAPS parameters to italic, "replace with appropriate argument" s/\b$[A-Z][A-Z]*$\b/\\fI\1\\fR/g; -}}' +};}' } +if stat -c "%s" . >/dev/null 2>&1; then + size() { stat -c "%s" "$@"; } +else + size() { stat -f "%z" "$@"; } +fi + prog="$1" ver="$2" name="${3:-$(get_description "$1")}" @@ -46,7 +52,7 @@ mkdir -p ".tmp.$$" echo "$shebang" cat } > ".tmp.$$/$prog" -test $(stat -c "%s" ".tmp.$$/$prog") -gt $((${#shebang} + 1)) || { echo >&2 "no input received; abort"; exit 1; } +test $(size ".tmp.$$/$prog") -gt $((${#shebang} + 1)) || { echo >&2 "no input received; abort"; exit 1; } chmod +x ".tmp.$$/$prog" help2man ".tmp.$$/$prog" --help-option="-q" \ diff --git a/version.sh b/version.sh index d69dc64..fa89f47 100755 --- a/version.sh +++ b/version.sh @@ -1,3 +1,6 @@ #!/bin/sh # Read version from the ChangeLog to avoid repeating in multiple build scripts -sed -ne 's/^Changes .* version $..*$$/\1/g;tx;b;:x p;q' ChangeLog +sed -ne 's/^Changes .* version $..*$$/\1/g;tx +b +:x +p;q' ChangeLog

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 15 Feb '14

15 Feb '14

commit 032999aa774d23ec09db6fd12c349ff3205227fb Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 15 22:15:35 2014 +0000 Update translations for tor-launcher-network-settings_completed --- ru/network-settings.dtd | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ru/network-settings.dtd b/ru/network-settings.dtd index 5ceb42b..8940e07 100644 --- a/ru/network-settings.dtd +++ b/ru/network-settings.dtd @@ -49,7 +49,11 @@ <!ENTITY torsettings.copyLog "Скопировать журнал Tor в буфер обмена"> <!ENTITY torsettings.bridgeHelpTitle "Помощь по ретрансляторам типа мост"> -<!ENTITY torsettings.bridgeHelp1 "Если Tor по-прежнему не работает, вполне вероятно, что Ваш провайдер блокирует Tor. &#160; Очень часто это можно обойти с помощью Tor мостов - скрытых ретрансляторов, которые не так легко заблокировать."> -<!ENTITY torsettings.bridgeHelp2 "Чтобы найти ретрансляторы типа мост отправляйтесь по адресу https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3 "Другой способ найти публичные адреса - послать письмо на адрес bridges(a)torproject.org со строкой get bridges в теле письма. В целях безопасности система принимает письма только с адресов gmail.com и yahoo.com"> -<!ENTITY torsettings.bridgeHelp4 "Вы также можете запросить список мостов отправив письмо на help(a)rt.torproject.org"> +<!ENTITY torsettings.bridgeHelp1 "Если вы не можете подключиться к сети Tor, возможно ваш провайдер (ISP) или иная организация блокирует Tor.&#160; Часто эту проблему можно обойти при помощи мостов Tor, не перечисленных в публичных списках, которые сложнее заблокировать."> +<!ENTITY torsettings.bridgeHelp1B "Существует 3 способа получить адреса мостов:"> +<!ENTITY torsettings.bridgeHelp2Heading "Из Веб"> +<!ENTITY torsettings.bridgeHelp2 "Откройте в веб-браузере https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Через автоответчик электронной почты"> +<!ENTITY torsettings.bridgeHelp3 "Отправьте письмо по адресу bridges(a)torproject.org со строкой 'get bridges' в теле сообщения.&#160; Однако чтобы усложнить сбор атакующими адресов всех мостов, от Вас требуется отправить запрос с адреса gmail.com или yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading "В справочной службе"> +<!ENTITY torsettings.bridgeHelp4 "В крайнем случае, Вы можете вежливо попросить адреса мостов по адресу help(a)rt.torproject.org.&#160; Пожалуйста, имейте в виду, что каждый запрос обрабатывается человеком.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 15 Feb '14

15 Feb '14

commit c8a4535f12574f9e917c3364683a8dfc961e261f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 15 22:15:33 2014 +0000 Update translations for tor-launcher-network-settings --- ru/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ru/network-settings.dtd b/ru/network-settings.dtd index 8205b32..8940e07 100644 --- a/ru/network-settings.dtd +++ b/ru/network-settings.dtd @@ -54,6 +54,6 @@ <!ENTITY torsettings.bridgeHelp2Heading "Из Веб"> <!ENTITY torsettings.bridgeHelp2 "Откройте в веб-браузере https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Через автоответчик электронной почты"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp3 "Отправьте письмо по адресу bridges(a)torproject.org со строкой 'get bridges' в теле сообщения.&#160; Однако чтобы усложнить сбор атакующими адресов всех мостов, от Вас требуется отправить запрос с адреса gmail.com или yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading "В справочной службе"> +<!ENTITY torsettings.bridgeHelp4 "В крайнем случае, Вы можете вежливо попросить адреса мостов по адресу help(a)rt.torproject.org.&#160; Пожалуйста, имейте в виду, что каждый запрос обрабатывается человеком.">

1 0

[tor/master] Get csiphash better integrated with our build system
by nickm＠torproject.org 15 Feb '14

15 Feb '14

commit 9605978eb6225a67f0682f6de990278644f8ea38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 12 10:24:04 2014 -0500 Get csiphash better integrated with our build system --- src/common/include.am | 1 + src/ext/csiphash.c | 16 +++++++++------- src/ext/include.am | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/common/include.am b/src/common/include.am index 814786b..d0ea40e 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -61,6 +61,7 @@ LIBOR_A_SOURCES = \ src/common/util.c \ src/common/util_codedigest.c \ src/common/sandbox.c \ + src/ext/csiphash.c \ $(libor_extra_source) LIBOR_CRYPTO_A_SOURCES = \ diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c index 0633977..5df41d7 100644 --- a/src/ext/csiphash.c +++ b/src/ext/csiphash.c @@ -29,7 +29,8 @@ Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c) */ -#include <stdint.h> +#include "torint.h" +#include "siphash.h" #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ @@ -58,7 +59,6 @@ #endif - #define ROTATE(x, b) (uint64_t)( ((x) << (b)) | ( (x) >> (64 - (b))) ) #define HALF_ROUND(a,b,c,d,s,t) \ @@ -74,13 +74,15 @@ HALF_ROUND(v2,v1,v0,v3,17,21); -uint64_t siphash24(const void *src, unsigned long src_sz, const char key[16]) { - const uint64_t *_key = (uint64_t *)key; - uint64_t k0 = _le64toh(_key[0]); - uint64_t k1 = _le64toh(_key[1]); +uint64_t siphash24(const void *src, unsigned long src_sz, const struct sipkey *key) { + uint64_t k0 = key->k0; + uint64_t k1 = key->k1; uint64_t b = (uint64_t)src_sz << 56; const uint64_t *in = (uint64_t*)src; + uint64_t t; + uint8_t *pt, *m; + uint64_t v0 = k0 ^ 0x736f6d6570736575ULL; uint64_t v1 = k1 ^ 0x646f72616e646f6dULL; uint64_t v2 = k0 ^ 0x6c7967656e657261ULL; @@ -94,7 +96,7 @@ uint64_t siphash24(const void *src, unsigned long src_sz, const char key[16]) { v0 ^= mi; } - uint64_t t = 0; uint8_t *pt = (uint8_t *)&t; uint8_t *m = (uint8_t *)in; + t = 0; pt = (uint8_t*)&t; m = (uint8_t*)in; switch (src_sz) { case 7: pt[6] = m[6]; case 6: pt[5] = m[5]; diff --git a/src/ext/include.am b/src/ext/include.am index ea7e58e..26e194e 100644 --- a/src/ext/include.am +++ b/src/ext/include.am @@ -10,7 +10,8 @@ EXTHEADERS = \ src/ext/strlcat.c \ src/ext/strlcpy.c \ src/ext/tinytest_macros.h \ - src/ext/tor_queue.h + src/ext/tor_queue.h \ + src/ext/siphash.h noinst_HEADERS+= $(EXTHEADERS)

1 0

[tor/master] csiphash: avoid unaligned access on non-x86
by nickm＠torproject.org 15 Feb '14

15 Feb '14

commit 1bd86b69b6198892a8310f3933a4df483b91713a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 12 10:39:22 2014 -0500 csiphash: avoid unaligned access on non-x86 --- src/ext/csiphash.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c index 5df41d7..2f37a5f 100644 --- a/src/ext/csiphash.c +++ b/src/ext/csiphash.c @@ -31,6 +31,7 @@ #include "torint.h" #include "siphash.h" +#include <string.h> #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ @@ -73,6 +74,11 @@ HALF_ROUND(v0,v1,v2,v3,13,16); \ HALF_ROUND(v2,v1,v0,v3,17,21); +#if (defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ + defined(__x86_64) || defined(__x86_64__) || \ + defined(_M_AMD64) || defined(_M_X64) || defined(__INTEL__)) +# define UNALIGNED_OK 1 +#endif uint64_t siphash24(const void *src, unsigned long src_sz, const struct sipkey *key) { uint64_t k0 = key->k0; @@ -89,7 +95,13 @@ uint64_t siphash24(const void *src, unsigned long src_sz, const struct sipkey *k uint64_t v3 = k1 ^ 0x7465646279746573ULL; while (src_sz >= 8) { +#ifdef UNALIGNED_OK uint64_t mi = _le64toh(*in); +#else + uint64_t mi; + memcpy(&mi, in, 8); + mi = _le64toh(mi); +#endif in += 1; src_sz -= 8; v3 ^= mi; DOUBLE_ROUND(v0,v1,v2,v3); @@ -101,7 +113,11 @@ uint64_t siphash24(const void *src, unsigned long src_sz, const struct sipkey *k case 7: pt[6] = m[6]; case 6: pt[5] = m[5]; case 5: pt[4] = m[4]; +#ifdef UNALIGNED_OK case 4: *((uint32_t*)&pt[0]) = *((uint32_t*)&m[0]); break; +#else + case 4: pt[3] = m[3]; +#endif case 3: pt[2] = m[2]; case 2: pt[1] = m[1]; case 1: pt[0] = m[0]; @@ -115,3 +131,4 @@ uint64_t siphash24(const void *src, unsigned long src_sz, const struct sipkey *k DOUBLE_ROUND(v0,v1,v2,v3); return (v0 ^ v1) ^ (v2 ^ v3); } +

1 0