June 2018 - tor-commits - lists.torproject.org

[torbutton/master] Bug 26430 - New torbutton icons
by gk＠torproject.org 24 Jun '18

24 Jun '18

commit 32e63d587ac4de0f47ef13db8625a474d0492d34 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Jun 22 09:31:09 2018 -0700 Bug 26430 - New torbutton icons Icon design by Antonela Debiasi. Switching our torbutton icons to SVG allows us get high quality for any size, including retina screens. Also, SVGs should scale to the correct image size, which means I think #8941 can be closed. In any case, the "iconsize" attribute has been dropped by Mozilla; see https://bugzilla.mozilla.org/show_bug.cgi?id=1430128 Blinking of update warning is implemented with a CSS animation. --- src/chrome/skin/tor-16.png | Bin 711 -> 0 bytes src/chrome/skin/tor-24.png | Bin 1433 -> 0 bytes src/chrome/skin/tor-disabled-16.png | Bin 5536 -> 0 bytes src/chrome/skin/tor-disabled-24.png | Bin 5990 -> 0 bytes src/chrome/skin/tor-enabled-16.png | Bin 915 -> 0 bytes src/chrome/skin/tor-enabled-24.png | Bin 1588 -> 0 bytes src/chrome/skin/tor-update-16.gif | Bin 1304 -> 0 bytes src/chrome/skin/tor-update-24.gif | Bin 1732 -> 0 bytes src/chrome/skin/torbutton-update-needed.svg | 11 +++++ src/chrome/skin/torbutton.css | 69 ++++++++-------------------- src/chrome/skin/torbutton.svg | 9 ++++ 11 files changed, 40 insertions(+), 49 deletions(-) diff --git a/src/chrome/skin/tor-16.png b/src/chrome/skin/tor-16.png deleted file mode 100644 index b85043f..0000000 Binary files a/src/chrome/skin/tor-16.png and /dev/null differ diff --git a/src/chrome/skin/tor-24.png b/src/chrome/skin/tor-24.png deleted file mode 100644 index a498806..0000000 Binary files a/src/chrome/skin/tor-24.png and /dev/null differ diff --git a/src/chrome/skin/tor-disabled-16.png b/src/chrome/skin/tor-disabled-16.png deleted file mode 100644 index f749377..0000000 Binary files a/src/chrome/skin/tor-disabled-16.png and /dev/null differ diff --git a/src/chrome/skin/tor-disabled-24.png b/src/chrome/skin/tor-disabled-24.png deleted file mode 100644 index c083748..0000000 Binary files a/src/chrome/skin/tor-disabled-24.png and /dev/null differ diff --git a/src/chrome/skin/tor-enabled-16.png b/src/chrome/skin/tor-enabled-16.png deleted file mode 100644 index d48a8b0..0000000 Binary files a/src/chrome/skin/tor-enabled-16.png and /dev/null differ diff --git a/src/chrome/skin/tor-enabled-24.png b/src/chrome/skin/tor-enabled-24.png deleted file mode 100644 index c8b932f..0000000 Binary files a/src/chrome/skin/tor-enabled-24.png and /dev/null differ diff --git a/src/chrome/skin/tor-update-16.gif b/src/chrome/skin/tor-update-16.gif deleted file mode 100644 index d006458..0000000 Binary files a/src/chrome/skin/tor-update-16.gif and /dev/null differ diff --git a/src/chrome/skin/tor-update-24.gif b/src/chrome/skin/tor-update-24.gif deleted file mode 100644 index 72591a8..0000000 Binary files a/src/chrome/skin/tor-update-24.gif and /dev/null differ diff --git a/src/chrome/skin/torbutton-update-needed.svg b/src/chrome/skin/torbutton-update-needed.svg new file mode 100644 index 0000000..73f819e --- /dev/null +++ b/src/chrome/skin/torbutton-update-needed.svg @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g id="Icon---Tor---Update" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="Tor-Button-Icon" transform="translate(2.000000, 1.000000)" fill="#0C0C0D"> + <path d="M8.27206791,6.27905236 C7.88283063,6.53485117 6.37928571,7.48491742 6.38222311,7.48303971 C5.92467564,7.77552366 5.55774616,8.01739321 5.22956304,8.24495813 C4.62774003,8.66226724 4.1902024,9.01032507 3.90524298,9.30237927 C2.34845165,10.8521114 1.86583368,12.1863028 2.03292037,14.2840468 C2.17744778,16.6290092 3.98280543,18.7226974 6.62789966,19.5725823 C7.66430091,19.8978216 8.64783036,20 10.3045058,20 C12.4566798,20 14.4305353,19.426444 15.7257727,18.390024 C17.1602235,17.2499732 18,15.5258216 18,13.7581121 C18,11.9676824 17.2065463,10.2463814 15.7919239,9.00433992 C15.0624549,8.37501782 14.1112169,7.77509114 12.728283,7.03810567 C11.4758566,6.39901667 10.3718516,5.26209475 9.95586156,3.83344263 C9.74417905,4.87665258 9.16812751,5.7299448 8.27206791,6.27905236 Z M17.1048177,7.49557522 C18.9563878,9.1179941 20,11.3893805 20,13.7581121 C20,16.1268437 18.889058,18.4306785 16.9701581,19.9557522 C15.1859178,21.3834808 12.6947145,22 10.3045058,22 C8.8232498,22 7.47 665339,21.9351032 6.02906225,21.480826 C2.69623613,20.4100295 0.238697687,17.6843658 0.0367082257,14.4070796 C-0.165281236,11.8761062 0.440687149,9.92920354 2.49424667,7.88495575 C3.53785889,6.81415929 5.69241315,5.58112094 7.1736692,4.60766962 C7.91429722,4.15339233 8.68859016,2.79056047 7.20733411,0.227138643 L7.5103183,0 L11.9204215,1.75221239 C11.3144532,3.63421829 13.0650285,4.96460177 13.637332,5.25663717 C14.9165986,5.9380531 16.1285353,6.6519174 17.1048177,7.49557522 Z" id="Border" fill-rule="nonzero"></path> + <path d="M10,5.80000019 C10.3632315,6.90320629 11.2333653,7.78038283 12.2159038,8.28105702 C13.3397544,8.87914153 14.1127842,9.36599897 14.7055922,9.87671162 C15.8551945,10.8846633 16.5,12.2815477 16.5,13.7345319 C16.5,15.1690781 15.81755,16.5682758 14.6518339,17.4934592 C13.5992506,18.3345433 11.9951837,18.8000002 10.2462051,18.8000002 C10.1620472,18.8000002 10.0800269,18.7996762 10,18.7990042 L10,5.80000019 Z" id="Half-Content"></path> + </g> + <polygon id="Triangle" fill="#0C0C0D" points="7 11 13 23 1 23"></polygon> + <path d="M13.6929417,21.0118641 C14.0028183,21.6319873 13.9694684,22.3683526 13.6048048,22.957926 C13.2401412,23.5474994 12.5961777,23.9061872 11.9029417,23.9058641 L1.99794165,23.9058641 C1.30603325,23.9051512 0.663641796,23.5468644 0.299459428,22.9585541 C-0.0647229393,22.3702439 -0.0989581202,21.6354894 0.208941651,21.0158641 L5.16194165,11.1058641 C5.50066779,10.428136 6.19328022,10 6.95094165,10 C7.70860308,10 8.40121551,10.428136 8.73994165,11.1058641 L13.6929417,21.0118641 Z M5.95094165,13.9058641 L5.95094165,17.9058641 C5.95094165,18.4581489 6.3986569,18.9058641 6.95094165,18.9058641 C7.5032264,18.9058641 7.95094165,18.4581489 7.95094165,17.9058641 L7.95094165,13.9058641 C7.95094165,13.3535794 7.5032264,12.9058641 6.95094165,12.9058641 C6.3986569,12.9058641 5.95094165,13.3535794 5.95094165,13.9058641 Z M6.95094165,22.1558641 C7.64129759,22.1558641 8.20094165,21.59622 8.20094165,20.9058641 C8.20094165,20.2155082 7.64129759,19.6558641 6.95094165,19.6558641 C6.26058571, 19.6558641 5.70094165,20.2155082 5.70094165,20.9058641 C5.70094165,21.59622 6.26058571,22.1558641 6.95094165,22.1558641 Z" id="Shape" fill="#FFE900" fill-rule="nonzero"></path> + </g> +</svg> diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index 5bdcaa6..14166b7 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -1,73 +1,44 @@ +@keyframes blink-update { + 0% { + list-style-image: url("chrome://torbutton/skin/torbutton-update-needed.svg"); + } + 100% { + list-style-image: url("chrome://torbutton/skin/torbutton.svg"); + } +} + #torbutton-button { - list-style-image: url("chrome://torbutton/skin/tor-24.png"); + list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } #torbutton-button[tbstatus="on"] { - list-style-image: url("chrome://torbutton/skin/tor-enabled-24.png"); + opacity: 1.0; } #torbutton-button[tbstatus="off"] { - list-style-image: url("chrome://torbutton/skin/tor-disabled-24.png"); + opacity: 0.4; } #torbutton-button[tbUpdateNeeded="true"] { - list-style-image: url("chrome://torbutton/skin/tor-update-24.gif"); -} -toolbar[iconsize="small"] #torbutton-button { - list-style-image: url("chrome://torbutton/skin/tor-16.png"); -} -/* Although the tor-enabled-16.png, tor-disabled-16.png and tor-update-16.gif -indicate that they are 16x16 icons, they have 18x18 pixels in fact. This -leads to resizing the content window's height on start-up on Windows at -least. To guarantee a content window with a multiple of 200x100 we -therefore use only a x16 part of each icon while trying to minimize bad UI -effects until #8941 gets fixed.*/ -toolbar[iconsize="small"] #torbutton-button[tbstatus="on"] { - list-style-image: url("chrome://torbutton/skin/tor-enabled-16.png"); - -moz-image-region: rect(1px, 17px, 17px, 1px); -} -toolbar[iconsize="small"] #torbutton-button[tbstatus="off"] { - list-style-image: url("chrome://torbutton/skin/tor-disabled-16.png"); - -moz-image-region: rect(0px, 18px, 16px, 0px); -} -toolbar[iconsize="small"] #torbutton-button[tbUpdateNeeded="true"] { - list-style-image: url("chrome://torbutton/skin/tor-update-16.gif"); - -moz-image-region: rect(1px, 17px, 17px, 1px); + opacity: 1.0; + animation: blink-update normal 1s infinite ease-in-out; } #torbutton-button-tb { - list-style-image: url("chrome://torbutton/skin/tor-24.png"); + list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } #torbutton-button-tb[tbstatus="on"] { - list-style-image: url("chrome://torbutton/skin/tor-enabled-24.png"); + opacity: 1.0; } #torbutton-button-tb[tbstatus="off"] { - list-style-image: url("chrome://torbutton/skin/tor-disabled-24.png"); -} -toolbar[iconsize="small"] #torbutton-button-tb { - list-style-image: url("chrome://torbutton/skin/tor-16.png"); -} -toolbar[iconsize="small"] #torbutton-button-tb[tbstatus="on"] { - list-style-image: url("chrome://torbutton/skin/tor-enabled-16.png"); -} -toolbar[iconsize="small"] #torbutton-button-tb[tbstatus="off"] { - list-style-image: url("chrome://torbutton/skin/tor-disabled-16.png"); + opacity: 0.4; } #torbutton-button-tb-msg { - list-style-image: url("chrome://torbutton/skin/tor-24.png"); + list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } #torbutton-button-tb-msg[tbstatus="on"] { - list-style-image: url("chrome://torbutton/skin/tor-enabled-24.png"); + opacity: 1.0; } #torbutton-button-tb-msg[tbstatus="off"] { - list-style-image: url("chrome://torbutton/skin/tor-disabled-24.png"); -} -toolbar[iconsize="small"] #torbutton-button-tb-msg { - list-style-image: url("chrome://torbutton/skin/tor-16.png"); -} -toolbar[iconsize="small"] #torbutton-button-tb-msg[tbstatus="on"] { - list-style-image: url("chrome://torbutton/skin/tor-enabled-16.png"); -} -toolbar[iconsize="small"] #torbutton-button-tb-msg[tbstatus="off"] { - list-style-image: url("chrome://torbutton/skin/tor-disabled-16.png"); + opacity: 0.4; } #torbutton-checkForUpdate[tbUpdateNeeded] { diff --git a/src/chrome/skin/torbutton.svg b/src/chrome/skin/torbutton.svg new file mode 100644 index 0000000..518e981 --- /dev/null +++ b/src/chrome/skin/torbutton.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g id="Icon---Tor-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="Tor-Button-Icon" transform="translate(2.000000, 1.000000)" fill="#0C0C0D"> + <path d="M8.27206791,6.27905236 C7.88283063,6.53485117 6.37928571,7.48491742 6.38222311,7.48303971 C5.92467564,7.77552366 5.55774616,8.01739321 5.22956304,8.24495813 C4.62774003,8.66226724 4.1902024,9.01032507 3.90524298,9.30237927 C2.34845165,10.8521114 1.86583368,12.1863028 2.03292037,14.2840468 C2.17744778,16.6290092 3.98280543,18.7226974 6.62789966,19.5725823 C7.66430091,19.8978216 8.64783036,20 10.3045058,20 C12.4566798,20 14.4305353,19.426444 15.7257727,18.390024 C17.1602235,17.2499732 18,15.5258216 18,13.7581121 C18,11.9676824 17.2065463,10.2463814 15.7919239,9.00433992 C15.0624549,8.37501782 14.1112169,7.77509114 12.728283,7.03810567 C11.4758566,6.39901667 10.3718516,5.26209475 9.95586156,3.83344263 C9.74417905,4.87665258 9.16812751,5.7299448 8.27206791,6.27905236 Z M17.1048177,7.49557522 C18.9563878,9.1179941 20,11.3893805 20,13.7581121 C20,16.1268437 18.889058,18.4306785 16.9701581,19.9557522 C15.1859178,21.3834808 12.6947145,22 10.3045058,22 C8.8232498,22 7.47 665339,21.9351032 6.02906225,21.480826 C2.69623613,20.4100295 0.238697687,17.6843658 0.0367082257,14.4070796 C-0.165281236,11.8761062 0.440687149,9.92920354 2.49424667,7.88495575 C3.53785889,6.81415929 5.69241315,5.58112094 7.1736692,4.60766962 C7.91429722,4.15339233 8.68859016,2.79056047 7.20733411,0.227138643 L7.5103183,0 L11.9204215,1.75221239 C11.3144532,3.63421829 13.0650285,4.96460177 13.637332,5.25663717 C14.9165986,5.9380531 16.1285353,6.6519174 17.1048177,7.49557522 Z" id="Border" fill-rule="nonzero"></path> + <path d="M10,5.80000019 C10.3632315,6.90320629 11.2333653,7.78038283 12.2159038,8.28105702 C13.3397544,8.87914153 14.1127842,9.36599897 14.7055922,9.87671162 C15.8551945,10.8846633 16.5,12.2815477 16.5,13.7345319 C16.5,15.1690781 15.81755,16.5682758 14.6518339,17.4934592 C13.5992506,18.3345433 11.9951837,18.8000002 10.2462051,18.8000002 C10.1620472,18.8000002 10.0800269,18.7996762 10,18.7990042 L10,5.80000019 Z" id="Half-Content"></path> + </g> + </g> +</svg>

1 0

[tor-browser-build/master] Bug 26475: Make macOS bundles based on ESR60 reproducible
by gk＠torproject.org 24 Jun '18

24 Jun '18

commit d9db6035a3e0f0423accb7d6c3b9a2680577436f Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 24 11:26:00 2018 +0000 Bug 26475: Make macOS bundles based on ESR60 reproducible We know that Stylo is causing reproducibility issues on macOS, disable it for now. --- projects/firefox/mozconfig-osx-x86_64 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 1e30084..7ff17e1 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -48,6 +48,9 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests +# We need to disable for Stylo right now, as we have reproducibility issues on +# macOS with it enabled, see: #26475. +ac_add_options --disable-stylo # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme # ac_add_options --disable-ctypes

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 24 Jun '18

24 Jun '18

commit 33d97c4dcac8418752416b78bb07846e9c4f187a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 24 03:15:45 2018 +0000 Update translations for https_everywhere_completed --- da/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/ssl-observatory.dtd b/da/ssl-observatory.dtd index 3923aef8e..c5c1ae994 100644 --- a/da/ssl-observatory.dtd +++ b/da/ssl-observatory.dtd @@ -90,7 +90,7 @@ detaljer:"> <!ENTITY ssl-observatory.warning.title "ADVARSEL fra EFF's SSL-observatorium"> <!ENTITY ssl-observatory.warning.showcert "Vis certifikat-kæden"> <!ENTITY ssl-observatory.warning.okay "Jeg forstår"> -<!ENTITY ssl-observatory.warning.text "EFF's SSL-observatorium har udstedt en advarsel om HTTPS-certifikaterne for dette websted:"> +<!ENTITY ssl-observatory.warning.text "EFF's SSL-observatori har udstedt en advarsel om HTTPS-certifikatet/-certifikaterne det stedet:"> <!ENTITY ssl-observatory.warning.defense "Hvis du er logget ind på dette websted, så kan det tilrådes, at du ændrer din adgangskode, når du har etableret en sikker forbindelse. (Disse advarsler kan slås fra i fanebladet "SSL-Observatoriet" under dialog for præferencer for HTTPS Everywhere)."> <!ENTITY ssl-observatory.prefs.self_signed

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 24 Jun '18

24 Jun '18

commit 9ee1e424f2c3a0ad54329a75a82d16e915496a5b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 24 03:15:35 2018 +0000 Update translations for https_everywhere --- da/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/ssl-observatory.dtd b/da/ssl-observatory.dtd index 5b800d938..c5c1ae994 100644 --- a/da/ssl-observatory.dtd +++ b/da/ssl-observatory.dtd @@ -90,7 +90,7 @@ detaljer:"> <!ENTITY ssl-observatory.warning.title "ADVARSEL fra EFF's SSL-observatorium"> <!ENTITY ssl-observatory.warning.showcert "Vis certifikat-kæden"> <!ENTITY ssl-observatory.warning.okay "Jeg forstår"> -<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificate(s) for this site:"> +<!ENTITY ssl-observatory.warning.text "EFF's SSL-observatori har udstedt en advarsel om HTTPS-certifikatet/-certifikaterne det stedet:"> <!ENTITY ssl-observatory.warning.defense "Hvis du er logget ind på dette websted, så kan det tilrådes, at du ændrer din adgangskode, når du har etableret en sikker forbindelse. (Disse advarsler kan slås fra i fanebladet "SSL-Observatoriet" under dialog for præferencer for HTTPS Everywhere)."> <!ENTITY ssl-observatory.prefs.self_signed

1 0

[translation/torbutton-torbuttonproperties_completed] Update translations for torbutton-torbuttonproperties_completed
by translation＠torproject.org 24 Jun '18

24 Jun '18

commit 657101614c0dbfc24b4906758600bc83ddaab2bb Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 24 02:47:40 2018 +0000 Update translations for torbutton-torbuttonproperties_completed --- da/torbutton.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/da/torbutton.properties b/da/torbutton.properties index d3be2ccfd..7baf9fd26 100644 --- a/da/torbutton.properties +++ b/da/torbutton.properties @@ -52,3 +52,7 @@ profileReadOnly=Du kan ikke køre %S fra et skrivebeskyttet filsystem. Kopiér v profileReadOnlyMac=Du kan ikke køre %S fra et skrivebeskyttet filsystem. Kopiér venligst %S til skrivebordet eller en programmappe før du prøver at bruge det. profileAccessDenied= %S har ikke rettigheder til at bruge profilen. Skift venligst rettigheder og prøv igen. profileMigrationFailed=Overførsel af din eksisterende %S profil fejlede.\nNye indstillinger vil blive brugt. + +# .Onion Page Info prompt. Strings are kept here for ease of translation. +pageInfo_OnionEncryptionWithBitsAndProtocol=Forbindelse krypteret (løg-tjeneste, %1$S, %2$S-bit nøgler, %3$S) +pageInfo_OnionEncryption=Forbindelse krypteret (løg-tjeneste)

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 24 Jun '18

24 Jun '18

commit 1dd747e8ea76a92f5e41b52728cf3a6df4e50429 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 24 02:47:34 2018 +0000 Update translations for torbutton-torbuttonproperties --- da/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/torbutton.properties b/da/torbutton.properties index 12b798072..7baf9fd26 100644 --- a/da/torbutton.properties +++ b/da/torbutton.properties @@ -54,5 +54,5 @@ profileAccessDenied= %S har ikke rettigheder til at bruge profilen. Skift venlig profileMigrationFailed=Overførsel af din eksisterende %S profil fejlede.\nNye indstillinger vil blive brugt. # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) -pageInfo_OnionEncryption=Connection Encrypted (Onion Service) +pageInfo_OnionEncryptionWithBitsAndProtocol=Forbindelse krypteret (løg-tjeneste, %1$S, %2$S-bit nøgler, %3$S) +pageInfo_OnionEncryption=Forbindelse krypteret (løg-tjeneste)

1 0

[stem/master] Refactor to use split() helper in a few cases that didn't
by atagar＠torproject.org 23 Jun '18

23 Jun '18

commit cbfd53251998531a3592aedc2ed9ebae177d55d9 Author: Dave Rolek <dmr-x(a)riseup.net> Date: Sun May 27 19:48:40 2018 +0000 Refactor to use split() helper in a few cases that didn't There are still a few cases outside stem.client that could be refactored to use the split function. --- stem/client/cell.py | 3 ++- stem/client/datatype.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index 4718a3a6..9f7e8447 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -478,7 +478,8 @@ class CreatedFastCell(CircuitCell): if len(content) != HASH_LEN * 2: raise ValueError('Key material and derivatived key should be %i bytes, but was %i' % (HASH_LEN * 2, len(content))) - return CreatedFastCell(circ_id, content[HASH_LEN:], content[:HASH_LEN]) + key_material, derivative_key = split(content, HASH_LEN) + return CreatedFastCell(circ_id, derivative_key, key_material) def __hash__(self): return _hash_attr(self, 'circ_id', 'derivative_key', 'key_material') diff --git a/stem/client/datatype.py b/stem/client/datatype.py index 9812ced0..59b89bd6 100644 --- a/stem/client/datatype.py +++ b/stem/client/datatype.py @@ -357,7 +357,9 @@ class Size(Field): return struct.unpack(self.format, packed)[0] def pop(self, packed): - return self.unpack(packed[:self.size]), packed[self.size:] + to_unpack, remainder = split(packed, self.size) + + return self.unpack(to_unpack), remainder class Address(Field):

1 0

[stem/master] Refactor: replace magic numbers (sizes) with identifiers
by atagar＠torproject.org 23 Jun '18

23 Jun '18

commit e5eb015771b66705d4e82a851843c1403b39439e Author: Dave Rolek <dmr-x(a)riseup.net> Date: Sun Jun 3 19:32:15 2018 +0000 Refactor: replace magic numbers (sizes) with identifiers Move one of the attributes to a constant while sorting out a merge conflict. --- stem/client/cell.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index 788c4c41..f464cb2d 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -50,6 +50,7 @@ from stem.util import _hash_attr, datetime_to_unix, str_tools FIXED_PAYLOAD_LEN = 509 AUTH_CHALLENGE_SIZE = 32 +RELAY_DIGEST_SIZE = Size.LONG STREAM_ID_REQUIRED = ( RelayCommand.BEGIN, @@ -322,9 +323,11 @@ class RelayCell(CircuitCell): # isinstance() isn't such a great option. With python2/python3 the # name is 'hashlib.HASH' whereas PyPy calls it just 'HASH'. - digest = Size.LONG.unpack(digest.digest()[:4]) + digest_packed = digest.digest()[:RELAY_DIGEST_SIZE.size] + digest = RELAY_DIGEST_SIZE.unpack(digest_packed) elif stem.util._is_str(digest): - digest = Size.LONG.unpack(digest[:4]) + digest_packed = digest[:RELAY_DIGEST_SIZE.size] + digest = RELAY_DIGEST_SIZE.unpack(digest_packed) elif stem.util._is_int(digest): pass else: @@ -549,7 +552,7 @@ class NetinfoCell(Cell): @classmethod def _unpack(cls, content, circ_id, link_protocol): - if len(content) < 4: + if len(content) < Size.LONG.size: raise ValueError('NETINFO cell expected to start with a timestamp') timestamp, content = Size.LONG.pop(content) @@ -708,13 +711,14 @@ class AuthChallengeCell(Cell): @classmethod def _unpack(cls, content, circ_id, link_protocol): - if len(content) < AUTH_CHALLENGE_SIZE + 2: - raise ValueError('AUTH_CHALLENGE payload should be at least 34 bytes, but was %i' % len(content)) + min_size = AUTH_CHALLENGE_SIZE + Size.SHORT.size + if len(content) < min_size: + raise ValueError('AUTH_CHALLENGE payload should be at least %i bytes, but was %i' % (min_size, len(content))) challenge, content = split(content, AUTH_CHALLENGE_SIZE) method_count, content = Size.SHORT.pop(content) - if len(content) < method_count * 2: + if len(content) < method_count * Size.SHORT.size: raise ValueError('AUTH_CHALLENGE should have %i methods, but only had %i bytes for it' % (method_count, len(content))) methods = []

1 0

[stem/master] Add comment for FIXED_PAYLOAD_LEN source in tor-spec
by atagar＠torproject.org 23 Jun '18

23 Jun '18

commit e254e3a815179cdfaf1166edabaa969e8392e597 Author: Dave Rolek <dmr-x(a)riseup.net> Date: Fri Jun 8 20:00:55 2018 +0000 Add comment for FIXED_PAYLOAD_LEN source in tor-spec --- stem/client/cell.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index f464cb2d..4718a3a6 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -48,7 +48,7 @@ from stem import UNDEFINED from stem.client.datatype import HASH_LEN, ZERO, LinkProtocol, Address, Certificate, CloseReason, RelayCommand, Size, split from stem.util import _hash_attr, datetime_to_unix, str_tools -FIXED_PAYLOAD_LEN = 509 +FIXED_PAYLOAD_LEN = 509 # PAYLOAD_LEN, per tor-spec section 0.2 AUTH_CHALLENGE_SIZE = 32 RELAY_DIGEST_SIZE = Size.LONG

1 0

[stem/master] Better validate and test packing cell circ_ids
by atagar＠torproject.org 23 Jun '18

23 Jun '18

commit 47a8ee4bc14bc33c8414d1392775a27eaf7d186f Merge: cbfd5325 1b9cfa79 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 23 11:36:29 2018 -0700 Better validate and test packing cell circ_ids stem/client/cell.py | 14 +++++++++++--- test/unit/client/cell.py | 13 +++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-)

1 0