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

[tor/master] Rename a function; it is used to convert a value _From_ le.
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit d1d66866b2c5e4e7ce246008f62f74d979cd8351 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 19 08:42:28 2018 -0400 Rename a function; it is used to convert a value _From_ le. We can't use htons()/ntohs() -- those are no-ops on exactly the wrong platforms. --- src/lib/crypt_ops/crypto_ope.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c index 47e246127..789517eba 100644 --- a/src/lib/crypt_ops/crypto_ope.c +++ b/src/lib/crypt_ops/crypto_ope.c @@ -49,16 +49,16 @@ struct crypto_ope_t { typedef uint16_t ope_val_t; #ifdef WORDS_BIGENDIAN -/** Convert an OPE value to little-endian */ +/** Convert an OPE value from little-endian. */ static inline ope_val_t -ope_val_to_le(ope_val_t x) +ope_val_from_le(ope_val_t x) { return ((x) >> 8) | (((x)&0xff) << 8); } #else -#define ope_val_to_le(x) (x) +#define ope_val_from_le(x) (x) #endif /** @@ -104,7 +104,7 @@ sum_values_from_cipher(crypto_cipher_t *c, size_t n) crypto_cipher_crypt_inplace(c, (char*)buf, BUFSZ*sizeof(ope_val_t)); for (i = 0; i < BUFSZ; ++i) { - total += ope_val_to_le(buf[i]); + total += ope_val_from_le(buf[i]); total += 1; } n -= BUFSZ; @@ -113,7 +113,7 @@ sum_values_from_cipher(crypto_cipher_t *c, size_t n) memset(buf, 0, n*sizeof(ope_val_t)); crypto_cipher_crypt_inplace(c, (char*)buf, n*sizeof(ope_val_t)); for (i = 0; i < n; ++i) { - total += ope_val_to_le(buf[i]); + total += ope_val_from_le(buf[i]); total += 1; }

1 0

[tor/maint-0.3.5] Merge branch 'ticket28115_035' into maint-0.3.5
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 6851a08090325dc51b26e80350395c4a0c778cf8 Merge: bfab7b9d3 d1d66866b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 24 10:20:41 2018 -0400 Merge branch 'ticket28115_035' into maint-0.3.5 changes/bug28115 | 3 +++ src/lib/crypt_ops/crypto_ope.c | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-)

1 0

[tor/master] Fix a misspelled macro test that was breaking big-endian OPE
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit f8a1dc64f975bcaa74634f4666e448ca3fe88d3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 19 08:41:25 2018 -0400 Fix a misspelled macro test that was breaking big-endian OPE Fixes bug 28115; bugfix on 0.3.5.1-alpha. --- changes/bug28115 | 3 +++ src/lib/crypt_ops/crypto_ope.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug28115 b/changes/bug28115 new file mode 100644 index 000000000..e3e29968e --- /dev/null +++ b/changes/bug28115 @@ -0,0 +1,3 @@ + o Minor bugfixes (portability): + - Make the OPE code (which is used for v3 onion services) run correctly + on big-endian platforms. Fixes bug 28115; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c index fd5d5f377..47e246127 100644 --- a/src/lib/crypt_ops/crypto_ope.c +++ b/src/lib/crypt_ops/crypto_ope.c @@ -48,7 +48,7 @@ struct crypto_ope_t { /** The type to add up in order to produce our OPE ciphertexts */ typedef uint16_t ope_val_t; -#ifdef WORDS_BIG_ENDIAN +#ifdef WORDS_BIGENDIAN /** Convert an OPE value to little-endian */ static inline ope_val_t ope_val_to_le(ope_val_t x)

1 0

[tor/master] Merge branch 'ticket28115_035' into maint-0.3.5
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 6851a08090325dc51b26e80350395c4a0c778cf8 Merge: bfab7b9d3 d1d66866b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 24 10:20:41 2018 -0400 Merge branch 'ticket28115_035' into maint-0.3.5 changes/bug28115 | 3 +++ src/lib/crypt_ops/crypto_ope.c | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-)

1 0

[tor/release-0.3.5] Fix a misspelled macro test that was breaking big-endian OPE
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit f8a1dc64f975bcaa74634f4666e448ca3fe88d3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 19 08:41:25 2018 -0400 Fix a misspelled macro test that was breaking big-endian OPE Fixes bug 28115; bugfix on 0.3.5.1-alpha. --- changes/bug28115 | 3 +++ src/lib/crypt_ops/crypto_ope.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug28115 b/changes/bug28115 new file mode 100644 index 000000000..e3e29968e --- /dev/null +++ b/changes/bug28115 @@ -0,0 +1,3 @@ + o Minor bugfixes (portability): + - Make the OPE code (which is used for v3 onion services) run correctly + on big-endian platforms. Fixes bug 28115; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c index fd5d5f377..47e246127 100644 --- a/src/lib/crypt_ops/crypto_ope.c +++ b/src/lib/crypt_ops/crypto_ope.c @@ -48,7 +48,7 @@ struct crypto_ope_t { /** The type to add up in order to produce our OPE ciphertexts */ typedef uint16_t ope_val_t; -#ifdef WORDS_BIG_ENDIAN +#ifdef WORDS_BIGENDIAN /** Convert an OPE value to little-endian */ static inline ope_val_t ope_val_to_le(ope_val_t x)

1 0

[tor/release-0.3.5] Merge branch 'ticket28115_035' into maint-0.3.5
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit 6851a08090325dc51b26e80350395c4a0c778cf8 Merge: bfab7b9d3 d1d66866b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 24 10:20:41 2018 -0400 Merge branch 'ticket28115_035' into maint-0.3.5 changes/bug28115 | 3 +++ src/lib/crypt_ops/crypto_ope.c | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit b77889fc5f40208a7c79a82c7c6b9d7f48fbcd51 Merge: c6d3bebb1 6851a0809 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 24 10:20:53 2018 -0400 Merge branch 'maint-0.3.5' changes/bug28115 | 3 +++ src/lib/crypt_ops/crypto_ope.c | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-)

1 0

[tor/release-0.3.5] Rename a function; it is used to convert a value _From_ le.
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit d1d66866b2c5e4e7ce246008f62f74d979cd8351 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 19 08:42:28 2018 -0400 Rename a function; it is used to convert a value _From_ le. We can't use htons()/ntohs() -- those are no-ops on exactly the wrong platforms. --- src/lib/crypt_ops/crypto_ope.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c index 47e246127..789517eba 100644 --- a/src/lib/crypt_ops/crypto_ope.c +++ b/src/lib/crypt_ops/crypto_ope.c @@ -49,16 +49,16 @@ struct crypto_ope_t { typedef uint16_t ope_val_t; #ifdef WORDS_BIGENDIAN -/** Convert an OPE value to little-endian */ +/** Convert an OPE value from little-endian. */ static inline ope_val_t -ope_val_to_le(ope_val_t x) +ope_val_from_le(ope_val_t x) { return ((x) >> 8) | (((x)&0xff) << 8); } #else -#define ope_val_to_le(x) (x) +#define ope_val_from_le(x) (x) #endif /** @@ -104,7 +104,7 @@ sum_values_from_cipher(crypto_cipher_t *c, size_t n) crypto_cipher_crypt_inplace(c, (char*)buf, BUFSZ*sizeof(ope_val_t)); for (i = 0; i < BUFSZ; ++i) { - total += ope_val_to_le(buf[i]); + total += ope_val_from_le(buf[i]); total += 1; } n -= BUFSZ; @@ -113,7 +113,7 @@ sum_values_from_cipher(crypto_cipher_t *c, size_t n) memset(buf, 0, n*sizeof(ope_val_t)); crypto_cipher_crypt_inplace(c, (char*)buf, n*sizeof(ope_val_t)); for (i = 0; i < n; ++i) { - total += ope_val_to_le(buf[i]); + total += ope_val_from_le(buf[i]); total += 1; }

1 0

[tor/maint-0.3.5] Fix a misspelled macro test that was breaking big-endian OPE
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit f8a1dc64f975bcaa74634f4666e448ca3fe88d3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 19 08:41:25 2018 -0400 Fix a misspelled macro test that was breaking big-endian OPE Fixes bug 28115; bugfix on 0.3.5.1-alpha. --- changes/bug28115 | 3 +++ src/lib/crypt_ops/crypto_ope.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug28115 b/changes/bug28115 new file mode 100644 index 000000000..e3e29968e --- /dev/null +++ b/changes/bug28115 @@ -0,0 +1,3 @@ + o Minor bugfixes (portability): + - Make the OPE code (which is used for v3 onion services) run correctly + on big-endian platforms. Fixes bug 28115; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c index fd5d5f377..47e246127 100644 --- a/src/lib/crypt_ops/crypto_ope.c +++ b/src/lib/crypt_ops/crypto_ope.c @@ -48,7 +48,7 @@ struct crypto_ope_t { /** The type to add up in order to produce our OPE ciphertexts */ typedef uint16_t ope_val_t; -#ifdef WORDS_BIG_ENDIAN +#ifdef WORDS_BIGENDIAN /** Convert an OPE value to little-endian */ static inline ope_val_t ope_val_to_le(ope_val_t x)

1 0

[tor/maint-0.3.5] Rename a function; it is used to convert a value _From_ le.
by nickm＠torproject.org 24 Oct '18

24 Oct '18

commit d1d66866b2c5e4e7ce246008f62f74d979cd8351 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 19 08:42:28 2018 -0400 Rename a function; it is used to convert a value _From_ le. We can't use htons()/ntohs() -- those are no-ops on exactly the wrong platforms. --- src/lib/crypt_ops/crypto_ope.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c index 47e246127..789517eba 100644 --- a/src/lib/crypt_ops/crypto_ope.c +++ b/src/lib/crypt_ops/crypto_ope.c @@ -49,16 +49,16 @@ struct crypto_ope_t { typedef uint16_t ope_val_t; #ifdef WORDS_BIGENDIAN -/** Convert an OPE value to little-endian */ +/** Convert an OPE value from little-endian. */ static inline ope_val_t -ope_val_to_le(ope_val_t x) +ope_val_from_le(ope_val_t x) { return ((x) >> 8) | (((x)&0xff) << 8); } #else -#define ope_val_to_le(x) (x) +#define ope_val_from_le(x) (x) #endif /** @@ -104,7 +104,7 @@ sum_values_from_cipher(crypto_cipher_t *c, size_t n) crypto_cipher_crypt_inplace(c, (char*)buf, BUFSZ*sizeof(ope_val_t)); for (i = 0; i < BUFSZ; ++i) { - total += ope_val_to_le(buf[i]); + total += ope_val_from_le(buf[i]); total += 1; } n -= BUFSZ; @@ -113,7 +113,7 @@ sum_values_from_cipher(crypto_cipher_t *c, size_t n) memset(buf, 0, n*sizeof(ope_val_t)); crypto_cipher_crypt_inplace(c, (char*)buf, n*sizeof(ope_val_t)); for (i = 0; i < n; ++i) { - total += ope_val_to_le(buf[i]); + total += ope_val_from_le(buf[i]); total += 1; }

1 0