date:20190405

[tor-commits] [tor/maint-0.4.0] NSS: disable TLS1.2 SHA-384 ciphersuites.

2019-04-05 Thread teor

commit 5cb94cbf9d89804ea37a2f1e68d354a86edb223e
Author: Nick Mathewson 
Date:   Fri Mar 29 13:38:48 2019 -0400

NSS: disable TLS1.2 SHA-384 ciphersuites.

In current NSS versions, these ciphersuites don't work with
SSL_ExportKeyingMaterial(), which was causing relays to fail when
they tried to negotiate the v3 link protocol authentication.

Fixes bug 29241; bugfix on 0.4.0.1-alpha.
---
 changes/bug29241 |  6 ++
 src/lib/tls/tortls_nss.c | 32 
 2 files changed, 38 insertions(+)

diff --git a/changes/bug29241 b/changes/bug29241
new file mode 100644
index 0..13951d116
--- /dev/null
+++ b/changes/bug29241
@@ -0,0 +1,6 @@
+  o Major bugfixes (NSS, relay):
+- When running with NSS, disable TLS 1.2 ciphersuites that use SHA384
+  for their PRF. Due to an NSS bug, the TLS key exporters for these
+  ciphersuites don't work -- which caused relays to fail to handshake
+  with one another when these ciphersuites were enabled.
+  Fixes bug 29241; bugfix on 0.4.0.1-alpha.
diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c
index 4e107fae7..3c62e98df 100644
--- a/src/lib/tls/tortls_nss.c
+++ b/src/lib/tls/tortls_nss.c
@@ -152,6 +152,32 @@ we_like_auth_type(SSLAuthType at)
   }
 }
 
+/**
+ * Return true iff this ciphersuite will be hit by a mozilla bug 1312976,
+ * which makes TLS key exporters not work with TLS 1.2 non-SHA256
+ * ciphersuites.
+ **/
+static bool
+ciphersuite_has_nss_export_bug(const SSLCipherSuiteInfo *info)
+{
+  /* For more information on the bug, see
+ https://bugzilla.mozilla.org/show_bug.cgi?id=1312976 */
+
+  /* This bug only exists in TLS 1.2. */
+  if (info->authType == ssl_auth_tls13_any)
+return false;
+
+  /* Sadly, there's no way to get this information from the
+   * CipherSuiteInfo object itself other than by looking at the
+   * name.  */
+  if (strstr(info->cipherSuiteName, "_SHA384") ||
+  strstr(info->cipherSuiteName, "_SHA512")) {
+return true;
+  }
+
+  return false;
+}
+
 tor_tls_context_t *
 tor_tls_context_new(crypto_pk_t *identity,
 unsigned int key_lifetime, unsigned flags, int is_client)
@@ -256,6 +282,12 @@ tor_tls_context_new(crypto_pk_t *identity,
 !we_like_mac_algorithm(info.macAlgorithm) ||
 !we_like_auth_type(info.authType)/* Requires NSS 3.24 */;
 
+  if (ciphersuite_has_nss_export_bug()) {
+/* SSL_ExportKeyingMaterial will fail; we can't use this cipher.
+ */
+disable = 1;
+  }
+
   s = SSL_CipherPrefSet(ctx->ctx, ciphers[i],
 disable ? PR_FALSE : PR_TRUE);
   if (s != SECSuccess)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.0] NSS: Log an error message when SSL_ExportKeyingMaterial() fails

2019-04-05 Thread teor

commit 680fd3f8fb7157432398a3552ee9c98c72bd7397
Author: Nick Mathewson 
Date:   Fri Mar 29 13:38:14 2019 -0400

NSS: Log an error message when SSL_ExportKeyingMaterial() fails

Diagnostic for 29241.
---
 changes/29241_diagnostic | 4 
 src/lib/tls/tortls_nss.c | 8 
 2 files changed, 12 insertions(+)

diff --git a/changes/29241_diagnostic b/changes/29241_diagnostic
new file mode 100644
index 0..1e3865495
--- /dev/null
+++ b/changes/29241_diagnostic
@@ -0,0 +1,4 @@
+  o Minor features (NSS, diagnostic):
+- Try to log an error from NSS (if there is any) and a more useful
+  description of our situation if we are using NSS and a call to
+  SSL_ExportKeyingMaterial() fails.  Diagnostic for ticket 29241.
diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c
index 00c4af0e9..4e107fae7 100644
--- a/src/lib/tls/tortls_nss.c
+++ b/src/lib/tls/tortls_nss.c
@@ -726,10 +726,18 @@ tor_tls_export_key_material,(tor_tls_t *tls, uint8_t 
*secrets_out,
   tor_assert(context_len <= UINT_MAX);
 
   SECStatus s;
+  /* Make sure that the error code is set here, so that we can be sure that
+   * any error code set after a failure was in fact caused by
+   * SSL_ExportKeyingMaterial. */
+  PR_SetError(PR_UNKNOWN_ERROR, 0);
   s = SSL_ExportKeyingMaterial(tls->ssl,
label, (unsigned)strlen(label),
PR_TRUE, context, (unsigned)context_len,
secrets_out, DIGEST256_LEN);
+  if (s != SECSuccess) {
+tls_log_errors(tls, LOG_WARN, LD_CRYPTO,
+   "exporting key material for a TLS handshake");
+  }
 
   return (s == SECSuccess) ? 0 : -1;
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] NSS: Log an error message when SSL_ExportKeyingMaterial() fails

2019-04-05 Thread teor

commit 680fd3f8fb7157432398a3552ee9c98c72bd7397
Author: Nick Mathewson 
Date:   Fri Mar 29 13:38:14 2019 -0400

NSS: Log an error message when SSL_ExportKeyingMaterial() fails

Diagnostic for 29241.
---
 changes/29241_diagnostic | 4 
 src/lib/tls/tortls_nss.c | 8 
 2 files changed, 12 insertions(+)

diff --git a/changes/29241_diagnostic b/changes/29241_diagnostic
new file mode 100644
index 0..1e3865495
--- /dev/null
+++ b/changes/29241_diagnostic
@@ -0,0 +1,4 @@
+  o Minor features (NSS, diagnostic):
+- Try to log an error from NSS (if there is any) and a more useful
+  description of our situation if we are using NSS and a call to
+  SSL_ExportKeyingMaterial() fails.  Diagnostic for ticket 29241.
diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c
index 00c4af0e9..4e107fae7 100644
--- a/src/lib/tls/tortls_nss.c
+++ b/src/lib/tls/tortls_nss.c
@@ -726,10 +726,18 @@ tor_tls_export_key_material,(tor_tls_t *tls, uint8_t 
*secrets_out,
   tor_assert(context_len <= UINT_MAX);
 
   SECStatus s;
+  /* Make sure that the error code is set here, so that we can be sure that
+   * any error code set after a failure was in fact caused by
+   * SSL_ExportKeyingMaterial. */
+  PR_SetError(PR_UNKNOWN_ERROR, 0);
   s = SSL_ExportKeyingMaterial(tls->ssl,
label, (unsigned)strlen(label),
PR_TRUE, context, (unsigned)context_len,
secrets_out, DIGEST256_LEN);
+  if (s != SECSuccess) {
+tls_log_errors(tls, LOG_WARN, LD_CRYPTO,
+   "exporting key material for a TLS handshake");
+  }
 
   return (s == SECSuccess) ? 0 : -1;
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] NSS: disable TLS1.2 SHA-384 ciphersuites.

2019-04-05 Thread teor

commit 5cb94cbf9d89804ea37a2f1e68d354a86edb223e
Author: Nick Mathewson 
Date:   Fri Mar 29 13:38:48 2019 -0400

NSS: disable TLS1.2 SHA-384 ciphersuites.

In current NSS versions, these ciphersuites don't work with
SSL_ExportKeyingMaterial(), which was causing relays to fail when
they tried to negotiate the v3 link protocol authentication.

Fixes bug 29241; bugfix on 0.4.0.1-alpha.
---
 changes/bug29241 |  6 ++
 src/lib/tls/tortls_nss.c | 32 
 2 files changed, 38 insertions(+)

diff --git a/changes/bug29241 b/changes/bug29241
new file mode 100644
index 0..13951d116
--- /dev/null
+++ b/changes/bug29241
@@ -0,0 +1,6 @@
+  o Major bugfixes (NSS, relay):
+- When running with NSS, disable TLS 1.2 ciphersuites that use SHA384
+  for their PRF. Due to an NSS bug, the TLS key exporters for these
+  ciphersuites don't work -- which caused relays to fail to handshake
+  with one another when these ciphersuites were enabled.
+  Fixes bug 29241; bugfix on 0.4.0.1-alpha.
diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c
index 4e107fae7..3c62e98df 100644
--- a/src/lib/tls/tortls_nss.c
+++ b/src/lib/tls/tortls_nss.c
@@ -152,6 +152,32 @@ we_like_auth_type(SSLAuthType at)
   }
 }
 
+/**
+ * Return true iff this ciphersuite will be hit by a mozilla bug 1312976,
+ * which makes TLS key exporters not work with TLS 1.2 non-SHA256
+ * ciphersuites.
+ **/
+static bool
+ciphersuite_has_nss_export_bug(const SSLCipherSuiteInfo *info)
+{
+  /* For more information on the bug, see
+ https://bugzilla.mozilla.org/show_bug.cgi?id=1312976 */
+
+  /* This bug only exists in TLS 1.2. */
+  if (info->authType == ssl_auth_tls13_any)
+return false;
+
+  /* Sadly, there's no way to get this information from the
+   * CipherSuiteInfo object itself other than by looking at the
+   * name.  */
+  if (strstr(info->cipherSuiteName, "_SHA384") ||
+  strstr(info->cipherSuiteName, "_SHA512")) {
+return true;
+  }
+
+  return false;
+}
+
 tor_tls_context_t *
 tor_tls_context_new(crypto_pk_t *identity,
 unsigned int key_lifetime, unsigned flags, int is_client)
@@ -256,6 +282,12 @@ tor_tls_context_new(crypto_pk_t *identity,
 !we_like_mac_algorithm(info.macAlgorithm) ||
 !we_like_auth_type(info.authType)/* Requires NSS 3.24 */;
 
+  if (ciphersuite_has_nss_export_bug()) {
+/* SSL_ExportKeyingMaterial will fail; we can't use this cipher.
+ */
+disable = 1;
+  }
+
   s = SSL_CipherPrefSet(ctx->ctx, ciphers[i],
 disable ? PR_FALSE : PR_TRUE);
   if (s != SECSuccess)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/911' into maint-0.4.0

2019-04-05 Thread teor

commit b100c9e9800c1d504c2d69d556642189c39d099d
Merge: 8b3b605a1 4dd96f744
Author: teor 
Date:   Sat Apr 6 12:15:41 2019 +1000

Merge remote-tracking branch 'tor-github/pr/911' into maint-0.4.0

 changes/29241_diagnostic |  4 
 changes/bug29241 |  6 ++
 src/lib/tls/tortls_nss.c | 40 
 3 files changed, 50 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alpha

2019-04-05 Thread teor

commit 4dd96f7b0eeb8b3b2c36f6f129e464d4
Author: teor 
Date:   Sat Apr 6 11:07:20 2019 +1000

changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alpha
---
 changes/bug29241 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/bug29241 b/changes/bug29241
index 13951d116..7f25e154d 100644
--- a/changes/bug29241
+++ b/changes/bug29241
@@ -3,4 +3,4 @@
   for their PRF. Due to an NSS bug, the TLS key exporters for these
   ciphersuites don't work -- which caused relays to fail to handshake
   with one another when these ciphersuites were enabled.
-  Fixes bug 29241; bugfix on 0.4.0.1-alpha.
+  Fixes bug 29241; bugfix on 0.3.5.1-alpha.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

2019-04-05 Thread teor

commit a51f5b9b3631fea573229787f463b2b2c2ffb5c3
Merge: 6428fa359 b100c9e98
Author: teor 
Date:   Sat Apr 6 12:16:01 2019 +1000

Merge branch 'maint-0.4.0' into release-0.4.0

 changes/29241_diagnostic |  4 
 changes/bug29241 |  6 ++
 src/lib/tls/tortls_nss.c | 40 
 3 files changed, 50 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/911' into maint-0.4.0

2019-04-05 Thread teor

commit b100c9e9800c1d504c2d69d556642189c39d099d
Merge: 8b3b605a1 4dd96f744
Author: teor 
Date:   Sat Apr 6 12:15:41 2019 +1000

Merge remote-tracking branch 'tor-github/pr/911' into maint-0.4.0

 changes/29241_diagnostic |  4 
 changes/bug29241 |  6 ++
 src/lib/tls/tortls_nss.c | 40 
 3 files changed, 50 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.0] changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alpha

2019-04-05 Thread teor

commit 4dd96f7b0eeb8b3b2c36f6f129e464d4
Author: teor 
Date:   Sat Apr 6 11:07:20 2019 +1000

changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alpha
---
 changes/bug29241 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/bug29241 b/changes/bug29241
index 13951d116..7f25e154d 100644
--- a/changes/bug29241
+++ b/changes/bug29241
@@ -3,4 +3,4 @@
   for their PRF. Due to an NSS bug, the TLS key exporters for these
   ciphersuites don't work -- which caused relays to fail to handshake
   with one another when these ciphersuites were enabled.
-  Fixes bug 29241; bugfix on 0.4.0.1-alpha.
+  Fixes bug 29241; bugfix on 0.3.5.1-alpha.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/911' into maint-0.4.0

2019-04-05 Thread teor

commit b100c9e9800c1d504c2d69d556642189c39d099d
Merge: 8b3b605a1 4dd96f744
Author: teor 
Date:   Sat Apr 6 12:15:41 2019 +1000

Merge remote-tracking branch 'tor-github/pr/911' into maint-0.4.0

 changes/29241_diagnostic |  4 
 changes/bug29241 |  6 ++
 src/lib/tls/tortls_nss.c | 40 
 3 files changed, 50 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alpha

2019-04-05 Thread teor

commit 4dd96f7b0eeb8b3b2c36f6f129e464d4
Author: teor 
Date:   Sat Apr 6 11:07:20 2019 +1000

changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alpha
---
 changes/bug29241 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/bug29241 b/changes/bug29241
index 13951d116..7f25e154d 100644
--- a/changes/bug29241
+++ b/changes/bug29241
@@ -3,4 +3,4 @@
   for their PRF. Due to an NSS bug, the TLS key exporters for these
   ciphersuites don't work -- which caused relays to fail to handshake
   with one another when these ciphersuites were enabled.
-  Fixes bug 29241; bugfix on 0.4.0.1-alpha.
+  Fixes bug 29241; bugfix on 0.3.5.1-alpha.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] practracker: accept 6 extra lines in tortls_nss.c:tor_tls_context_new()

2019-04-05 Thread teor

commit 7741b21d0e3afbfc6d60a852fce6992724c4ae71
Author: teor 
Date:   Sat Apr 6 12:19:47 2019 +1000

practracker: accept 6 extra lines in tortls_nss.c:tor_tls_context_new()

These lines were added to fix bug 29241.
---
 scripts/maint/practracker/exceptions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index 8d6464e3f..678d97849 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -282,7 +282,7 @@ problem function-size 
/src/lib/process/restrict.c:set_max_file_descriptors() 102
 problem function-size /src/lib/process/setuid.c:switch_id() 156
 problem function-size /src/lib/sandbox/sandbox.c:prot_strings() 104
 problem function-size /src/lib/string/scanf.c:tor_vsscanf() 112
-problem function-size /src/lib/tls/tortls_nss.c:tor_tls_context_new() 147
+problem function-size /src/lib/tls/tortls_nss.c:tor_tls_context_new() 153
 problem function-size /src/lib/tls/tortls_openssl.c:tor_tls_context_new() 171
 problem function-size 
/src/lib/tls/x509_nss.c:tor_tls_create_certificate_internal() 126
 problem function-size /src/tools/tor-gencert.c:parse_commandline() 111

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] NSS: Log an error message when SSL_ExportKeyingMaterial() fails

2019-04-05 Thread teor

commit 680fd3f8fb7157432398a3552ee9c98c72bd7397
Author: Nick Mathewson 
Date:   Fri Mar 29 13:38:14 2019 -0400

NSS: Log an error message when SSL_ExportKeyingMaterial() fails

Diagnostic for 29241.
---
 changes/29241_diagnostic | 4 
 src/lib/tls/tortls_nss.c | 8 
 2 files changed, 12 insertions(+)

diff --git a/changes/29241_diagnostic b/changes/29241_diagnostic
new file mode 100644
index 0..1e3865495
--- /dev/null
+++ b/changes/29241_diagnostic
@@ -0,0 +1,4 @@
+  o Minor features (NSS, diagnostic):
+- Try to log an error from NSS (if there is any) and a more useful
+  description of our situation if we are using NSS and a call to
+  SSL_ExportKeyingMaterial() fails.  Diagnostic for ticket 29241.
diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c
index 00c4af0e9..4e107fae7 100644
--- a/src/lib/tls/tortls_nss.c
+++ b/src/lib/tls/tortls_nss.c
@@ -726,10 +726,18 @@ tor_tls_export_key_material,(tor_tls_t *tls, uint8_t 
*secrets_out,
   tor_assert(context_len <= UINT_MAX);
 
   SECStatus s;
+  /* Make sure that the error code is set here, so that we can be sure that
+   * any error code set after a failure was in fact caused by
+   * SSL_ExportKeyingMaterial. */
+  PR_SetError(PR_UNKNOWN_ERROR, 0);
   s = SSL_ExportKeyingMaterial(tls->ssl,
label, (unsigned)strlen(label),
PR_TRUE, context, (unsigned)context_len,
secrets_out, DIGEST256_LEN);
+  if (s != SECSuccess) {
+tls_log_errors(tls, LOG_WARN, LD_CRYPTO,
+   "exporting key material for a TLS handshake");
+  }
 
   return (s == SECSuccess) ? 0 : -1;
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-05 Thread teor

commit 4cffc7fe9cfff03a122ddecc3447136f8a82387b
Merge: f213a35b2 b100c9e98
Author: teor 
Date:   Sat Apr 6 12:23:25 2019 +1000

Merge branch 'maint-0.4.0'

 changes/29241_diagnostic |  4 
 changes/bug29241 |  6 ++
 src/lib/tls/tortls_nss.c | 40 
 3 files changed, 50 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] NSS: disable TLS1.2 SHA-384 ciphersuites.

2019-04-05 Thread teor

commit 5cb94cbf9d89804ea37a2f1e68d354a86edb223e
Author: Nick Mathewson 
Date:   Fri Mar 29 13:38:48 2019 -0400

NSS: disable TLS1.2 SHA-384 ciphersuites.

In current NSS versions, these ciphersuites don't work with
SSL_ExportKeyingMaterial(), which was causing relays to fail when
they tried to negotiate the v3 link protocol authentication.

Fixes bug 29241; bugfix on 0.4.0.1-alpha.
---
 changes/bug29241 |  6 ++
 src/lib/tls/tortls_nss.c | 32 
 2 files changed, 38 insertions(+)

diff --git a/changes/bug29241 b/changes/bug29241
new file mode 100644
index 0..13951d116
--- /dev/null
+++ b/changes/bug29241
@@ -0,0 +1,6 @@
+  o Major bugfixes (NSS, relay):
+- When running with NSS, disable TLS 1.2 ciphersuites that use SHA384
+  for their PRF. Due to an NSS bug, the TLS key exporters for these
+  ciphersuites don't work -- which caused relays to fail to handshake
+  with one another when these ciphersuites were enabled.
+  Fixes bug 29241; bugfix on 0.4.0.1-alpha.
diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c
index 4e107fae7..3c62e98df 100644
--- a/src/lib/tls/tortls_nss.c
+++ b/src/lib/tls/tortls_nss.c
@@ -152,6 +152,32 @@ we_like_auth_type(SSLAuthType at)
   }
 }
 
+/**
+ * Return true iff this ciphersuite will be hit by a mozilla bug 1312976,
+ * which makes TLS key exporters not work with TLS 1.2 non-SHA256
+ * ciphersuites.
+ **/
+static bool
+ciphersuite_has_nss_export_bug(const SSLCipherSuiteInfo *info)
+{
+  /* For more information on the bug, see
+ https://bugzilla.mozilla.org/show_bug.cgi?id=1312976 */
+
+  /* This bug only exists in TLS 1.2. */
+  if (info->authType == ssl_auth_tls13_any)
+return false;
+
+  /* Sadly, there's no way to get this information from the
+   * CipherSuiteInfo object itself other than by looking at the
+   * name.  */
+  if (strstr(info->cipherSuiteName, "_SHA384") ||
+  strstr(info->cipherSuiteName, "_SHA512")) {
+return true;
+  }
+
+  return false;
+}
+
 tor_tls_context_t *
 tor_tls_context_new(crypto_pk_t *identity,
 unsigned int key_lifetime, unsigned flags, int is_client)
@@ -256,6 +282,12 @@ tor_tls_context_new(crypto_pk_t *identity,
 !we_like_mac_algorithm(info.macAlgorithm) ||
 !we_like_auth_type(info.authType)/* Requires NSS 3.24 */;
 
+  if (ciphersuite_has_nss_export_bug()) {
+/* SSL_ExportKeyingMaterial will fail; we can't use this cipher.
+ */
+disable = 1;
+  }
+
   s = SSL_CipherPrefSet(ctx->ctx, ciphers[i],
 disable ? PR_FALSE : PR_TRUE);
   if (s != SECSuccess)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tpo-web_completed] Update translations for tpo-web_completed

2019-04-05 Thread translation

commit 349db56422c61c4495ceea2235dd6df93ec9d3bb
Author: Translation commit bot 
Date:   Sat Apr 6 00:50:41 2019 +

Update translations for tpo-web_completed
---
 contents+pt-BR.po | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 4f8357300..a622e2522 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -2,7 +2,6 @@
 # Danton Medrado, 2019
 # Joeffison SilvÃ©rio de Andrade , 2019
 # Gutem , 2019
-# Eduardo Addad de Oliveira , 2019
 # erinm, 2019
 # Greg Strider , 2019
 # Hildeberto Abreu MagalhÃ£es , 2019
@@ -11,6 +10,7 @@
 # Communia , 2019
 # Danihells , 2019
 # Emma Peel, 2019
+# Eduardo Addad de Oliveira , 2019
 # 
 msgid ""
 msgstr ""
@@ -18,7 +18,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-02 10:45+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Eduardo Addad de Oliveira , 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -869,7 +869,7 @@ msgstr "OpÃ§Ãµes AvanÃ§adas de InstalaÃ§Ã£o"
 
 #: templates/hero-download.html:42
 msgid "Download Source Tarball"
-msgstr ""
+msgstr "Baixar Source Tarball"
 
 #: templates/hero-download.html:45
 msgid "Read the latest release announcements"
@@ -938,6 +938,9 @@ msgid ""
 "Tor Browser aims to make all users look the same making it difficult for you"
 " to be fingerprinted based on your browser and device information."
 msgstr ""
+"O Navegador Tor visa fazer com que todos os usuÃ¡rios tenham a mesma "
+"aparÃªncia, dificultando a impressÃ£o digital com base nas informaÃ§Ãµes do "
+"navegador e do dispositivo."
 
 #: templates/home.html:58
 msgid "Multi-layered Encryption"
@@ -998,7 +1001,7 @@ msgstr ""
 
 #: templates/meta.html:11
 msgid "The Tor Project | Privacy & Freedom Online"
-msgstr ""
+msgstr "O Projeto Tor | Privacidade e Liberdade Online"
 
 #: templates/meta.html:17
 msgid "Tor Project"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-04-05 Thread translation

commit dfd9987e017741be678fc6f1fdda1368aeafd4f0
Author: Translation commit bot 
Date:   Sat Apr 6 00:50:35 2019 +

Update translations for tpo-web
---
 contents+pt-BR.po | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 4f8357300..a622e2522 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -2,7 +2,6 @@
 # Danton Medrado, 2019
 # Joeffison SilvÃ©rio de Andrade , 2019
 # Gutem , 2019
-# Eduardo Addad de Oliveira , 2019
 # erinm, 2019
 # Greg Strider , 2019
 # Hildeberto Abreu MagalhÃ£es , 2019
@@ -11,6 +10,7 @@
 # Communia , 2019
 # Danihells , 2019
 # Emma Peel, 2019
+# Eduardo Addad de Oliveira , 2019
 # 
 msgid ""
 msgstr ""
@@ -18,7 +18,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-02 10:45+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Eduardo Addad de Oliveira , 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -869,7 +869,7 @@ msgstr "OpÃ§Ãµes AvanÃ§adas de InstalaÃ§Ã£o"
 
 #: templates/hero-download.html:42
 msgid "Download Source Tarball"
-msgstr ""
+msgstr "Baixar Source Tarball"
 
 #: templates/hero-download.html:45
 msgid "Read the latest release announcements"
@@ -938,6 +938,9 @@ msgid ""
 "Tor Browser aims to make all users look the same making it difficult for you"
 " to be fingerprinted based on your browser and device information."
 msgstr ""
+"O Navegador Tor visa fazer com que todos os usuÃ¡rios tenham a mesma "
+"aparÃªncia, dificultando a impressÃ£o digital com base nas informaÃ§Ãµes do "
+"navegador e do dispositivo."
 
 #: templates/home.html:58
 msgid "Multi-layered Encryption"
@@ -998,7 +1001,7 @@ msgstr ""
 
 #: templates/meta.html:11
 msgid "The Tor Project | Privacy & Freedom Online"
-msgstr ""
+msgstr "O Projeto Tor | Privacidade e Liberdade Online"
 
 #: templates/meta.html:17
 msgid "Tor Project"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

2019-04-05 Thread translation

commit 88d2cc4a81b2ff28b0dae2ee0aa075e1af572f25
Author: Translation commit bot 
Date:   Sat Apr 6 00:49:34 2019 +

Update translations for torbutton-browseronboardingproperties
---
 pt-BR/browserOnboarding.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pt-BR/browserOnboarding.properties 
b/pt-BR/browserOnboarding.properties
index f2d95ca22..6b76ab493 100644
--- a/pt-BR/browserOnboarding.properties
+++ b/pt-BR/browserOnboarding.properties
@@ -41,17 +41,17 @@ onboarding.tour-tor-onion-services.description=ServiÃ§os 
Onion sÃ£o sites que te
 onboarding.tour-tor-onion-services.button=Visitar um endereÃ§o Onion
 onboarding.tour-tor-onion-services.next-button=Feito
 
-onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S
+onboarding.overlay-icon-tooltip-updated2=Veja o que Ã© novo\nem %S
 onboarding.tour-tor-update.prefix-new=Novo
 onboarding.tour-tor-update.prefix-updated=Atualizado
 
-onboarding.tour-tor-toolbar=Toolbar
-onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout
-onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser 
toolbar layout. We moved the Torbutton icon after the URL bar, and we added a 
security level icon next to it.
+onboarding.tour-tor-toolbar=Barra de ferramentas
+onboarding.tour-tor-toolbar-update-8.5.title=Layout da barra de ferramentas
+onboarding.tour-tor-toolbar-update-8.5.description=Melhoramos o layout da 
barra de ferramentas do navegador. Movemos o Ãcone do Torbutton apÃ³s a barra 
de URL e adicionamos um Ãcone de nÃvel de seguranÃ§a ao lado dele.
 onboarding.tour-tor-toolbar-update-8.5.next-button=VÃ¡ para seguranÃ§a
 
-onboarding.tour-tor-security-update-8.5.title=Security level experience
-onboarding.tour-tor-security-update-8.5.description=We improved how you see 
and set your security level. We replaced the security slider with a toolbar 
icon that makes your current level visible at all times. Click it to view 
details about your current level or to change your security settings.
+onboarding.tour-tor-security-update-8.5.title=ExperiÃªncia de nÃvel de 
seguranÃ§a
+onboarding.tour-tor-security-update-8.5.description=Melhoramos a maneira de 
ver e definir seu nÃvel de seguranÃ§a. SubstituÃmos o controle deslizante de 
seguranÃ§a por um Ãcone da barra de ferramentas que torna seu nÃvel atual 
visÃvel o tempo todo. Clique para ver os detalhes do seu nÃvel atual ou para 
alterar suas configuraÃ§Ãµes de seguranÃ§a.
 
 # Circuit Display onboarding.
 onboarding.tor-circuit-display.next=PrÃ³ximo

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed

2019-04-05 Thread translation

commit 393259eddae82abac859f6edd211767ddc629854
Author: Translation commit bot 
Date:   Sat Apr 6 00:49:42 2019 +

Update translations for torbutton-browseronboardingproperties_completed
---
 pt-BR/browserOnboarding.properties | 12 
 1 file changed, 12 insertions(+)

diff --git a/pt-BR/browserOnboarding.properties 
b/pt-BR/browserOnboarding.properties
index 8614cb033..6b76ab493 100644
--- a/pt-BR/browserOnboarding.properties
+++ b/pt-BR/browserOnboarding.properties
@@ -41,6 +41,18 @@ onboarding.tour-tor-onion-services.description=ServiÃ§os 
Onion sÃ£o sites que te
 onboarding.tour-tor-onion-services.button=Visitar um endereÃ§o Onion
 onboarding.tour-tor-onion-services.next-button=Feito
 
+onboarding.overlay-icon-tooltip-updated2=Veja o que Ã© novo\nem %S
+onboarding.tour-tor-update.prefix-new=Novo
+onboarding.tour-tor-update.prefix-updated=Atualizado
+
+onboarding.tour-tor-toolbar=Barra de ferramentas
+onboarding.tour-tor-toolbar-update-8.5.title=Layout da barra de ferramentas
+onboarding.tour-tor-toolbar-update-8.5.description=Melhoramos o layout da 
barra de ferramentas do navegador. Movemos o Ãcone do Torbutton apÃ³s a barra 
de URL e adicionamos um Ãcone de nÃvel de seguranÃ§a ao lado dele.
+onboarding.tour-tor-toolbar-update-8.5.next-button=VÃ¡ para seguranÃ§a
+
+onboarding.tour-tor-security-update-8.5.title=ExperiÃªncia de nÃvel de 
seguranÃ§a
+onboarding.tour-tor-security-update-8.5.description=Melhoramos a maneira de 
ver e definir seu nÃvel de seguranÃ§a. SubstituÃmos o controle deslizante de 
seguranÃ§a por um Ãcone da barra de ferramentas que torna seu nÃvel atual 
visÃvel o tempo todo. Clique para ver os detalhes do seu nÃvel atual ou para 
alterar suas configuraÃ§Ãµes de seguranÃ§a.
+
 # Circuit Display onboarding.
 onboarding.tor-circuit-display.next=PrÃ³ximo
 onboarding.tor-circuit-display.done=Feito

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2019-04-05 Thread translation

commit 393f8231c8167b73b3f9339eb01d4c2ed6d96d98
Author: Translation commit bot 
Date:   Sat Apr 6 00:15:23 2019 +

Update translations for bridgedb_completed
---
 uk/LC_MESSAGES/bridgedb.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/uk/LC_MESSAGES/bridgedb.po b/uk/LC_MESSAGES/bridgedb.po
index aa604ea8e..7edd38e2a 100644
--- a/uk/LC_MESSAGES/bridgedb.po
+++ b/uk/LC_MESSAGES/bridgedb.po
@@ -3,20 +3,21 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Bogdan Kulynych , 2019
 # Eugene ghostishev, 2014
 # LinuxChata, 2014-2015
 # Oleksii Golub , 2015
 # Oleksii Golub , 2013
 # Vira Motorko , 2017
-# Yasha, 2015
+# f5a88f9e30127107e3f9ea67ac1be70b, 2015
 # ÐÐ½Ð´ÑÑÐ¹ ÐÐ°Ð½Ð´ÑÑÐ° , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2019-01-15 12:20+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-04-05 23:58+\n"
+"Last-Translator: Bogdan Kulynych \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,21 +76,21 @@ msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ Ð°Ð´ÑÐµÑ 
ÑÐµÑÑÐ°Ð½ÑÐ»ÑÑÐ¾ÑÑÐ²"
 #: bridgedb/https/templates/bridges.html:67
 #: bridgedb/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
-msgstr "ÐÐ¹-Ð¾Ð¹, spaghettios!"
+msgstr "ÐÑÐ°ÐºÐ¾Ñ!"
 
 #: bridgedb/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
-msgstr "ÐÐ´Ð°ÑÑÑÑÑ, Ð±ÑÐ»Ð¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ñ Ð¾ÑÑÐ¸Ð¼Ð°Ð½Ð½Ñ 
Ð²Ð°ÑÐ¾Ð³Ð¾ QR-ÐºÐ¾Ð´."
+msgstr "ÐÐ´Ð°ÑÑÑÑÑ, ÑÐ¾ ÑÑÐ°Ð»Ð°ÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ 
Ð¾ÑÑÐ¸Ð¼Ð°Ð½Ð½Ñ Ð²Ð°ÑÐ¾Ð³Ð¾ QR-ÐºÐ¾Ð´Ñ."
 
 #: bridgedb/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "Ð¦Ðµ QR-ÐºÐ¾Ð´ Ð¼ÑÑÑÐ¸ÑÑ Ð°Ð´ÑÐµÑÐ¸ ÐÐ°ÑÐ¸Ñ 
ÑÐµÑÑÐ°Ð½ÑÐ»ÑÑÐ¾ÑÑÐ². ÐÑÐ´ÑÐºÐ°Ð½ÑÐ¹ÑÐµ Ð¹Ð¾Ð³Ð¾ 
Ð¿ÑÐ¸ÑÑÑÐ¾ÑÐ¼ Ð´Ð»Ñ Ð·ÑÐ¸ÑÑÐ²Ð°Ð½Ð½Ñ QR-ÐºÐ¾Ð´ÑÐ², ÑÐ¾Ð± 
ÑÐºÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸ Ð°Ð´ÑÐµÑÐ¸ ÐÐ°ÑÐ¸Ñ ÑÐµÑÑÐ°Ð½ÑÐ»ÑÑÐ¾ÑÑÐ² Ð½Ð° 
Ð¼Ð¾Ð±ÑÐ»ÑÐ½Ñ ÑÐ° ÑÐ½ÑÑ Ð¿ÑÐ¸ÑÑÑÐ¾Ñ."
+msgstr "Ð¦ÐµÐ¹ QR-ÐºÐ¾Ð´ Ð¼ÑÑÑÐ¸ÑÑ Ð°Ð´ÑÐµÑÐ¸ ÐÐ°ÑÐ¸Ñ 
ÑÐµÑÑÐ°Ð½ÑÐ»ÑÑÐ¾ÑÑÐ². ÐÑÐ´ÑÐºÐ°Ð½ÑÐ¹ÑÐµ Ð¹Ð¾Ð³Ð¾ 
Ð¿ÑÐ¸ÑÑÑÐ¾ÑÐ¼ Ð´Ð»Ñ Ð·ÑÐ¸ÑÑÐ²Ð°Ð½Ð½Ñ QR-ÐºÐ¾Ð´ÑÐ², ÑÐ¾Ð± 
ÑÐºÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸ Ð°Ð´ÑÐµÑÐ¸ ÐÐ°ÑÐ¸Ñ ÑÐµÑÑÐ°Ð½ÑÐ»ÑÑÐ¾ÑÑÐ² Ð½Ð° 
Ð¼Ð¾Ð±ÑÐ»ÑÐ½Ñ ÑÐ° ÑÐ½ÑÑ Ð¿ÑÐ¸ÑÑÑÐ¾Ñ."
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
-msgstr "Ð Ð´Ð°Ð½Ð¸Ð¹ ÑÐ°Ñ Ð½ÐµÐ¼Ð°Ñ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ñ Ð¼Ð¾ÑÑÑÐ² ..."
+msgstr "Ð Ð´Ð°Ð½Ð¸Ð¹ ÑÐ°Ñ Ð½ÐµÐ¼Ð°Ñ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ñ Ð¼Ð¾ÑÑÑÐ²..."
 
 #: bridgedb/https/templates/bridges.html:132
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2019-04-05 Thread translation

commit d7f80a83b611e3d9abb9f05a48a22f32e022c776
Author: Translation commit bot 
Date:   Sat Apr 6 00:15:15 2019 +

Update translations for bridgedb
---
 uk/LC_MESSAGES/bridgedb.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/uk/LC_MESSAGES/bridgedb.po b/uk/LC_MESSAGES/bridgedb.po
index aa604ea8e..7edd38e2a 100644
--- a/uk/LC_MESSAGES/bridgedb.po
+++ b/uk/LC_MESSAGES/bridgedb.po
@@ -3,20 +3,21 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Bogdan Kulynych , 2019
 # Eugene ghostishev, 2014
 # LinuxChata, 2014-2015
 # Oleksii Golub , 2015
 # Oleksii Golub , 2013
 # Vira Motorko , 2017
-# Yasha, 2015
+# f5a88f9e30127107e3f9ea67ac1be70b, 2015
 # ÐÐ½Ð´ÑÑÐ¹ ÐÐ°Ð½Ð´ÑÑÐ° , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2019-01-15 12:20+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-04-05 23:58+\n"
+"Last-Translator: Bogdan Kulynych \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,21 +76,21 @@ msgstr "QR-ÐºÐ¾Ð´ Ð´Ð»Ñ Ð°Ð´ÑÐµÑ 
ÑÐµÑÑÐ°Ð½ÑÐ»ÑÑÐ¾ÑÑÐ²"
 #: bridgedb/https/templates/bridges.html:67
 #: bridgedb/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
-msgstr "ÐÐ¹-Ð¾Ð¹, spaghettios!"
+msgstr "ÐÑÐ°ÐºÐ¾Ñ!"
 
 #: bridgedb/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
-msgstr "ÐÐ´Ð°ÑÑÑÑÑ, Ð±ÑÐ»Ð¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ñ Ð¾ÑÑÐ¸Ð¼Ð°Ð½Ð½Ñ 
Ð²Ð°ÑÐ¾Ð³Ð¾ QR-ÐºÐ¾Ð´."
+msgstr "ÐÐ´Ð°ÑÑÑÑÑ, ÑÐ¾ ÑÑÐ°Ð»Ð°ÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ 
Ð¾ÑÑÐ¸Ð¼Ð°Ð½Ð½Ñ Ð²Ð°ÑÐ¾Ð³Ð¾ QR-ÐºÐ¾Ð´Ñ."
 
 #: bridgedb/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "Ð¦Ðµ QR-ÐºÐ¾Ð´ Ð¼ÑÑÑÐ¸ÑÑ Ð°Ð´ÑÐµÑÐ¸ ÐÐ°ÑÐ¸Ñ 
ÑÐµÑÑÐ°Ð½ÑÐ»ÑÑÐ¾ÑÑÐ². ÐÑÐ´ÑÐºÐ°Ð½ÑÐ¹ÑÐµ Ð¹Ð¾Ð³Ð¾ 
Ð¿ÑÐ¸ÑÑÑÐ¾ÑÐ¼ Ð´Ð»Ñ Ð·ÑÐ¸ÑÑÐ²Ð°Ð½Ð½Ñ QR-ÐºÐ¾Ð´ÑÐ², ÑÐ¾Ð± 
ÑÐºÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸ Ð°Ð´ÑÐµÑÐ¸ ÐÐ°ÑÐ¸Ñ ÑÐµÑÑÐ°Ð½ÑÐ»ÑÑÐ¾ÑÑÐ² Ð½Ð° 
Ð¼Ð¾Ð±ÑÐ»ÑÐ½Ñ ÑÐ° ÑÐ½ÑÑ Ð¿ÑÐ¸ÑÑÑÐ¾Ñ."
+msgstr "Ð¦ÐµÐ¹ QR-ÐºÐ¾Ð´ Ð¼ÑÑÑÐ¸ÑÑ Ð°Ð´ÑÐµÑÐ¸ ÐÐ°ÑÐ¸Ñ 
ÑÐµÑÑÐ°Ð½ÑÐ»ÑÑÐ¾ÑÑÐ². ÐÑÐ´ÑÐºÐ°Ð½ÑÐ¹ÑÐµ Ð¹Ð¾Ð³Ð¾ 
Ð¿ÑÐ¸ÑÑÑÐ¾ÑÐ¼ Ð´Ð»Ñ Ð·ÑÐ¸ÑÑÐ²Ð°Ð½Ð½Ñ QR-ÐºÐ¾Ð´ÑÐ², ÑÐ¾Ð± 
ÑÐºÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸ Ð°Ð´ÑÐµÑÐ¸ ÐÐ°ÑÐ¸Ñ ÑÐµÑÑÐ°Ð½ÑÐ»ÑÑÐ¾ÑÑÐ² Ð½Ð° 
Ð¼Ð¾Ð±ÑÐ»ÑÐ½Ñ ÑÐ° ÑÐ½ÑÑ Ð¿ÑÐ¸ÑÑÑÐ¾Ñ."
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
-msgstr "Ð Ð´Ð°Ð½Ð¸Ð¹ ÑÐ°Ñ Ð½ÐµÐ¼Ð°Ñ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ñ Ð¼Ð¾ÑÑÑÐ² ..."
+msgstr "Ð Ð´Ð°Ð½Ð¸Ð¹ ÑÐ°Ñ Ð½ÐµÐ¼Ð°Ñ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ñ Ð¼Ð¾ÑÑÑÐ²..."
 
 #: bridgedb/https/templates/bridges.html:132
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5

2019-04-05 Thread teor

commit 44ea341117ef9f439d7ba9eae74a7a225646bfa3
Merge: 4aa02d3c7 db71bceb4
Author: teor 
Date:   Sat Apr 6 09:30:52 2019 +1000

Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5

 .travis.yml | 15 +++
 Makefile.am |  4 +++-
 changes/bug29036|  5 +
 changes/ticket29962 |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

2019-04-05 Thread teor

commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff
Merge: 54e249e26 f0cd8f804
Author: teor 
Date:   Sat Apr 6 09:28:13 2019 +1000

Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

 .travis.yml  | 8 +---
 Makefile.am  | 4 +++-
 changes/bug29036 | 5 +
 3 files changed, 13 insertions(+), 4 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5

2019-04-05 Thread teor

commit 316aed502e58102fa582ecd9902a3422c27b6dae
Merge: ea5e37182 3fa42d599
Author: teor 
Date:   Sat Apr 6 09:32:53 2019 +1000

Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5

 .travis.yml  | 9 -
 changes/bug30011 | 4 
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --cc .travis.yml
index f3ddd81ea,e70344ee2..45da26324
--- a/.travis.yml
+++ b/.travis.yml
@@@ -204,10 -208,9 +210,11 @@@ script
- ./configure $CONFIGURE_FLAGS
## We run `make check` because that's what https://jenkins.torproject.org 
does.
- if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi
-   - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi
+   ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes
+   - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -T 30 make 
src/app/tor test-stem; fi
- if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck 
DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
 +  ## If this build was one that produced coverage, upload it.
 +  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude 
src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; 
fi
  
  after_failure:
## configure will leave a log file with more details of config failures.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4

2019-04-05 Thread teor

commit 102178e6d43ed990e972b2fbc4f611997c8943f0
Merge: 3cfcfbac4 a514e0247
Author: teor 
Date:   Sat Apr 6 09:30:04 2019 +1000

Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4

 .travis.yml | 15 +++
 Makefile.am |  4 +++-
 changes/bug29036|  5 +
 changes/ticket29962 |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.4

2019-04-05 Thread teor

commit 48e990359b05661f2dd0ae503143ee9b18442475
Merge: 102178e6d a0db5ade3
Author: teor 
Date:   Sat Apr 6 09:33:11 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.4

 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Merge branch 'bug29036-029' into bug29036-29962-034

2019-04-05 Thread teor

commit a514e024769083908a35f28ac0df5f2e7b1137b8
Merge: 33be8d829 f0cd8f804
Author: teor 
Date:   Fri Apr 5 12:58:16 2019 +1000

Merge branch 'bug29036-029' into bug29036-29962-034

 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

2019-04-05 Thread teor

commit 6428fa35922d3debedb24d2098bd16c51ec21e69
Merge: 8a158b82b 8b3b605a1
Author: teor 
Date:   Sat Apr 6 09:33:33 2019 +1000

Merge branch 'maint-0.4.0' into release-0.4.0

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2019-04-05 Thread teor

commit d851f075971a63ae257f3e11734c8e6e2f0a0263
Merge: 3a6affb15 3b9e3cca9
Author: teor 
Date:   Sat Apr 6 09:33:24 2019 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

 .travis.yml  | 24 +++-
 Makefile.am  |  4 +++-
 changes/bug29036 |  5 +
 changes/bug30011 |  4 
 changes/bug30021 |  8 
 changes/ticket29962  |  3 +++
 src/lib/tls/tortls_openssl.c |  2 +-
 7 files changed, 43 insertions(+), 7 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'bug30021_029' into bug30021_035

2019-04-05 Thread teor

commit db1c1dba34545c9b96f9ec4c01338caeaeeb0433
Merge: 4aa02d3c7 1710f4bbd
Author: Nick Mathewson 
Date:   Thu Apr 4 11:26:33 2019 -0400

Merge branch 'bug30021_029' into bug30021_035

 changes/bug30021 | 8 
 src/lib/tls/tortls_openssl.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --cc src/lib/tls/tortls_openssl.c
index e702cb9df,0..80b0df301
mode 100644,00..100644
--- a/src/lib/tls/tortls_openssl.c
+++ b/src/lib/tls/tortls_openssl.c
@@@ -1,1795 -1,0 +1,1795 @@@
 +/* Copyright (c) 2003, Roger Dingledine.
 + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 + * Copyright (c) 2007-2019, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file tortls.c
 + * \brief Wrapper functions to present a consistent interface to
 + * TLS, SSL, and X.509 functions from OpenSSL.
 + **/
 +
 +/* (Unlike other tor functions, these
 + * are prefixed with tor_ in order to avoid conflicting with OpenSSL
 + * functions and variables.)
 + */
 +
 +#include "orconfig.h"
 +
 +#define TORTLS_PRIVATE
 +#define TORTLS_OPENSSL_PRIVATE
 +#define TOR_X509_PRIVATE
 +
 +#ifdef _WIN32
 +  /* We need to include these here, or else the dtls1.h header will include
 +   *  and mess things up, in at least some openssl versions. */
 +  #include 
 +  #include 
 +#endif
 +
 +#include "lib/crypt_ops/crypto_cipher.h"
 +#include "lib/crypt_ops/crypto_rand.h"
 +#include "lib/crypt_ops/crypto_dh.h"
 +#include "lib/crypt_ops/crypto_util.h"
 +#include "lib/crypt_ops/compat_openssl.h"
 +#include "lib/tls/x509.h"
 +#include "lib/tls/x509_internal.h"
 +
 +/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in
 + * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */
 +DISABLE_GCC_WARNING(redundant-decls)
 +
 +#include 
 +
 +#ifdef OPENSSL_NO_EC
 +#error "We require OpenSSL with ECC support"
 +#endif
 +
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +
 +ENABLE_GCC_WARNING(redundant-decls)
 +
 +#include "lib/tls/tortls.h"
 +#include "lib/tls/tortls_st.h"
 +#include "lib/tls/tortls_internal.h"
 +#include "lib/log/log.h"
 +#include "lib/log/util_bug.h"
 +#include "lib/container/smartlist.h"
 +#include "lib/string/compat_string.h"
 +#include "lib/string/printf.h"
 +#include "lib/net/socket.h"
 +#include "lib/intmath/cmp.h"
 +#include "lib/ctime/di_ops.h"
 +#include "lib/encoding/time_fmt.h"
 +
 +#include 
 +#include 
 +
 +#include "lib/arch/bytes.h"
 +
 +/* Copied from or.h */
 +#define LEGAL_NICKNAME_CHARACTERS \
 +  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 +
 +#define ADDR(tls) (((tls) && (tls)->address) ? tls->address : "peer")
 +
 +#if OPENSSL_VERSION_NUMBER <  OPENSSL_V(1,0,0,'f')
 +/* This is a version of OpenSSL before 1.0.0f. It does not have
 + * the CVE-2011-4576 fix, and as such it can't use RELEASE_BUFFERS and
 + * SSL3 safely at the same time.
 + */
 +#define DISABLE_SSL3_HANDSHAKE
 +#endif /* OPENSSL_VERSION_NUMBER <  OPENSSL_V(1,0,0,'f') */
 +
 +/* We redefine these so that we can run correctly even if the vendor gives us
 + * a version of OpenSSL that does not match its header files.  (Apple: I am
 + * looking at you.)
 + */
 +#ifndef SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
 +#define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0004L
 +#endif
 +#ifndef SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
 +#define SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0010
 +#endif
 +
 +/** Set to true iff openssl bug 7712 has been detected. */
 +static int openssl_bug_7712_is_present = 0;
 +
 +/** Return values for tor_tls_classify_client_ciphers.
 + *
 + * @{
 + */
 +/** An error occurred when examining the client ciphers */
 +#define CIPHERS_ERR -1
 +/** The client cipher list indicates that a v1 handshake was in use. */
 +#define CIPHERS_V1 1
 +/** The client cipher list indicates that the client is using the v2 or the
 + * v3 handshake, but that it is (probably!) lying about what ciphers it
 + * supports */
 +#define CIPHERS_V2 2
 +/** The client cipher list indicates that the client is using the v2 or the
 + * v3 handshake, and that it is telling the truth about what ciphers it
 + * supports */
 +#define CIPHERS_UNRESTRICTED 3
 +/** @} */
 +
 +/** The ex_data index in which we store a pointer to an SSL object's
 + * corresponding tor_tls_t object. */
 +STATIC int tor_tls_object_ex_data_index = -1;
 +
 +/** Helper: Allocate tor_tls_object_ex_data_index. */
 +void
 +tor_tls_allocate_tor_tls_object_ex_data_index(void)
 +{
 +  if (tor_tls_object_ex_data_index == -1) {
 +tor_tls_object_ex_data_index =
 +  SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL);
 +tor_assert(tor_tls_object_ex_data_index != -1);
 +  }
 +}
 +
 +/** Helper: given a SSL* pointer, return the tor_tls_t object using that
 + * pointer. */
 +tor_tls_t *
 +tor_tls_get_by_ssl(const SSL *ssl)
 +{
 +  tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.4

2019-04-05 Thread teor

commit 48e990359b05661f2dd0ae503143ee9b18442475
Merge: 102178e6d a0db5ade3
Author: teor 
Date:   Sat Apr 6 09:33:11 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.4

 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Makefile: actually, don't delete the gcno files

2019-04-05 Thread teor

commit f0cd8f804f8152355993acf0493b22b668f500b2
Author: teor 
Date:   Fri Apr 5 12:56:29 2019 +1000

Makefile: actually, don't delete the gcno files

We need to keep the gcno files, because they are created at compile time.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 4b1687f92..48d3df265 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,9 +148,9 @@ test-full: need-stem-path need-chutney-path check 
test-network test-stem
 
 test-full-online: need-stem-path need-chutney-path check test-network 
test-stem-full
 
+# We can't delete the gcno files, because they are created when tor is compiled
 reset-gcov:
rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \
- $(top_builddir)/src/*/*.gcno $(top_builddir)/src/*/*/*.gcno \
  $(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov
 
 HTML_COVER_DIR=$(top_builddir)/coverage_html



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'bug29036-029' into bug29036-29962-034

2019-04-05 Thread teor

commit ac28e56ccb402d640f5adde186a765265ce855c7
Merge: 6d057c56f 57e9fe2bb
Author: teor 
Date:   Mon Apr 1 14:07:58 2019 +1000

Merge branch 'bug29036-029' into bug29036-29962-034

 .travis.yml  | 8 +---
 Makefile.am  | 4 +++-
 changes/bug29036 | 5 +
 3 files changed, 13 insertions(+), 4 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-04-05 Thread teor

commit 8b3b605a1529e34eb42926db7c38d046a3f1bacb
Merge: 071a000d6 3b9e3cca9
Author: teor 
Date:   Sat Apr 6 09:33:28 2019 +1000

Merge branch 'maint-0.3.5' into maint-0.4.0




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-04-05 Thread teor

commit 3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748
Merge: 316aed502 48e990359
Author: teor 
Date:   Sat Apr 6 09:33:20 2019 +1000

Merge branch 'maint-0.3.4' into maint-0.3.5




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5

2019-04-05 Thread teor

commit ea5e371822d58eb25eda912ba8afb8c0951b424c
Merge: 44ea34111 db1c1dba3
Author: teor 
Date:   Sat Apr 6 09:31:52 2019 +1000

Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5

 changes/bug30021 | 8 
 src/lib/tls/tortls_openssl.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9

2019-04-05 Thread teor

commit a0db5ade3e1e2b81ed1196eb98aeca53583fba64
Merge: e1955a2c5 1710f4bbd
Author: teor 
Date:   Sat Apr 6 09:28:58 2019 +1000

Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9

 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Do not cache bogus results from classifying client ciphers

2019-04-05 Thread teor

commit 1710f4bbd6bb100901e7f601a1c0f96b51845f86
Author: Nick Mathewson 
Date:   Thu Apr 4 11:24:55 2019 -0400

Do not cache bogus results from classifying client ciphers

When classifying a client's selection of TLS ciphers, if the client
ciphers are not yet available, do not cache the result. Previously,
we had cached the unavailability of the cipher list and never looked
again, which in turn led us to assume that the client only supported
the ancient V1 link protocol.  This, in turn, was causing Stem
integration tests to stall in some cases.  Fixes bug 30021; bugfix
on 0.2.4.8-alpha.
---
 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/changes/bug30021 b/changes/bug30021
new file mode 100644
index 0..2a887f3cf
--- /dev/null
+++ b/changes/bug30021
@@ -0,0 +1,8 @@
+  o Minor bugfixes (TLS protocol, integration tests):
+- When classifying a client's selection of TLS ciphers, if the client
+  ciphers are not yet available, do not cache the result. Previously,
+  we had cached the unavailability of the cipher list and never looked
+  again, which in turn led us to assume that the client only supported
+  the ancient V1 link protocol.  This, in turn, was causing Stem
+  integration tests to stall in some cases.
+  Fixes bug 30021; bugfix on 0.2.4.8-alpha.
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 1fbe3c663..f79969d0d 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1500,7 +1500,7 @@ tor_tls_classify_client_ciphers(const SSL *ssl,
 smartlist_free(elts);
   }
  done:
-  if (tor_tls)
+  if (tor_tls && peer_ciphers)
 return tor_tls->client_cipher_list_type = res;
 
   return res;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5

2019-04-05 Thread teor

commit 44ea341117ef9f439d7ba9eae74a7a225646bfa3
Merge: 4aa02d3c7 db71bceb4
Author: teor 
Date:   Sat Apr 6 09:30:52 2019 +1000

Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5

 .travis.yml | 15 +++
 Makefile.am |  4 +++-
 changes/bug29036|  5 +
 changes/ticket29962 |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.0] Merge branch 'bug30021_029' into bug30021_035

2019-04-05 Thread teor

commit db1c1dba34545c9b96f9ec4c01338caeaeeb0433
Merge: 4aa02d3c7 1710f4bbd
Author: Nick Mathewson 
Date:   Thu Apr 4 11:26:33 2019 -0400

Merge branch 'bug30021_029' into bug30021_035

 changes/bug30021 | 8 
 src/lib/tls/tortls_openssl.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --cc src/lib/tls/tortls_openssl.c
index e702cb9df,0..80b0df301
mode 100644,00..100644
--- a/src/lib/tls/tortls_openssl.c
+++ b/src/lib/tls/tortls_openssl.c
@@@ -1,1795 -1,0 +1,1795 @@@
 +/* Copyright (c) 2003, Roger Dingledine.
 + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 + * Copyright (c) 2007-2019, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file tortls.c
 + * \brief Wrapper functions to present a consistent interface to
 + * TLS, SSL, and X.509 functions from OpenSSL.
 + **/
 +
 +/* (Unlike other tor functions, these
 + * are prefixed with tor_ in order to avoid conflicting with OpenSSL
 + * functions and variables.)
 + */
 +
 +#include "orconfig.h"
 +
 +#define TORTLS_PRIVATE
 +#define TORTLS_OPENSSL_PRIVATE
 +#define TOR_X509_PRIVATE
 +
 +#ifdef _WIN32
 +  /* We need to include these here, or else the dtls1.h header will include
 +   *  and mess things up, in at least some openssl versions. */
 +  #include 
 +  #include 
 +#endif
 +
 +#include "lib/crypt_ops/crypto_cipher.h"
 +#include "lib/crypt_ops/crypto_rand.h"
 +#include "lib/crypt_ops/crypto_dh.h"
 +#include "lib/crypt_ops/crypto_util.h"
 +#include "lib/crypt_ops/compat_openssl.h"
 +#include "lib/tls/x509.h"
 +#include "lib/tls/x509_internal.h"
 +
 +/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in
 + * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */
 +DISABLE_GCC_WARNING(redundant-decls)
 +
 +#include 
 +
 +#ifdef OPENSSL_NO_EC
 +#error "We require OpenSSL with ECC support"
 +#endif
 +
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +
 +ENABLE_GCC_WARNING(redundant-decls)
 +
 +#include "lib/tls/tortls.h"
 +#include "lib/tls/tortls_st.h"
 +#include "lib/tls/tortls_internal.h"
 +#include "lib/log/log.h"
 +#include "lib/log/util_bug.h"
 +#include "lib/container/smartlist.h"
 +#include "lib/string/compat_string.h"
 +#include "lib/string/printf.h"
 +#include "lib/net/socket.h"
 +#include "lib/intmath/cmp.h"
 +#include "lib/ctime/di_ops.h"
 +#include "lib/encoding/time_fmt.h"
 +
 +#include 
 +#include 
 +
 +#include "lib/arch/bytes.h"
 +
 +/* Copied from or.h */
 +#define LEGAL_NICKNAME_CHARACTERS \
 +  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 +
 +#define ADDR(tls) (((tls) && (tls)->address) ? tls->address : "peer")
 +
 +#if OPENSSL_VERSION_NUMBER <  OPENSSL_V(1,0,0,'f')
 +/* This is a version of OpenSSL before 1.0.0f. It does not have
 + * the CVE-2011-4576 fix, and as such it can't use RELEASE_BUFFERS and
 + * SSL3 safely at the same time.
 + */
 +#define DISABLE_SSL3_HANDSHAKE
 +#endif /* OPENSSL_VERSION_NUMBER <  OPENSSL_V(1,0,0,'f') */
 +
 +/* We redefine these so that we can run correctly even if the vendor gives us
 + * a version of OpenSSL that does not match its header files.  (Apple: I am
 + * looking at you.)
 + */
 +#ifndef SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
 +#define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0004L
 +#endif
 +#ifndef SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
 +#define SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0010
 +#endif
 +
 +/** Set to true iff openssl bug 7712 has been detected. */
 +static int openssl_bug_7712_is_present = 0;
 +
 +/** Return values for tor_tls_classify_client_ciphers.
 + *
 + * @{
 + */
 +/** An error occurred when examining the client ciphers */
 +#define CIPHERS_ERR -1
 +/** The client cipher list indicates that a v1 handshake was in use. */
 +#define CIPHERS_V1 1
 +/** The client cipher list indicates that the client is using the v2 or the
 + * v3 handshake, but that it is (probably!) lying about what ciphers it
 + * supports */
 +#define CIPHERS_V2 2
 +/** The client cipher list indicates that the client is using the v2 or the
 + * v3 handshake, and that it is telling the truth about what ciphers it
 + * supports */
 +#define CIPHERS_UNRESTRICTED 3
 +/** @} */
 +
 +/** The ex_data index in which we store a pointer to an SSL object's
 + * corresponding tor_tls_t object. */
 +STATIC int tor_tls_object_ex_data_index = -1;
 +
 +/** Helper: Allocate tor_tls_object_ex_data_index. */
 +void
 +tor_tls_allocate_tor_tls_object_ex_data_index(void)
 +{
 +  if (tor_tls_object_ex_data_index == -1) {
 +tor_tls_object_ex_data_index =
 +  SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL);
 +tor_assert(tor_tls_object_ex_data_index != -1);
 +  }
 +}
 +
 +/** Helper: given a SSL* pointer, return the tor_tls_t object using that
 + * pointer. */
 +tor_tls_t *
 +tor_tls_get_by_ssl(const SSL *ssl)
 +{
 +  tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4

2019-04-05 Thread teor

commit 102178e6d43ed990e972b2fbc4f611997c8943f0
Merge: 3cfcfbac4 a514e0247
Author: teor 
Date:   Sat Apr 6 09:30:04 2019 +1000

Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4

 .travis.yml | 15 +++
 Makefile.am |  4 +++-
 changes/bug29036|  5 +
 changes/ticket29962 |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5

2019-04-05 Thread teor

commit ea5e371822d58eb25eda912ba8afb8c0951b424c
Merge: 44ea34111 db1c1dba3
Author: teor 
Date:   Sat Apr 6 09:31:52 2019 +1000

Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5

 changes/bug30021 | 8 
 src/lib/tls/tortls_openssl.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5

2019-04-05 Thread teor

commit 316aed502e58102fa582ecd9902a3422c27b6dae
Merge: ea5e37182 3fa42d599
Author: teor 
Date:   Sat Apr 6 09:32:53 2019 +1000

Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5

 .travis.yml  | 9 -
 changes/bug30011 | 4 
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --cc .travis.yml
index f3ddd81ea,e70344ee2..45da26324
--- a/.travis.yml
+++ b/.travis.yml
@@@ -204,10 -208,9 +210,11 @@@ script
- ./configure $CONFIGURE_FLAGS
## We run `make check` because that's what https://jenkins.torproject.org 
does.
- if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi
-   - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi
+   ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes
+   - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -T 30 make 
src/app/tor test-stem; fi
- if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck 
DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
 +  ## If this build was one that produced coverage, upload it.
 +  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude 
src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; 
fi
  
  after_failure:
## configure will leave a log file with more details of config failures.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'bug29036-29962-034' into bug29036-29962-035

2019-04-05 Thread teor

commit db71bceb4048c0274001ee46ebab2c60f8d11259
Merge: 7014e57f4 a514e0247
Author: teor 
Date:   Fri Apr 5 12:58:32 2019 +1000

Merge branch 'bug29036-29962-034' into bug29036-29962-035

 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9

2019-04-05 Thread teor

commit a0db5ade3e1e2b81ed1196eb98aeca53583fba64
Merge: e1955a2c5 1710f4bbd
Author: teor 
Date:   Sat Apr 6 09:28:58 2019 +1000

Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9

 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

2019-04-05 Thread teor

commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff
Merge: 54e249e26 f0cd8f804
Author: teor 
Date:   Sat Apr 6 09:28:13 2019 +1000

Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

 .travis.yml  | 8 +---
 Makefile.am  | 4 +++-
 changes/bug29036 | 5 +
 3 files changed, 13 insertions(+), 4 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

2019-04-05 Thread teor

commit 2afba291bbfc79198e1cd62382a30168f45db4e5
Merge: b0428b6dc 48e990359
Author: teor 
Date:   Sat Apr 6 09:33:15 2019 +1000

Merge branch 'maint-0.3.4' into release-0.3.4

 .travis.yml | 15 +++
 Makefile.am |  4 +++-
 changes/bug29036|  5 +
 changes/bug30021|  8 
 changes/ticket29962 |  3 +++
 src/common/tortls.c |  2 +-
 6 files changed, 31 insertions(+), 6 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-04-05 Thread teor

commit 3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748
Merge: 316aed502 48e990359
Author: teor 
Date:   Sat Apr 6 09:33:20 2019 +1000

Merge branch 'maint-0.3.4' into maint-0.3.5




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Merge branch 'bug29036-029' into bug29036-29962-034

2019-04-05 Thread teor

commit ac28e56ccb402d640f5adde186a765265ce855c7
Merge: 6d057c56f 57e9fe2bb
Author: teor 
Date:   Mon Apr 1 14:07:58 2019 +1000

Merge branch 'bug29036-029' into bug29036-29962-034

 .travis.yml  | 8 +---
 Makefile.am  | 4 +++-
 changes/bug29036 | 5 +
 3 files changed, 13 insertions(+), 4 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

2019-04-05 Thread teor

commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff
Merge: 54e249e26 f0cd8f804
Author: teor 
Date:   Sat Apr 6 09:28:13 2019 +1000

Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

 .travis.yml  | 8 +---
 Makefile.am  | 4 +++-
 changes/bug29036 | 5 +
 3 files changed, 13 insertions(+), 4 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Makefile: delete all the gcov-related files in reset-gcov

2019-04-05 Thread teor

commit 57e9fe2bbaa66ee907d68cdf7ebcf2111bd71ac9
Author: teor 
Date:   Mon Apr 1 13:49:27 2019 +1000

Makefile: delete all the gcov-related files in reset-gcov

And fix a comment.

See:
https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files
---
 .travis.yml | 2 +-
 Makefile.am | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 336b67d29..456b5abc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -168,7 +168,7 @@ after_failure:
   - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make 
failed"; fi
 
 before_cache:
-# Delete all .gcda files.
+  ## Delete all gcov files.
   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi
 
 notifications:
diff --git a/Makefile.am b/Makefile.am
index e4be3f26f..4b1687f92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,7 +149,9 @@ test-full: need-stem-path need-chutney-path check 
test-network test-stem
 test-full-online: need-stem-path need-chutney-path check test-network 
test-stem-full
 
 reset-gcov:
-   rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda
+   rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \
+ $(top_builddir)/src/*/*.gcno $(top_builddir)/src/*/*/*.gcno \
+ $(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov
 
 HTML_COVER_DIR=$(top_builddir)/coverage_html
 coverage-html: all



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Cleanup cargo registry before each Rust-enabled build

2019-04-05 Thread teor

commit 0c6cfd9c652e4f5074151320ad31c32cc82818e9
Author: rl1987 
Date:   Sun Mar 31 16:58:32 2019 +0300

Cleanup cargo registry before each Rust-enabled build

Also, refrain from caching target/.

See: https://levans.fr/rust_travis_cache.html
---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 87780bb1a..4b2a1ffd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,9 @@ cache:
   ## cargo: true
   directories:
 - $HOME/.cargo
-## where we point CARGO_TARGET_DIR in all our cargo invocations
-- $TRAVIS_BUILD_DIR/src/rust/target
+
+before_cache:
+  - rm -rf $HOME/.cargo/registry
 
 compiler:
   - gcc



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'bug29036-029' into bug29036-29962-034

2019-04-05 Thread teor

commit a514e024769083908a35f28ac0df5f2e7b1137b8
Merge: 33be8d829 f0cd8f804
Author: teor 
Date:   Fri Apr 5 12:58:16 2019 +1000

Merge branch 'bug29036-029' into bug29036-29962-034

 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Add changes file

2019-04-05 Thread teor

commit 124990aa01c8151fad98a6979e5996d5fbb3f51a
Author: rl1987 
Date:   Sun Mar 31 17:23:34 2019 +0300

Add changes file
---
 changes/ticket29962 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket29962 b/changes/ticket29962
new file mode 100644
index 0..e36cc0cf9
--- /dev/null
+++ b/changes/ticket29962
@@ -0,0 +1,3 @@
+  o Minor features (continuous integration):
+- On Travis Rust builds, cleanup Rust registry and refrain from caching
+  target/ directory to speed up builds. Resolves issue 29962.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Handle errors from coveralls more gracefully.

2019-04-05 Thread teor

commit fbb1c7adfcfbda2f7ed6877beb137c382ecb6b50
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Mar 20 15:44:06 2019 +0100

Handle errors from coveralls more gracefully.

Since we have moved coveralls to the script target the entire build will
now fail if coveralls fail. We handle it more gracefully by echo'ing the
failure instead of doing a hard-failure.

See: https://bugs.torproject.org/29036
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5319bbb89..336b67d29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -156,7 +156,7 @@ script:
   - if [[ "$DISTCHECK" == "" ]]; then make check; fi
   - if [[ "$DISTCHECK" != "" ]]; then make distcheck 
DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
   ## If this build was one that produced coverage, upload it.
-  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test 
--exclude src/trunnel --gcov-options '\-p'; fi
+  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test 
--exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi
 
 after_failure:
   ## configure will leave a log file with more details of config failures.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Run `make reset-gcov` after the script target in Travis CI is done.

2019-04-05 Thread teor

commit 0267c453e2e0d474f742efa1da3ce698ea4af97d
Author: Alexander FÃ¦rÃ¸y 
Date:   Mon Mar 18 15:27:14 2019 +0100

Run `make reset-gcov` after the script target in Travis CI is done.

This should ensure that GCDA files are never entering the cache of
Travis CI.

See: https://bugs.torproject.org/29036
---
 .travis.yml  | 8 +---
 changes/bug29036 | 5 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 939f4f4e9..5319bbb89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -155,6 +155,8 @@ script:
   ## We run `make check` because that's what https://jenkins.torproject.org 
does.
   - if [[ "$DISTCHECK" == "" ]]; then make check; fi
   - if [[ "$DISTCHECK" != "" ]]; then make distcheck 
DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
+  ## If this build was one that produced coverage, upload it.
+  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test 
--exclude src/trunnel --gcov-options '\-p'; fi
 
 after_failure:
   ## configure will leave a log file with more details of config failures.
@@ -165,9 +167,9 @@ after_failure:
   ## `make distcheck` puts it somewhere different.
   - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make 
failed"; fi
 
-after_success:
-  ## If this build was one that produced coverage, upload it.
-  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test 
--exclude src/trunnel --gcov-options '\-p'; fi
+before_cache:
+# Delete all .gcda files.
+  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi
 
 notifications:
   irc:
diff --git a/changes/bug29036 b/changes/bug29036
new file mode 100644
index 0..4de02adfe
--- /dev/null
+++ b/changes/bug29036
@@ -0,0 +1,5 @@
+  o Minor bugfix (continuous integration):
+- Reset coverage state on disk after Travis CI has finished. This is being
+  done to prevent future gcda file merge errors which causes the test suite
+  for the process subsystem to fail. Fixes bug 29036; bugfix on 
0.4.0.1-alpha.
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4

2019-04-05 Thread teor

commit 102178e6d43ed990e972b2fbc4f611997c8943f0
Merge: 3cfcfbac4 a514e0247
Author: teor 
Date:   Sat Apr 6 09:30:04 2019 +1000

Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4

 .travis.yml | 15 +++
 Makefile.am |  4 +++-
 changes/bug29036|  5 +
 changes/ticket29962 |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Cleanup cargo registry before each Rust-enabled build

2019-04-05 Thread teor

commit 0c6cfd9c652e4f5074151320ad31c32cc82818e9
Author: rl1987 
Date:   Sun Mar 31 16:58:32 2019 +0300

Cleanup cargo registry before each Rust-enabled build

Also, refrain from caching target/.

See: https://levans.fr/rust_travis_cache.html
---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 87780bb1a..4b2a1ffd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,9 @@ cache:
   ## cargo: true
   directories:
 - $HOME/.cargo
-## where we point CARGO_TARGET_DIR in all our cargo invocations
-- $TRAVIS_BUILD_DIR/src/rust/target
+
+before_cache:
+  - rm -rf $HOME/.cargo/registry
 
 compiler:
   - gcc



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9

2019-04-05 Thread teor

commit a0db5ade3e1e2b81ed1196eb98aeca53583fba64
Merge: e1955a2c5 1710f4bbd
Author: teor 
Date:   Sat Apr 6 09:28:58 2019 +1000

Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9

 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Do not cache bogus results from classifying client ciphers

2019-04-05 Thread teor

commit 1710f4bbd6bb100901e7f601a1c0f96b51845f86
Author: Nick Mathewson 
Date:   Thu Apr 4 11:24:55 2019 -0400

Do not cache bogus results from classifying client ciphers

When classifying a client's selection of TLS ciphers, if the client
ciphers are not yet available, do not cache the result. Previously,
we had cached the unavailability of the cipher list and never looked
again, which in turn led us to assume that the client only supported
the ancient V1 link protocol.  This, in turn, was causing Stem
integration tests to stall in some cases.  Fixes bug 30021; bugfix
on 0.2.4.8-alpha.
---
 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/changes/bug30021 b/changes/bug30021
new file mode 100644
index 0..2a887f3cf
--- /dev/null
+++ b/changes/bug30021
@@ -0,0 +1,8 @@
+  o Minor bugfixes (TLS protocol, integration tests):
+- When classifying a client's selection of TLS ciphers, if the client
+  ciphers are not yet available, do not cache the result. Previously,
+  we had cached the unavailability of the cipher list and never looked
+  again, which in turn led us to assume that the client only supported
+  the ancient V1 link protocol.  This, in turn, was causing Stem
+  integration tests to stall in some cases.
+  Fixes bug 30021; bugfix on 0.2.4.8-alpha.
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 1fbe3c663..f79969d0d 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1500,7 +1500,7 @@ tor_tls_classify_client_ciphers(const SSL *ssl,
 smartlist_free(elts);
   }
  done:
-  if (tor_tls)
+  if (tor_tls && peer_ciphers)
 return tor_tls->client_cipher_list_type = res;
 
   return res;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Add changes file

2019-04-05 Thread teor

commit 124990aa01c8151fad98a6979e5996d5fbb3f51a
Author: rl1987 
Date:   Sun Mar 31 17:23:34 2019 +0300

Add changes file
---
 changes/ticket29962 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket29962 b/changes/ticket29962
new file mode 100644
index 0..e36cc0cf9
--- /dev/null
+++ b/changes/ticket29962
@@ -0,0 +1,3 @@
+  o Minor features (continuous integration):
+- On Travis Rust builds, cleanup Rust registry and refrain from caching
+  target/ directory to speed up builds. Resolves issue 29962.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Makefile: delete all the gcov-related files in reset-gcov

2019-04-05 Thread teor

commit 57e9fe2bbaa66ee907d68cdf7ebcf2111bd71ac9
Author: teor 
Date:   Mon Apr 1 13:49:27 2019 +1000

Makefile: delete all the gcov-related files in reset-gcov

And fix a comment.

See:
https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files
---
 .travis.yml | 2 +-
 Makefile.am | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 336b67d29..456b5abc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -168,7 +168,7 @@ after_failure:
   - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make 
failed"; fi
 
 before_cache:
-# Delete all .gcda files.
+  ## Delete all gcov files.
   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi
 
 notifications:
diff --git a/Makefile.am b/Makefile.am
index e4be3f26f..4b1687f92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,7 +149,9 @@ test-full: need-stem-path need-chutney-path check 
test-network test-stem
 test-full-online: need-stem-path need-chutney-path check test-network 
test-stem-full
 
 reset-gcov:
-   rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda
+   rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \
+ $(top_builddir)/src/*/*.gcno $(top_builddir)/src/*/*/*.gcno \
+ $(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov
 
 HTML_COVER_DIR=$(top_builddir)/coverage_html
 coverage-html: all



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'bug29036-29962-034' into bug29036-29962-035

2019-04-05 Thread teor

commit 7014e57f4a05d2be5486aedd754272c70d365354
Merge: 3280e9a11 33be8d829
Author: teor 
Date:   Mon Apr 1 14:11:20 2019 +1000

Merge branch 'bug29036-29962-034' into bug29036-29962-035

Merge the moved coverage line from 29036 with the stem changes in
maint-0.3.5.

 .travis.yml | 15 +++
 Makefile.am |  4 +++-
 changes/bug29036|  5 +
 changes/ticket29962 |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --cc .travis.yml
index b5713d693,ed805aac3..f3ddd81ea
--- a/.travis.yml
+++ b/.travis.yml
@@@ -201,9 -201,10 +203,11 @@@ script
- echo "Configure flags are $CONFIGURE_FLAGS"
- ./configure $CONFIGURE_FLAGS
## We run `make check` because that's what https://jenkins.torproject.org 
does.
 -  - if [[ "$DISTCHECK" == "" ]]; then make check; fi
 -  - if [[ "$DISTCHECK" != "" ]]; then make distcheck 
DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
 +  - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi
 +  - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi
 +  - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck 
DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
+   ## If this build was one that produced coverage, upload it.
+   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude 
src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; 
fi
  
  after_failure:
## configure will leave a log file with more details of config failures.
@@@ -213,11 -214,13 +217,14 @@@
- if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat 
failed"; fi
## `make distcheck` puts it somewhere different.
- if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make 
failed"; fi
 +  - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make 
failed"; fi
  
- after_success:
-   ## If this build was one that produced coverage, upload it.
-   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude 
src/test --exclude src/trunnel --gcov-options '\-p'; fi
+ before_cache:
+   ## Delete all gcov files.
+   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi
+   ## Delete the cargo registry before caching .cargo, because it's cheaper to
+   ## download the registry and throw it away, rather than caching it
+   - rm -rf $HOME/.cargo/registry
  
  notifications:
irc:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] changes: Use the first Tor version with CI coverage for the 29036 changes file

2019-04-05 Thread teor

commit eb0bd18d6e344c574614d6d53e2f7cead92c3178
Author: teor 
Date:   Mon Apr 1 13:40:16 2019 +1000

changes: Use the first Tor version with CI coverage for the 29036 changes 
file

Otherwise, "make check-changes" will complain when we backport the change.
---
 changes/bug29036 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/changes/bug29036 b/changes/bug29036
index 4de02adfe..8b96c5c8f 100644
--- a/changes/bug29036
+++ b/changes/bug29036
@@ -1,5 +1,5 @@
   o Minor bugfix (continuous integration):
 - Reset coverage state on disk after Travis CI has finished. This is being
   done to prevent future gcda file merge errors which causes the test suite
-  for the process subsystem to fail. Fixes bug 29036; bugfix on 
0.4.0.1-alpha.
-
+  for the process subsystem to fail. The process subsystem was introduced
+  in 0.4.0.1-alpha. Fixes bug 29036; bugfix on 0.2.9.15.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Travis: merge before_cache from 29036 and 29962

2019-04-05 Thread teor

commit 33be8d8295415491fc06bee47729e86d9efcd126
Author: teor 
Date:   Mon Apr 1 14:05:14 2019 +1000

Travis: merge before_cache from 29036 and 29962

And add some useful comments
---
 .travis.yml | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4b2a1ffd7..ed805aac3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,10 @@ cache:
   ## cargo: true
   directories:
 - $HOME/.cargo
-
-before_cache:
-  - rm -rf $HOME/.cargo/registry
+## caching CARGO_TARGET_DIR actually slows down the build over time,
+## because old build products are never deleted.
+## where we point CARGO_TARGET_DIR in all our cargo invocations
+#- $TRAVIS_BUILD_DIR/src/rust/target
 
 compiler:
   - gcc
@@ -217,6 +218,9 @@ after_failure:
 before_cache:
   ## Delete all gcov files.
   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi
+  ## Delete the cargo registry before caching .cargo, because it's cheaper to
+  ## download the registry and throw it away, rather than caching it
+  - rm -rf $HOME/.cargo/registry
 
 notifications:
   irc:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Travis: Terminate test-stem if it takes more than 9.5 minutes to run

2019-04-05 Thread teor

commit 3fa42d599a205e51c91efb953af70a45e877eafe
Author: teor 
Date:   Thu Apr 4 13:02:13 2019 +1000

Travis: Terminate test-stem if it takes more than 9.5 minutes to run

(Travis terminates the job after 10 minutes of no output.)

Diagnostic for 29437.

Fixes bug 30011; bugfix on 0.3.5.4-alpha.
---
 .travis.yml  | 9 -
 changes/bug30011 | 4 
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b5713d693..e70344ee2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -131,6 +131,9 @@ addons:
   - docbook-xsl
   - docbook-xml
   - xmlto
+  ## Utilities
+  ## preventing or diagnosing hangs
+  - timelimit
   ## (OSX only)
   homebrew:
 packages:
@@ -154,6 +157,9 @@ addons:
   ## Always installed, because manual brew installs are hard to get right
   - asciidoc
   - xmlto
+  ## Utilities
+  ## preventing or diagnosing hangs
+  - timelimit
 
 ## (OSX only) Use the default OSX image
 ## See https://docs.travis-ci.com/user/reference/osx#os-x-version
@@ -202,7 +208,8 @@ script:
   - ./configure $CONFIGURE_FLAGS
   ## We run `make check` because that's what https://jenkins.torproject.org 
does.
   - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi
-  - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi
+  ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes
+  - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -T 30 make 
src/app/tor test-stem; fi
   - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck 
DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
 
 after_failure:
diff --git a/changes/bug30011 b/changes/bug30011
new file mode 100644
index 0..4c9069e29
--- /dev/null
+++ b/changes/bug30011
@@ -0,0 +1,4 @@
+  o Minor bugfixes (CI):
+- Terminate test-stem if it takes more than 9.5 minutes to run.
+  (Travis terminates the job after 10 minutes of no output.)
+  Diagnostic for 29437. Fixes bug 30011; bugfix on 0.3.5.4-alpha.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Run `make reset-gcov` after the script target in Travis CI is done.

2019-04-05 Thread teor

commit 0267c453e2e0d474f742efa1da3ce698ea4af97d
Author: Alexander FÃ¦rÃ¸y 
Date:   Mon Mar 18 15:27:14 2019 +0100

Run `make reset-gcov` after the script target in Travis CI is done.

This should ensure that GCDA files are never entering the cache of
Travis CI.

See: https://bugs.torproject.org/29036
---
 .travis.yml  | 8 +---
 changes/bug29036 | 5 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 939f4f4e9..5319bbb89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -155,6 +155,8 @@ script:
   ## We run `make check` because that's what https://jenkins.torproject.org 
does.
   - if [[ "$DISTCHECK" == "" ]]; then make check; fi
   - if [[ "$DISTCHECK" != "" ]]; then make distcheck 
DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
+  ## If this build was one that produced coverage, upload it.
+  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test 
--exclude src/trunnel --gcov-options '\-p'; fi
 
 after_failure:
   ## configure will leave a log file with more details of config failures.
@@ -165,9 +167,9 @@ after_failure:
   ## `make distcheck` puts it somewhere different.
   - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make 
failed"; fi
 
-after_success:
-  ## If this build was one that produced coverage, upload it.
-  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test 
--exclude src/trunnel --gcov-options '\-p'; fi
+before_cache:
+# Delete all .gcda files.
+  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi
 
 notifications:
   irc:
diff --git a/changes/bug29036 b/changes/bug29036
new file mode 100644
index 0..4de02adfe
--- /dev/null
+++ b/changes/bug29036
@@ -0,0 +1,5 @@
+  o Minor bugfix (continuous integration):
+- Reset coverage state on disk after Travis CI has finished. This is being
+  done to prevent future gcda file merge errors which causes the test suite
+  for the process subsystem to fail. Fixes bug 29036; bugfix on 
0.4.0.1-alpha.
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9

2019-04-05 Thread teor

commit a0db5ade3e1e2b81ed1196eb98aeca53583fba64
Merge: e1955a2c5 1710f4bbd
Author: teor 
Date:   Sat Apr 6 09:28:58 2019 +1000

Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9

 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Travis: merge before_cache from 29036 and 29962

2019-04-05 Thread teor

commit 33be8d8295415491fc06bee47729e86d9efcd126
Author: teor 
Date:   Mon Apr 1 14:05:14 2019 +1000

Travis: merge before_cache from 29036 and 29962

And add some useful comments
---
 .travis.yml | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4b2a1ffd7..ed805aac3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,10 @@ cache:
   ## cargo: true
   directories:
 - $HOME/.cargo
-
-before_cache:
-  - rm -rf $HOME/.cargo/registry
+## caching CARGO_TARGET_DIR actually slows down the build over time,
+## because old build products are never deleted.
+## where we point CARGO_TARGET_DIR in all our cargo invocations
+#- $TRAVIS_BUILD_DIR/src/rust/target
 
 compiler:
   - gcc
@@ -217,6 +218,9 @@ after_failure:
 before_cache:
   ## Delete all gcov files.
   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi
+  ## Delete the cargo registry before caching .cargo, because it's cheaper to
+  ## download the registry and throw it away, rather than caching it
+  - rm -rf $HOME/.cargo/registry
 
 notifications:
   irc:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Makefile: actually, don't delete the gcno files

2019-04-05 Thread teor

commit f0cd8f804f8152355993acf0493b22b668f500b2
Author: teor 
Date:   Fri Apr 5 12:56:29 2019 +1000

Makefile: actually, don't delete the gcno files

We need to keep the gcno files, because they are created at compile time.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 4b1687f92..48d3df265 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,9 +148,9 @@ test-full: need-stem-path need-chutney-path check 
test-network test-stem
 
 test-full-online: need-stem-path need-chutney-path check test-network 
test-stem-full
 
+# We can't delete the gcno files, because they are created when tor is compiled
 reset-gcov:
rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \
- $(top_builddir)/src/*/*.gcno $(top_builddir)/src/*/*/*.gcno \
  $(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov
 
 HTML_COVER_DIR=$(top_builddir)/coverage_html



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.4

2019-04-05 Thread teor

commit 48e990359b05661f2dd0ae503143ee9b18442475
Merge: 102178e6d a0db5ade3
Author: teor 
Date:   Sat Apr 6 09:33:11 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.4

 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] changes: Use the first Tor version with CI coverage for the 29036 changes file

2019-04-05 Thread teor

commit eb0bd18d6e344c574614d6d53e2f7cead92c3178
Author: teor 
Date:   Mon Apr 1 13:40:16 2019 +1000

changes: Use the first Tor version with CI coverage for the 29036 changes 
file

Otherwise, "make check-changes" will complain when we backport the change.
---
 changes/bug29036 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/changes/bug29036 b/changes/bug29036
index 4de02adfe..8b96c5c8f 100644
--- a/changes/bug29036
+++ b/changes/bug29036
@@ -1,5 +1,5 @@
   o Minor bugfix (continuous integration):
 - Reset coverage state on disk after Travis CI has finished. This is being
   done to prevent future gcda file merge errors which causes the test suite
-  for the process subsystem to fail. Fixes bug 29036; bugfix on 
0.4.0.1-alpha.
-
+  for the process subsystem to fail. The process subsystem was introduced
+  in 0.4.0.1-alpha. Fixes bug 29036; bugfix on 0.2.9.15.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] changes: Use the first Tor version with CI coverage for the 29036 changes file

2019-04-05 Thread teor

commit eb0bd18d6e344c574614d6d53e2f7cead92c3178
Author: teor 
Date:   Mon Apr 1 13:40:16 2019 +1000

changes: Use the first Tor version with CI coverage for the 29036 changes 
file

Otherwise, "make check-changes" will complain when we backport the change.
---
 changes/bug29036 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/changes/bug29036 b/changes/bug29036
index 4de02adfe..8b96c5c8f 100644
--- a/changes/bug29036
+++ b/changes/bug29036
@@ -1,5 +1,5 @@
   o Minor bugfix (continuous integration):
 - Reset coverage state on disk after Travis CI has finished. This is being
   done to prevent future gcda file merge errors which causes the test suite
-  for the process subsystem to fail. Fixes bug 29036; bugfix on 
0.4.0.1-alpha.
-
+  for the process subsystem to fail. The process subsystem was introduced
+  in 0.4.0.1-alpha. Fixes bug 29036; bugfix on 0.2.9.15.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

2019-04-05 Thread teor

commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff
Merge: 54e249e26 f0cd8f804
Author: teor 
Date:   Sat Apr 6 09:28:13 2019 +1000

Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

 .travis.yml  | 8 +---
 Makefile.am  | 4 +++-
 changes/bug29036 | 5 +
 3 files changed, 13 insertions(+), 4 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Handle errors from coveralls more gracefully.

2019-04-05 Thread teor

commit fbb1c7adfcfbda2f7ed6877beb137c382ecb6b50
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Mar 20 15:44:06 2019 +0100

Handle errors from coveralls more gracefully.

Since we have moved coveralls to the script target the entire build will
now fail if coveralls fail. We handle it more gracefully by echo'ing the
failure instead of doing a hard-failure.

See: https://bugs.torproject.org/29036
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5319bbb89..336b67d29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -156,7 +156,7 @@ script:
   - if [[ "$DISTCHECK" == "" ]]; then make check; fi
   - if [[ "$DISTCHECK" != "" ]]; then make distcheck 
DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
   ## If this build was one that produced coverage, upload it.
-  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test 
--exclude src/trunnel --gcov-options '\-p'; fi
+  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test 
--exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi
 
 after_failure:
   ## configure will leave a log file with more details of config failures.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Run `make reset-gcov` after the script target in Travis CI is done.

2019-04-05 Thread teor

commit 0267c453e2e0d474f742efa1da3ce698ea4af97d
Author: Alexander FÃ¦rÃ¸y 
Date:   Mon Mar 18 15:27:14 2019 +0100

Run `make reset-gcov` after the script target in Travis CI is done.

This should ensure that GCDA files are never entering the cache of
Travis CI.

See: https://bugs.torproject.org/29036
---
 .travis.yml  | 8 +---
 changes/bug29036 | 5 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 939f4f4e9..5319bbb89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -155,6 +155,8 @@ script:
   ## We run `make check` because that's what https://jenkins.torproject.org 
does.
   - if [[ "$DISTCHECK" == "" ]]; then make check; fi
   - if [[ "$DISTCHECK" != "" ]]; then make distcheck 
DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
+  ## If this build was one that produced coverage, upload it.
+  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test 
--exclude src/trunnel --gcov-options '\-p'; fi
 
 after_failure:
   ## configure will leave a log file with more details of config failures.
@@ -165,9 +167,9 @@ after_failure:
   ## `make distcheck` puts it somewhere different.
   - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make 
failed"; fi
 
-after_success:
-  ## If this build was one that produced coverage, upload it.
-  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test 
--exclude src/trunnel --gcov-options '\-p'; fi
+before_cache:
+# Delete all .gcda files.
+  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi
 
 notifications:
   irc:
diff --git a/changes/bug29036 b/changes/bug29036
new file mode 100644
index 0..4de02adfe
--- /dev/null
+++ b/changes/bug29036
@@ -0,0 +1,5 @@
+  o Minor bugfix (continuous integration):
+- Reset coverage state on disk after Travis CI has finished. This is being
+  done to prevent future gcda file merge errors which causes the test suite
+  for the process subsystem to fail. Fixes bug 29036; bugfix on 
0.4.0.1-alpha.
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Handle errors from coveralls more gracefully.

2019-04-05 Thread teor

commit fbb1c7adfcfbda2f7ed6877beb137c382ecb6b50
Author: Alexander FÃ¦rÃ¸y 
Date:   Wed Mar 20 15:44:06 2019 +0100

Handle errors from coveralls more gracefully.

Since we have moved coveralls to the script target the entire build will
now fail if coveralls fail. We handle it more gracefully by echo'ing the
failure instead of doing a hard-failure.

See: https://bugs.torproject.org/29036
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5319bbb89..336b67d29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -156,7 +156,7 @@ script:
   - if [[ "$DISTCHECK" == "" ]]; then make check; fi
   - if [[ "$DISTCHECK" != "" ]]; then make distcheck 
DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
   ## If this build was one that produced coverage, upload it.
-  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test 
--exclude src/trunnel --gcov-options '\-p'; fi
+  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test 
--exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi
 
 after_failure:
   ## configure will leave a log file with more details of config failures.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Do not cache bogus results from classifying client ciphers

2019-04-05 Thread teor

commit 1710f4bbd6bb100901e7f601a1c0f96b51845f86
Author: Nick Mathewson 
Date:   Thu Apr 4 11:24:55 2019 -0400

Do not cache bogus results from classifying client ciphers

When classifying a client's selection of TLS ciphers, if the client
ciphers are not yet available, do not cache the result. Previously,
we had cached the unavailability of the cipher list and never looked
again, which in turn led us to assume that the client only supported
the ancient V1 link protocol.  This, in turn, was causing Stem
integration tests to stall in some cases.  Fixes bug 30021; bugfix
on 0.2.4.8-alpha.
---
 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/changes/bug30021 b/changes/bug30021
new file mode 100644
index 0..2a887f3cf
--- /dev/null
+++ b/changes/bug30021
@@ -0,0 +1,8 @@
+  o Minor bugfixes (TLS protocol, integration tests):
+- When classifying a client's selection of TLS ciphers, if the client
+  ciphers are not yet available, do not cache the result. Previously,
+  we had cached the unavailability of the cipher list and never looked
+  again, which in turn led us to assume that the client only supported
+  the ancient V1 link protocol.  This, in turn, was causing Stem
+  integration tests to stall in some cases.
+  Fixes bug 30021; bugfix on 0.2.4.8-alpha.
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 1fbe3c663..f79969d0d 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1500,7 +1500,7 @@ tor_tls_classify_client_ciphers(const SSL *ssl,
 smartlist_free(elts);
   }
  done:
-  if (tor_tls)
+  if (tor_tls && peer_ciphers)
 return tor_tls->client_cipher_list_type = res;
 
   return res;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Makefile: actually, don't delete the gcno files

2019-04-05 Thread teor

commit f0cd8f804f8152355993acf0493b22b668f500b2
Author: teor 
Date:   Fri Apr 5 12:56:29 2019 +1000

Makefile: actually, don't delete the gcno files

We need to keep the gcno files, because they are created at compile time.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 4b1687f92..48d3df265 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,9 +148,9 @@ test-full: need-stem-path need-chutney-path check 
test-network test-stem
 
 test-full-online: need-stem-path need-chutney-path check test-network 
test-stem-full
 
+# We can't delete the gcno files, because they are created when tor is compiled
 reset-gcov:
rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \
- $(top_builddir)/src/*/*.gcno $(top_builddir)/src/*/*/*.gcno \
  $(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov
 
 HTML_COVER_DIR=$(top_builddir)/coverage_html



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2019-04-05 Thread teor

commit ca0089066bcf3eedd59fd194413d8d4e740eb3e5
Merge: bcac0bb34 a0db5ade3
Author: teor 
Date:   Sat Apr 6 09:33:06 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml | 8 +---
 Makefile.am | 4 +++-
 changes/bug29036| 5 +
 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 5 files changed, 22 insertions(+), 5 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4

2019-04-05 Thread teor

commit 102178e6d43ed990e972b2fbc4f611997c8943f0
Merge: 3cfcfbac4 a514e0247
Author: teor 
Date:   Sat Apr 6 09:30:04 2019 +1000

Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4

 .travis.yml | 15 +++
 Makefile.am |  4 +++-
 changes/bug29036|  5 +
 changes/ticket29962 |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Makefile: delete all the gcov-related files in reset-gcov

2019-04-05 Thread teor

commit 57e9fe2bbaa66ee907d68cdf7ebcf2111bd71ac9
Author: teor 
Date:   Mon Apr 1 13:49:27 2019 +1000

Makefile: delete all the gcov-related files in reset-gcov

And fix a comment.

See:
https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files
---
 .travis.yml | 2 +-
 Makefile.am | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 336b67d29..456b5abc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -168,7 +168,7 @@ after_failure:
   - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make 
failed"; fi
 
 before_cache:
-# Delete all .gcda files.
+  ## Delete all gcov files.
   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi
 
 notifications:
diff --git a/Makefile.am b/Makefile.am
index e4be3f26f..4b1687f92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,7 +149,9 @@ test-full: need-stem-path need-chutney-path check 
test-network test-stem
 test-full-online: need-stem-path need-chutney-path check test-network 
test-stem-full
 
 reset-gcov:
-   rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda
+   rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \
+ $(top_builddir)/src/*/*.gcno $(top_builddir)/src/*/*/*.gcno \
+ $(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov
 
 HTML_COVER_DIR=$(top_builddir)/coverage_html
 coverage-html: all



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5

2019-04-05 Thread teor

commit 316aed502e58102fa582ecd9902a3422c27b6dae
Merge: ea5e37182 3fa42d599
Author: teor 
Date:   Sat Apr 6 09:32:53 2019 +1000

Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5

 .travis.yml  | 9 -
 changes/bug30011 | 4 
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --cc .travis.yml
index f3ddd81ea,e70344ee2..45da26324
--- a/.travis.yml
+++ b/.travis.yml
@@@ -204,10 -208,9 +210,11 @@@ script
- ./configure $CONFIGURE_FLAGS
## We run `make check` because that's what https://jenkins.torproject.org 
does.
- if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi
-   - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi
+   ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes
+   - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -T 30 make 
src/app/tor test-stem; fi
- if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck 
DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
 +  ## If this build was one that produced coverage, upload it.
 +  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude 
src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; 
fi
  
  after_failure:
## configure will leave a log file with more details of config failures.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

2019-04-05 Thread teor

commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff
Merge: 54e249e26 f0cd8f804
Author: teor 
Date:   Sat Apr 6 09:28:13 2019 +1000

Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

 .travis.yml  | 8 +---
 Makefile.am  | 4 +++-
 changes/bug29036 | 5 +
 3 files changed, 13 insertions(+), 4 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5

2019-04-05 Thread teor

commit ea5e371822d58eb25eda912ba8afb8c0951b424c
Merge: 44ea34111 db1c1dba3
Author: teor 
Date:   Sat Apr 6 09:31:52 2019 +1000

Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5

 changes/bug30021 | 8 
 src/lib/tls/tortls_openssl.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-04-05 Thread teor

commit 8b3b605a1529e34eb42926db7c38d046a3f1bacb
Merge: 071a000d6 3b9e3cca9
Author: teor 
Date:   Sat Apr 6 09:33:28 2019 +1000

Merge branch 'maint-0.3.5' into maint-0.4.0

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-04-05 Thread teor

commit 3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748
Merge: 316aed502 48e990359
Author: teor 
Date:   Sat Apr 6 09:33:20 2019 +1000

Merge branch 'maint-0.3.4' into maint-0.3.5




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.4

2019-04-05 Thread teor

commit 48e990359b05661f2dd0ae503143ee9b18442475
Merge: 102178e6d a0db5ade3
Author: teor 
Date:   Sat Apr 6 09:33:11 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.4

 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-04-05 Thread teor

commit 8b3b605a1529e34eb42926db7c38d046a3f1bacb
Merge: 071a000d6 3b9e3cca9
Author: teor 
Date:   Sat Apr 6 09:33:28 2019 +1000

Merge branch 'maint-0.3.5' into maint-0.4.0




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9

2019-04-05 Thread teor

commit a0db5ade3e1e2b81ed1196eb98aeca53583fba64
Merge: e1955a2c5 1710f4bbd
Author: teor 
Date:   Sat Apr 6 09:28:58 2019 +1000

Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9

 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.0] Merge branch 'bug30021_029' into bug30021_035

2019-04-05 Thread teor

commit db1c1dba34545c9b96f9ec4c01338caeaeeb0433
Merge: 4aa02d3c7 1710f4bbd
Author: Nick Mathewson 
Date:   Thu Apr 4 11:26:33 2019 -0400

Merge branch 'bug30021_029' into bug30021_035

 changes/bug30021 | 8 
 src/lib/tls/tortls_openssl.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --cc src/lib/tls/tortls_openssl.c
index e702cb9df,0..80b0df301
mode 100644,00..100644
--- a/src/lib/tls/tortls_openssl.c
+++ b/src/lib/tls/tortls_openssl.c
@@@ -1,1795 -1,0 +1,1795 @@@
 +/* Copyright (c) 2003, Roger Dingledine.
 + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 + * Copyright (c) 2007-2019, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file tortls.c
 + * \brief Wrapper functions to present a consistent interface to
 + * TLS, SSL, and X.509 functions from OpenSSL.
 + **/
 +
 +/* (Unlike other tor functions, these
 + * are prefixed with tor_ in order to avoid conflicting with OpenSSL
 + * functions and variables.)
 + */
 +
 +#include "orconfig.h"
 +
 +#define TORTLS_PRIVATE
 +#define TORTLS_OPENSSL_PRIVATE
 +#define TOR_X509_PRIVATE
 +
 +#ifdef _WIN32
 +  /* We need to include these here, or else the dtls1.h header will include
 +   *  and mess things up, in at least some openssl versions. */
 +  #include 
 +  #include 
 +#endif
 +
 +#include "lib/crypt_ops/crypto_cipher.h"
 +#include "lib/crypt_ops/crypto_rand.h"
 +#include "lib/crypt_ops/crypto_dh.h"
 +#include "lib/crypt_ops/crypto_util.h"
 +#include "lib/crypt_ops/compat_openssl.h"
 +#include "lib/tls/x509.h"
 +#include "lib/tls/x509_internal.h"
 +
 +/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in
 + * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */
 +DISABLE_GCC_WARNING(redundant-decls)
 +
 +#include 
 +
 +#ifdef OPENSSL_NO_EC
 +#error "We require OpenSSL with ECC support"
 +#endif
 +
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +#include 
 +
 +ENABLE_GCC_WARNING(redundant-decls)
 +
 +#include "lib/tls/tortls.h"
 +#include "lib/tls/tortls_st.h"
 +#include "lib/tls/tortls_internal.h"
 +#include "lib/log/log.h"
 +#include "lib/log/util_bug.h"
 +#include "lib/container/smartlist.h"
 +#include "lib/string/compat_string.h"
 +#include "lib/string/printf.h"
 +#include "lib/net/socket.h"
 +#include "lib/intmath/cmp.h"
 +#include "lib/ctime/di_ops.h"
 +#include "lib/encoding/time_fmt.h"
 +
 +#include 
 +#include 
 +
 +#include "lib/arch/bytes.h"
 +
 +/* Copied from or.h */
 +#define LEGAL_NICKNAME_CHARACTERS \
 +  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 +
 +#define ADDR(tls) (((tls) && (tls)->address) ? tls->address : "peer")
 +
 +#if OPENSSL_VERSION_NUMBER <  OPENSSL_V(1,0,0,'f')
 +/* This is a version of OpenSSL before 1.0.0f. It does not have
 + * the CVE-2011-4576 fix, and as such it can't use RELEASE_BUFFERS and
 + * SSL3 safely at the same time.
 + */
 +#define DISABLE_SSL3_HANDSHAKE
 +#endif /* OPENSSL_VERSION_NUMBER <  OPENSSL_V(1,0,0,'f') */
 +
 +/* We redefine these so that we can run correctly even if the vendor gives us
 + * a version of OpenSSL that does not match its header files.  (Apple: I am
 + * looking at you.)
 + */
 +#ifndef SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
 +#define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0004L
 +#endif
 +#ifndef SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
 +#define SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0010
 +#endif
 +
 +/** Set to true iff openssl bug 7712 has been detected. */
 +static int openssl_bug_7712_is_present = 0;
 +
 +/** Return values for tor_tls_classify_client_ciphers.
 + *
 + * @{
 + */
 +/** An error occurred when examining the client ciphers */
 +#define CIPHERS_ERR -1
 +/** The client cipher list indicates that a v1 handshake was in use. */
 +#define CIPHERS_V1 1
 +/** The client cipher list indicates that the client is using the v2 or the
 + * v3 handshake, but that it is (probably!) lying about what ciphers it
 + * supports */
 +#define CIPHERS_V2 2
 +/** The client cipher list indicates that the client is using the v2 or the
 + * v3 handshake, and that it is telling the truth about what ciphers it
 + * supports */
 +#define CIPHERS_UNRESTRICTED 3
 +/** @} */
 +
 +/** The ex_data index in which we store a pointer to an SSL object's
 + * corresponding tor_tls_t object. */
 +STATIC int tor_tls_object_ex_data_index = -1;
 +
 +/** Helper: Allocate tor_tls_object_ex_data_index. */
 +void
 +tor_tls_allocate_tor_tls_object_ex_data_index(void)
 +{
 +  if (tor_tls_object_ex_data_index == -1) {
 +tor_tls_object_ex_data_index =
 +  SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL);
 +tor_assert(tor_tls_object_ex_data_index != -1);
 +  }
 +}
 +
 +/** Helper: given a SSL* pointer, return the tor_tls_t object using that
 + * pointer. */
 +tor_tls_t *
 +tor_tls_get_by_ssl(const SSL *ssl)
 +{
 +  tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5

2019-04-05 Thread teor

commit 44ea341117ef9f439d7ba9eae74a7a225646bfa3
Merge: 4aa02d3c7 db71bceb4
Author: teor 
Date:   Sat Apr 6 09:30:52 2019 +1000

Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5

 .travis.yml | 15 +++
 Makefile.am |  4 +++-
 changes/bug29036|  5 +
 changes/ticket29962 |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.4

2019-04-05 Thread teor

commit 48e990359b05661f2dd0ae503143ee9b18442475
Merge: 102178e6d a0db5ade3
Author: teor 
Date:   Sat Apr 6 09:33:11 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.4

 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-04-05 Thread teor

commit 3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748
Merge: 316aed502 48e990359
Author: teor 
Date:   Sat Apr 6 09:33:20 2019 +1000

Merge branch 'maint-0.3.4' into maint-0.3.5




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

2019-04-05 Thread teor

commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff
Merge: 54e249e26 f0cd8f804
Author: teor 
Date:   Sat Apr 6 09:28:13 2019 +1000

Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

 .travis.yml  | 8 +---
 Makefile.am  | 4 +++-
 changes/bug29036 | 5 +
 3 files changed, 13 insertions(+), 4 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5

2019-04-05 Thread teor

commit ea5e371822d58eb25eda912ba8afb8c0951b424c
Merge: 44ea34111 db1c1dba3
Author: teor 
Date:   Sat Apr 6 09:31:52 2019 +1000

Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5

 changes/bug30021 | 8 
 src/lib/tls/tortls_openssl.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

2019-04-05 Thread teor

commit f213a35b2f7e14b14f4d23dd2084190050d3ca32
Merge: f021ca2d5 8b3b605a1
Author: teor 
Date:   Sat Apr 6 09:33:38 2019 +1000

Merge branch 'maint-0.4.0'

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5

2019-04-05 Thread teor

commit 44ea341117ef9f439d7ba9eae74a7a225646bfa3
Merge: 4aa02d3c7 db71bceb4
Author: teor 
Date:   Sat Apr 6 09:30:52 2019 +1000

Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5

 .travis.yml | 15 +++
 Makefile.am |  4 +++-
 changes/bug29036|  5 +
 changes/ticket29962 |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5

2019-04-05 Thread teor

commit 44ea341117ef9f439d7ba9eae74a7a225646bfa3
Merge: 4aa02d3c7 db71bceb4
Author: teor 
Date:   Sat Apr 6 09:30:52 2019 +1000

Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5

 .travis.yml | 15 +++
 Makefile.am |  4 +++-
 changes/bug29036|  5 +
 changes/ticket29962 |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'tor-github/pr/906' into maint-0.4.0

2019-04-05 Thread teor

commit 071a000d67577a950b6a4404c3cf35bd90de3654
Merge: 2cc3c98bc da678213e
Author: George Kadianakis 
Date:   Fri Apr 5 16:44:59 2019 +0300

Merge branch 'tor-github/pr/906' into maint-0.4.0

 changes/bug29500   |   3 +
 src/core/or/circuitpadding.c   |   3 +-
 src/test/test_circuitpadding.c | 313 ++---
 3 files changed, 45 insertions(+), 274 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

1 2 3 4 >

1 - 100 of 315 matches

Mail list logo