Attachment 186764 Details for Bug 222645 – security/obfs4proxy: obfs4 (a.k.a. The Obfuscator) - Full Diff

[patch] security/obfs4proxy: obfs4 (a.k.a. The Obfuscator) - Full Diff

security_obfs4proxy_FULLDIFF.diff (text/plain), 14.39 KB, created by Vinícius Zavam on 2017-09-27 15:05:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vinícius Zavam

Created: 2017-09-27 15:05:08 UTC

Size: 14.39 KB

patch

obsolete

>Index: security/Makefile
>===================================================================
>--- security/Makefile	(revision 450750)
>+++ security/Makefile	(working copy)
>@@ -181,6 +181,8 @@
>     SUBDIR += gnupg20
>     SUBDIR += gnutls
>     SUBDIR += go-cve-dictionary
>+    SUBDIR += go-ed25519
>+    SUBDIR += go-siphash
>     SUBDIR += go.crypto
>     SUBDIR += goptlib
>     SUBDIR += gorilla
>@@ -420,6 +422,7 @@
>     SUBDIR += oath-toolkit
>     SUBDIR += obfsclient
>     SUBDIR += obfsproxy
>+    SUBDIR += obfs4proxy
>     SUBDIR += ocaml-cryptgps
>     SUBDIR += ocaml-cryptokit
>     SUBDIR += ocaml-ssl
>Index: security/go-ed25519/Makefile
>===================================================================
>--- security/go-ed25519/Makefile	(nonexistent)
>+++ security/go-ed25519/Makefile	(working copy)
>@@ -0,0 +1,23 @@
>+# $FreeBSD$
>+
>+PORTNAME=	go-ed25519
>+PORTVERSION=	20170116
>+CATEGORIES=	security devel
>+LICENSE=	BSD3CLAUSE
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+MAINTAINER=	egypcio@googlemail.com
>+COMMENT=	ed25519 for Go
>+
>+USES=		go
>+USE_GITHUB=	yes
>+
>+GH_ACCOUNT=	agl
>+GH_PROJECT=	ed25519
>+GH_TAGNAME=	5312a61
>+
>+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
>+GO_TARGET=	${GO_PKGNAME}/edwards25519 \
>+		${GO_PKGNAME}/extra25519
>+
>+.include <bsd.port.mk>
>
>Property changes on: security/go-ed25519/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/go-ed25519/distinfo
>===================================================================
>--- security/go-ed25519/distinfo	(nonexistent)
>+++ security/go-ed25519/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1499717534
>+SHA256 (agl-ed25519-20170116-5312a61_GH0.tar.gz) = 8508e21ca8bf39df655cd7d7ade16b168530a2dbc3791c00f0d2a62ca9003faa
>+SIZE (agl-ed25519-20170116-5312a61_GH0.tar.gz) = 107273
>
>Property changes on: security/go-ed25519/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/go-ed25519/pkg-descr
>===================================================================
>--- security/go-ed25519/pkg-descr	(nonexistent)
>+++ security/go-ed25519/pkg-descr	(working copy)
>@@ -0,0 +1,3 @@
>+ed25519 for Go
>+
>+WWW: https://github.com/agl/ed25519
>
>Property changes on: security/go-ed25519/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/go-ed25519/pkg-plist
>===================================================================
>--- security/go-ed25519/pkg-plist	(nonexistent)
>+++ security/go-ed25519/pkg-plist	(working copy)
>@@ -0,0 +1,6 @@
>+%%GO_LIBDIR%%/%%GO_PKGNAME%%/edwards25519.a
>+%%GO_LIBDIR%%/%%GO_PKGNAME%%/extra25519.a
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/edwards25519/const.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/edwards25519/edwards25519.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/extra25519/extra25519.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/extra25519/extra25519_test.go
>
>Property changes on: security/go-ed25519/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/go-siphash/Makefile
>===================================================================
>--- security/go-siphash/Makefile	(nonexistent)
>+++ security/go-siphash/Makefile	(working copy)
>@@ -0,0 +1,19 @@
>+# $FreeBSD$
>+
>+PORTNAME=	go-siphash
>+PORTVERSION=	20170831
>+CATEGORIES=	security devel
>+
>+MAINTAINER=	egypcio@googlemail.com
>+COMMENT=	Go implementation of SipHash-2-4
>+
>+USES=		go
>+USE_GITHUB=	yes
>+
>+GH_ACCOUNT=	dchest
>+GH_PROJECT=	siphash
>+GH_TAGNAME=	4ebf1de
>+
>+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
>+
>+.include <bsd.port.mk>
>
>Property changes on: security/go-siphash/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/go-siphash/distinfo
>===================================================================
>--- security/go-siphash/distinfo	(nonexistent)
>+++ security/go-siphash/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1499712693
>+SHA256 (dchest-siphash-20170831-4ebf1de_GH0.tar.gz) = 141deaa15ced586e5808e42ecfc127cccdfb1cb6f2a58389357e499b21aace74
>+SIZE (dchest-siphash-20170831-4ebf1de_GH0.tar.gz) = 10542
>
>Property changes on: security/go-siphash/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/go-siphash/pkg-descr
>===================================================================
>--- security/go-siphash/pkg-descr	(nonexistent)
>+++ security/go-siphash/pkg-descr	(working copy)
>@@ -0,0 +1,4 @@
>+Go implementation of SipHash-2-4, a fast short-input PRF created by 
>+ Jean-Philippe Aumasson and Daniel J. Bernstein (http://131002.net/siphash).
>+
>+WWW: https://github.com/dchest/siphash
>
>Property changes on: security/go-siphash/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/go-siphash/pkg-plist
>===================================================================
>--- security/go-siphash/pkg-plist	(nonexistent)
>+++ security/go-siphash/pkg-plist	(working copy)
>@@ -0,0 +1,14 @@
>+%%GO_LIBDIR%%/%%GO_PKGNAME%%.a
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/README.md
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/blocks_amd64.s
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/blocks_arm.s
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/blocks.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/hash_amd64.s
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/hash_arm.s
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/hash_asm.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/hash.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/hash128_amd64.s
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/hash128_arm.s
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/hash128.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/siphash_test.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/siphash.go
>
>Property changes on: security/go-siphash/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/obfs4proxy/Makefile
>===================================================================
>--- security/obfs4proxy/Makefile	(nonexistent)
>+++ security/obfs4proxy/Makefile	(working copy)
>@@ -0,0 +1,33 @@
>+# $FreeBSD$
>+
>+PORTNAME=	obfs4proxy
>+PORTVERSION=	0.0.7
>+CATEGORIES=	security net ipv6
>+MASTER_SITES=	http://people.torproject.org/~yawning/releases/${PORTNAME}/
>+LICENSE=	BSD3CLAUSE
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+MAINTAINER=	egypcio@googlemail.com
>+COMMENT=	The Obfuscator
>+
>+USES=		go tar:xz
>+
>+SUB_FILES=	pkg-message
>+
>+GO_PKGNAME=	git.torproject.org/pluggable-transports/obfs4.git
>+GO_TARGET=	${GO_PKGNAME}/${PORTNAME} \
>+		${GO_PKGNAME}/common/log \
>+		${GO_PKGNAME}/common/socks5 \
>+		${GO_PKGNAME}/transports \
>+		${GO_PKGNAME}/transports/base
>+
>+BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/git.torproject.org/pluggable-transports/goptlib.git.a:security/goptlib \
>+		${LOCALBASE}/${GO_LIBDIR}/github.com/agl/ed25519/extra25519.a:security/go-ed25519 \
>+		${LOCALBASE}/${GO_LIBDIR}/github.com/dchest/siphash.a:security/go-siphash \
>+		${LOCALBASE}/${GO_LIBDIR}/golang.org/x/crypto/bcrypt.a:security/go.crypto \
>+		${LOCALBASE}/${GO_LIBDIR}/golang.org/x/net/ipv4.a:net/go.net
>+
>+post-install:
>+	${INSTALL_MAN} ${WRKSRC}/doc/obfs4proxy.1 ${STAGEDIR}${PREFIX}/man/man1
>+
>+.include <bsd.port.mk>
>
>Property changes on: security/obfs4proxy/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/obfs4proxy/distinfo
>===================================================================
>--- security/obfs4proxy/distinfo	(nonexistent)
>+++ security/obfs4proxy/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1502290761
>+SHA256 (obfs4proxy-0.0.7.tar.xz) = c07a1a690ebab3057c8b566e1a4902439c77d1ba5c35bbf42fcdc5b46ab3ca63
>+SIZE (obfs4proxy-0.0.7.tar.xz) = 56184
>
>Property changes on: security/obfs4proxy/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/obfs4proxy/files/pkg-message.in
>===================================================================
>--- security/obfs4proxy/files/pkg-message.in	(nonexistent)
>+++ security/obfs4proxy/files/pkg-message.in	(working copy)
>@@ -0,0 +1,28 @@
>+======================================================================
>+
>+ To use obfs4 as a Bridge Client, please add the following configuration
>+to your 'torrc' config file:
>+
>+	ClientTransportPlugin obfs4 exec %%PREFIX%%/bin/obfs4proxy
>+
>+  To enable this Pluggable Transport in your Tor Bridge, use the
>+following configurations in your 'torrc' file:
>+
>+	# Use obfs4proxy to provide the obfuscator
>+	ServerTransportPlugin obfs4 exec %%PREFIX%%/bin/obfs4proxy managed
>+
>+	# Enable Extended ORPort
>+	ExtORPort auto
>+
>+	## (Optional) Listen on the specified IP:PORT for obfs4 connections
>+	## as opposed to picking a random port automatically
>+	# ServerTransportListenAddr obfs4 0.0.0.0:443
>+
>+  obfs4proxy is backwards compatible with obfs2 and obfs3 either in client or 
>+server mode. If you want to use it like this, please adjust your 'torrc' 
>+config file to fit your needs. It's compatible with ScrambleSuit in client mode.
>+
>+  For mor information, please consulte the official wiki page at 
>+https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy
>+
>+======================================================================
>
>Property changes on: security/obfs4proxy/files/pkg-message.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/obfs4proxy/pkg-descr
>===================================================================
>--- security/obfs4proxy/pkg-descr	(nonexistent)
>+++ security/obfs4proxy/pkg-descr	(working copy)
>@@ -0,0 +1,5 @@
>+  obfs4 (a.k.a. The Obfuscator) is a transport with the same features as 
>+ScrambleSuit but utilizing Dan Bernstein's elligator2 technique for public 
>+key obfuscation, and the ntor protocol for one-way authentication.
>+
>+WWW: https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy
>
>Property changes on: security/obfs4proxy/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/obfs4proxy/pkg-plist
>===================================================================
>--- security/obfs4proxy/pkg-plist	(nonexistent)
>+++ security/obfs4proxy/pkg-plist	(working copy)
>@@ -0,0 +1,30 @@
>+bin/obfs4proxy
>+man/man1/obfs4proxy.1.gz
>+%%GO_LIBDIR%%/%%GO_PKGNAME%%/common/log.a
>+%%GO_LIBDIR%%/%%GO_PKGNAME%%/common/socks5.a
>+%%GO_LIBDIR%%/%%GO_PKGNAME%%/transports.a
>+%%GO_LIBDIR%%/%%GO_PKGNAME%%/transports/base.a
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/common/log/log.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/common/socks5/args.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/common/socks5/args_test.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/common/socks5/rfc1929.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/common/socks5/socks5.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/common/socks5/socks_test.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/base/base.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/meeklite/base.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/meeklite/meek.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/obfs2/obfs2.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/obfs3/obfs3.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/obfs4/framing/framing.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/obfs4/framing/framing_test.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/obfs4/handshake_ntor.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/obfs4/handshake_ntor_test.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/obfs4/obfs4.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/obfs4/packet.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/obfs4/statefile.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/scramblesuit/base.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/scramblesuit/conn.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/scramblesuit/handshake_ticket.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/scramblesuit/handshake_uniformdh.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/scramblesuit/hkdf_expand.go
>+%%GO_SRCDIR%%/%%GO_PKGNAME%%/transports/transports.go
>
>Property changes on: security/obfs4proxy/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 222645: 186763 | 186764 | 188979 | 189003