[tor-commits] [sandboxed-tor-browser/master] Use Config.Clone() to clone TLS configs when available.

[yawning@xxxxxxxxxxxxxx]

commit 710c78e3251b9ddb5351c34445b27ee2032771e3
Author: Yawning Angel <yawning@xxxxxxxxxxxxxxx>
Date:   Mon Apr 3 18:12:02 2017 +0000

    Use Config.Clone() to clone TLS configs when available.
---
 ChangeLog                                               |  1 +
 vendor/manifest                                         |  2 +-
 vendor/src/git.schwanenlied.me/yawning/hpkp.git/go17.go |  4 ++--
 vendor/src/git.schwanenlied.me/yawning/hpkp.git/go18.go | 13 +++++++++++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0ecc233..00ad82b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Changes in version 0.0.4 - UNRELEASED:
  * Bug 21536: Remove asn's scramblesuit bridge from Tor Browser.
  * Fix compilation with Go 1.8.
+ * Use Config.Clone() to clone TLS configs when available.
 
 Changes in version 0.0.3 - 2017-01-18:
  * Bug 21057: Change the metadata URL(s) for the stable bundle.
diff --git a/vendor/manifest b/vendor/manifest
index a783eed..53ec5e4 100644
--- a/vendor/manifest
+++ b/vendor/manifest
@@ -16,7 +16,7 @@
 		{
 			"importpath": "git.schwanenlied.me/yawning/hpkp.git",
 			"repository": "https://git.schwanenlied.me/yawning/hpkp.git";,
-			"revision": "47939e66e9ecea8452416d8695e80eed366efd7a",
+			"revision": "30623e5213bbab82a5ac7aae317c7e91e8ddf998",
 			"branch": "master"
 		},
 		{
diff --git a/vendor/src/git.schwanenlied.me/yawning/hpkp.git/go17.go b/vendor/src/git.schwanenlied.me/yawning/hpkp.git/go17.go
index d19616b..412591b 100644
--- a/vendor/src/git.schwanenlied.me/yawning/hpkp.git/go17.go
+++ b/vendor/src/git.schwanenlied.me/yawning/hpkp.git/go17.go
@@ -1,6 +1,6 @@
-// Go 1.7 and later tls.Config deep copy.
+// Go 1.7 tls.Config deep copy.
 
-// +build go1.7
+// +build go1.7,!go1.8
 
 package hpkp
 
diff --git a/vendor/src/git.schwanenlied.me/yawning/hpkp.git/go18.go b/vendor/src/git.schwanenlied.me/yawning/hpkp.git/go18.go
new file mode 100644
index 0000000..7db4d97
--- /dev/null
+++ b/vendor/src/git.schwanenlied.me/yawning/hpkp.git/go18.go
@@ -0,0 +1,13 @@
+// Go 1.8 and later tls.Config deep copy.
+
+// +build go1.8
+
+package hpkp
+
+import (
+	"crypto/tls"
+)
+
+func cloneTLSConfig(cfg *tls.Config) *tls.Config {
+	return cfg.Clone()
+}

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