[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor-browser-build/maint-11.0] Bug 40416: updated obfsproxy to 0.0.12
commit 51f8de401745575ccc0e7357168a0b8aa62bbbda
Author: Pier Angelo Vendrame <pierov@xxxxxxxxxxxxxx>
Date: Mon Jan 24 09:29:46 2022 +0100
Bug 40416: updated obfsproxy to 0.0.12
---
projects/edwards25519-extra/config | 31 +++++++++++++++++++++++++++++++
projects/edwards25519/config | 17 +++++++++++++++++
projects/gobsaes/config | 8 ++++++--
projects/goutls/config | 3 +--
projects/goutls/sessionid.patch | 25 -------------------------
projects/obfs4/build | 3 ++-
projects/obfs4/config | 14 ++++++++------
7 files changed, 65 insertions(+), 36 deletions(-)
diff --git a/projects/edwards25519-extra/config b/projects/edwards25519-extra/config
new file mode 100644
index 0000000..2aa7390
--- /dev/null
+++ b/projects/edwards25519-extra/config
@@ -0,0 +1,31 @@
+# vim: filetype=yaml sw=2
+version: '[% c("abbrev") %]'
+git_url: https://gitlab.com/yawning/edwards25519-extra.git
+git_hash: 2f91fcc9fbdb888f3c795849b6777940135559b7
+filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
+
+build: '[% c("projects/go/var/build_go_lib") %]'
+
+var:
+ container:
+ use_container: 1
+ go_lib: gitlab.com/yawning/edwards25519-extra.git
+ go_lib_deps:
+ - goxcrypto
+ - edwards25519
+ go_lib_install:
+ - gitlab.com/yawning/edwards25519-extra.git/elligator2
+ - gitlab.com/yawning/edwards25519-extra.git/h2c
+ - gitlab.com/yawning/edwards25519-extra.git/vrf
+
+input_files:
+ - project: container-image
+ - name: go
+ project: go
+ - name: goxcrypto
+ project: goxcrypto
+ - name: edwards25519
+ project: edwards25519
+ - name: '[% c("var/compiler") %]'
+ project: '[% c("var/compiler") %]'
+ enable: '[% c("var/android") %]'
diff --git a/projects/edwards25519/config b/projects/edwards25519/config
new file mode 100644
index 0000000..0f3377d
--- /dev/null
+++ b/projects/edwards25519/config
@@ -0,0 +1,17 @@
+# vim: filetype=yaml sw=2
+version: '[% c("abbrev") %]'
+git_url: https://github.com/FiloSottile/edwards25519.git
+git_hash: 390f27c3be2014e4912ce88c6a1fff52ec60428b
+filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
+
+build: '[% c("projects/go/var/build_go_lib") %]'
+
+var:
+ container:
+ use_container: 1
+ go_lib: filippo.io/edwards25519
+
+input_files:
+ - project: container-image
+ - name: go
+ project: go
diff --git a/projects/gobsaes/config b/projects/gobsaes/config
index 3674488..cd8af1a 100644
--- a/projects/gobsaes/config
+++ b/projects/gobsaes/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
git_url: https://gitlab.com/yawning/bsaes.git
version: '[% c("abbrev") %]'
-git_hash: 26d1add596b6d800bdeeb3bc3b2c7b316c056b6d
+git_hash: 0a714cd429ec754482b4001e918db30cd2094405
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
build: '[% c("projects/go/var/build_go_lib") %]'
@@ -9,7 +9,9 @@ build: '[% c("projects/go/var/build_go_lib") %]'
var:
container:
use_container: 1
- go_lib: git.schwanenlied.me/yawning/bsaes.git
+ go_lib: gitlab.com/yawning/bsaes.git
+ go_lib_deps:
+ - goxsys
targets:
android:
@@ -21,6 +23,8 @@ input_files:
- project: container-image
- name: go
project: go
+ - name: goxsys
+ project: goxsys
- name: '[% c("var/compiler") %]'
project: '[% c("var/compiler") %]'
enable: '[% c("var/android") %]'
diff --git a/projects/goutls/config b/projects/goutls/config
index 7a46517..8052176 100644
--- a/projects/goutls/config
+++ b/projects/goutls/config
@@ -1,6 +1,6 @@
# vim: filetype=yaml sw=2
git_url: https://gitlab.com/yawning/utls.git
-version: 0.0.10-1
+version: 0.0.12-1
git_hash: 'v[% c("version") %]'
tag_gpg_id: 1
gpg_keyring: yawning.gpg
@@ -33,7 +33,6 @@ input_files:
project: gocompress
- name: gobsaes
project: gobsaes
- - filename: sessionid.patch
- name: '[% c("var/compiler") %]'
project: '[% c("var/compiler") %]'
enable: '[% c("var/android") %]'
diff --git a/projects/goutls/sessionid.patch b/projects/goutls/sessionid.patch
deleted file mode 100644
index fd3636d..0000000
--- a/projects/goutls/sessionid.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4da67951864128358459681399dd208c49d5d001 Mon Sep 17 00:00:00 2001
-From: Rod Hynes <rod-hynes@xxxxxxxxxxxxxxxxxxxxxxxx>
-Date: Mon, 12 Aug 2019 17:06:06 -0400
-Subject: [PATCH] Fix all-zeroes SessionID (#31)
-
----
- u_conn.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/u_conn.go b/u_conn.go
-index 9079460..2706373 100644
---- a/u_conn.go
-+++ b/u_conn.go
-@@ -121,7 +121,7 @@ func (uconn *UConn) SetSessionState(session *ClientSessionState) error {
- }
- }
- var sessionID [32]byte
-- _, err := io.ReadFull(uconn.config.rand(), uconn.HandshakeState.Hello.SessionId)
-+ _, err := io.ReadFull(uconn.config.rand(), sessionID[:])
- if err != nil {
- return err
- }
---
-2.22.0
-
diff --git a/projects/obfs4/build b/projects/obfs4/build
index b57b0c5..3aa2167 100644
--- a/projects/obfs4/build
+++ b/projects/obfs4/build
@@ -13,7 +13,8 @@ mkdir -p $PTDIR
[% END -%]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %]
-tar -C /var/tmp/dist -xf [% c('input_files_by_name/ed25519') %]
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/edwards25519') %]
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/edwards25519-extra') %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %]
diff --git a/projects/obfs4/config b/projects/obfs4/config
index eec61bb..a05d2d4 100644
--- a/projects/obfs4/config
+++ b/projects/obfs4/config
@@ -1,8 +1,8 @@
# vim: filetype=yaml sw=2
-version: 0.0.11
-git_url: https://git.torproject.org/pluggable-transports/obfs4.git
-git_hash: 40245c4a1cf221395c59d1f4bf274127045352f9
-tag_gpg_id: 0
+version: 0.0.12
+git_url: https://gitlab.com/yawning/obfs4.git
+git_hash: 'obfs4proxy-[% c("version") %]'
+tag_gpg_id: 1
gpg_keyring: yawning.gpg
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
@@ -22,8 +22,10 @@ input_files:
project: go
- name: goptlib
project: goptlib
- - name: ed25519
- project: ed25519
+ - name: edwards25519
+ project: edwards25519
+ - name: edwards25519-extra
+ project: edwards25519-extra
- name: siphash
project: siphash
- name: goxcrypto
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits