From: Sergey Matveev Date: Thu, 21 Jan 2016 09:28:36 +0000 (+0300) Subject: Merge branch 'develop' X-Git-Tag: 5.3 X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=3e17694f1c906b92070d5bcd560a9b3595af2730;hp=1fea06143f0580f3d40a9ddbb1425ab613910155;p=govpn.git Merge branch 'develop' Signed-off-by: Sergey Matveev --- diff --git a/VERSION b/VERSION index ef425ca..d346e2a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.2 +5.3 diff --git a/common.mk b/common.mk index 95349c4..8597a61 100644 --- a/common.mk +++ b/common.mk @@ -10,16 +10,16 @@ DOCDIR = $(DESTDIR)$(PREFIX)/share/doc/govpn all: govpn-client govpn-server govpn-verifier govpn-client: - GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" govpn/cmd/govpn-client + GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/govpn/cmd/govpn-client govpn-server: - GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" govpn/cmd/govpn-server + GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/govpn/cmd/govpn-server govpn-verifier: - GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" govpn/cmd/govpn-verifier + GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/govpn/cmd/govpn-verifier bench: - GOPATH=$(GOPATH) go test -bench . govpn/... + GOPATH=$(GOPATH) go test -bench . cypherpunks.ru/govpn/... clean: rm -f govpn-client govpn-server govpn-verifier diff --git a/doc/download.texi b/doc/download.texi index c67efed..6dd3d92 100644 --- a/doc/download.texi +++ b/doc/download.texi @@ -9,6 +9,10 @@ You can obtain releases source code prepared tarballs from the links below: @multitable {XXXXX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx} @headitem Version @tab Size @tab Tarball @tab SHA256 checksum +@item 5.2 @tab 300 KiB +@tab @url{download/govpn-5.2.tar.xz, link} @url{download/govpn-5.2.tar.xz.sig, sign} +@tab @code{44e3a3265b30305a4436e172565585c327fb28d26197e61b7496c437d032c0db} + @item 5.1 @tab 287 KiB @tab @url{download/govpn-5.1.tar.xz, link} @url{download/govpn-5.1.tar.xz.sig, sign} @tab @code{0d456c5683287dca31f8c3302eb9a9329feab82bc1fbdb0098fca991513536d1} diff --git a/doc/installation.texi b/doc/installation.texi index ca95bb1..6320578 100644 --- a/doc/installation.texi +++ b/doc/installation.texi @@ -18,11 +18,12 @@ Possibly GoVPN already exists in your distribution: @end itemize GoVPN is written on Go programming language and you have to install Go -compiler (1.5+ version is highly recommended): @code{lang/go} port in -FreeBSD and @code{golang} package in most GNU/Linux distributions. -@emph{Make} (BSD and GNU ones are fine) is recommended for convenient -building. @url{https://www.gnu.org/software/texinfo/, Texinfo} is used -for building documentation. Possibly you also need to install TUN/TAP +compiler (1.5+ version is highly recommended, 1.4 is the minimal +sufficient): @code{lang/go} port in FreeBSD and @code{golang} package in +most GNU/Linux distributions. @emph{Make} (BSD and GNU ones are fine) is +recommended for convenient building. +@url{https://www.gnu.org/software/texinfo/, Texinfo} is used for +building documentation. Possibly you also need to install TUN/TAP interface utilities (depending on your operating system): @code{uml-utilities} package in most GNU/Linux distributions. diff --git a/doc/news.texi b/doc/news.texi index 608613a..2846bc6 100644 --- a/doc/news.texi +++ b/doc/news.texi @@ -5,6 +5,14 @@ @table @strong +@item Release 5.3 +@cindex Release 5.3 +@itemize +@item Fixed minor bug with @code{newclient.sh} that caught +"Passphrase:" prompt and inserted it into example YAML output. +Just replaced stdout output to stderr for that prompt. +@end itemize + @item Release 5.2 @cindex Release 5.2 @itemize diff --git a/doc/sources.texi b/doc/sources.texi index f1eb3eb..d6245ce 100644 --- a/doc/sources.texi +++ b/doc/sources.texi @@ -28,7 +28,7 @@ repositories will be unavailable (they are seldom updated): @multitable @columnfractions .50 .50 @headitem Software/library @tab Mirror -@item @code{govpn} @tab @url{https://github.com/stargrave/govpn.git} +@item @code{cypherpunks.ru/govpn} @tab @url{https://github.com/stargrave/govpn.git} @item @code{github.com/agl/ed25519} @tab @url{git://git.cypherpunks.ru/ed25519.git} @item @code{github.com/bigeagle/water} @tab @url{git://git.cypherpunks.ru/water.git} @item @code{github.com/dchest/blake2b} @tab @url{git://git.cypherpunks.ru/blake2b.git} diff --git a/src/govpn/aont/aont_test.go b/src/cypherpunks.ru/govpn/aont/aont_test.go similarity index 100% rename from src/govpn/aont/aont_test.go rename to src/cypherpunks.ru/govpn/aont/aont_test.go diff --git a/src/govpn/aont/oaep.go b/src/cypherpunks.ru/govpn/aont/oaep.go similarity index 100% rename from src/govpn/aont/oaep.go rename to src/cypherpunks.ru/govpn/aont/oaep.go diff --git a/src/govpn/cmd/govpn-client/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go similarity index 99% rename from src/govpn/cmd/govpn-client/main.go rename to src/cypherpunks.ru/govpn/cmd/govpn-client/main.go index e73854c..b46a16e 100644 --- a/src/govpn/cmd/govpn-client/main.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go @@ -27,7 +27,7 @@ import ( "os/signal" "time" - "govpn" + "cypherpunks.ru/govpn" ) var ( diff --git a/src/govpn/cmd/govpn-client/proxy.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/proxy.go similarity index 100% rename from src/govpn/cmd/govpn-client/proxy.go rename to src/cypherpunks.ru/govpn/cmd/govpn-client/proxy.go diff --git a/src/govpn/cmd/govpn-client/tcp.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/tcp.go similarity index 99% rename from src/govpn/cmd/govpn-client/tcp.go rename to src/cypherpunks.ru/govpn/cmd/govpn-client/tcp.go index 7f2af60..7e2b1a3 100644 --- a/src/govpn/cmd/govpn-client/tcp.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-client/tcp.go @@ -25,7 +25,7 @@ import ( "sync/atomic" "time" - "govpn" + "cypherpunks.ru/govpn" ) func startTCP(timeouted, rehandshaking, termination chan struct{}) { diff --git a/src/govpn/cmd/govpn-client/udp.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/udp.go similarity index 99% rename from src/govpn/cmd/govpn-client/udp.go rename to src/cypherpunks.ru/govpn/cmd/govpn-client/udp.go index 581e66c..3d0c421 100644 --- a/src/govpn/cmd/govpn-client/udp.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-client/udp.go @@ -24,7 +24,7 @@ import ( "sync/atomic" "time" - "govpn" + "cypherpunks.ru/govpn" ) func startUDP(timeouted, rehandshaking, termination chan struct{}) { diff --git a/src/govpn/cmd/govpn-server/common.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go similarity index 98% rename from src/govpn/cmd/govpn-server/common.go rename to src/cypherpunks.ru/govpn/cmd/govpn-server/common.go index 313fc39..eac8a98 100644 --- a/src/govpn/cmd/govpn-server/common.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "govpn" + "cypherpunks.ru/govpn" ) type PeerState struct { diff --git a/src/govpn/cmd/govpn-server/conf.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go similarity index 99% rename from src/govpn/cmd/govpn-server/conf.go rename to src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go index 00fa7c8..131eeba 100644 --- a/src/govpn/cmd/govpn-server/conf.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go @@ -26,7 +26,7 @@ import ( "github.com/go-yaml/yaml" - "govpn" + "cypherpunks.ru/govpn" ) const ( diff --git a/src/govpn/cmd/govpn-server/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go similarity index 99% rename from src/govpn/cmd/govpn-server/main.go rename to src/cypherpunks.ru/govpn/cmd/govpn-server/main.go index e7abfdf..886b8a8 100644 --- a/src/govpn/cmd/govpn-server/main.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go @@ -27,7 +27,7 @@ import ( "os/signal" "time" - "govpn" + "cypherpunks.ru/govpn" ) var ( diff --git a/src/govpn/cmd/govpn-server/proxy.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/proxy.go similarity index 100% rename from src/govpn/cmd/govpn-server/proxy.go rename to src/cypherpunks.ru/govpn/cmd/govpn-server/proxy.go diff --git a/src/govpn/cmd/govpn-server/tcp.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/tcp.go similarity index 99% rename from src/govpn/cmd/govpn-server/tcp.go rename to src/cypherpunks.ru/govpn/cmd/govpn-server/tcp.go index e3458cb..417fcb1 100644 --- a/src/govpn/cmd/govpn-server/tcp.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/tcp.go @@ -24,7 +24,7 @@ import ( "net" "time" - "govpn" + "cypherpunks.ru/govpn" ) func startTCP() { diff --git a/src/govpn/cmd/govpn-server/udp.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/udp.go similarity index 99% rename from src/govpn/cmd/govpn-server/udp.go rename to src/cypherpunks.ru/govpn/cmd/govpn-server/udp.go index ddbbee8..73f4d6f 100644 --- a/src/govpn/cmd/govpn-server/udp.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/udp.go @@ -22,7 +22,7 @@ import ( "log" "net" - "govpn" + "cypherpunks.ru/govpn" ) type UDPSender struct { diff --git a/src/govpn/cmd/govpn-verifier/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go similarity index 98% rename from src/govpn/cmd/govpn-verifier/main.go rename to src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go index 10bd90b..5d59580 100644 --- a/src/govpn/cmd/govpn-verifier/main.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go @@ -25,7 +25,7 @@ import ( "fmt" "log" - "govpn" + "cypherpunks.ru/govpn" ) var ( diff --git a/src/govpn/cnw/cnw.go b/src/cypherpunks.ru/govpn/cnw/cnw.go similarity index 100% rename from src/govpn/cnw/cnw.go rename to src/cypherpunks.ru/govpn/cnw/cnw.go diff --git a/src/govpn/cnw/cnw_test.go b/src/cypherpunks.ru/govpn/cnw/cnw_test.go similarity index 100% rename from src/govpn/cnw/cnw_test.go rename to src/cypherpunks.ru/govpn/cnw/cnw_test.go diff --git a/src/govpn/common.go b/src/cypherpunks.ru/govpn/common.go similarity index 100% rename from src/govpn/common.go rename to src/cypherpunks.ru/govpn/common.go diff --git a/src/govpn/conf.go b/src/cypherpunks.ru/govpn/conf.go similarity index 100% rename from src/govpn/conf.go rename to src/cypherpunks.ru/govpn/conf.go diff --git a/src/govpn/egd.go b/src/cypherpunks.ru/govpn/egd.go similarity index 100% rename from src/govpn/egd.go rename to src/cypherpunks.ru/govpn/egd.go diff --git a/src/govpn/encless.go b/src/cypherpunks.ru/govpn/encless.go similarity index 97% rename from src/govpn/encless.go rename to src/cypherpunks.ru/govpn/encless.go index 21162b7..30eb4a5 100644 --- a/src/govpn/encless.go +++ b/src/cypherpunks.ru/govpn/encless.go @@ -19,8 +19,8 @@ along with this program. If not, see . package govpn import ( - "govpn/aont" - "govpn/cnw" + "cypherpunks.ru/govpn/aont" + "cypherpunks.ru/govpn/cnw" ) const ( diff --git a/src/govpn/encless_test.go b/src/cypherpunks.ru/govpn/encless_test.go similarity index 100% rename from src/govpn/encless_test.go rename to src/cypherpunks.ru/govpn/encless_test.go diff --git a/src/govpn/govpn.go b/src/cypherpunks.ru/govpn/govpn.go similarity index 100% rename from src/govpn/govpn.go rename to src/cypherpunks.ru/govpn/govpn.go diff --git a/src/govpn/handshake.go b/src/cypherpunks.ru/govpn/handshake.go similarity index 100% rename from src/govpn/handshake.go rename to src/cypherpunks.ru/govpn/handshake.go diff --git a/src/govpn/handshake_test.go b/src/cypherpunks.ru/govpn/handshake_test.go similarity index 100% rename from src/govpn/handshake_test.go rename to src/cypherpunks.ru/govpn/handshake_test.go diff --git a/src/govpn/identify.go b/src/cypherpunks.ru/govpn/identify.go similarity index 100% rename from src/govpn/identify.go rename to src/cypherpunks.ru/govpn/identify.go diff --git a/src/govpn/peer.go b/src/cypherpunks.ru/govpn/peer.go similarity index 100% rename from src/govpn/peer.go rename to src/cypherpunks.ru/govpn/peer.go diff --git a/src/govpn/peer_test.go b/src/cypherpunks.ru/govpn/peer_test.go similarity index 100% rename from src/govpn/peer_test.go rename to src/cypherpunks.ru/govpn/peer_test.go diff --git a/src/govpn/stats.go b/src/cypherpunks.ru/govpn/stats.go similarity index 100% rename from src/govpn/stats.go rename to src/cypherpunks.ru/govpn/stats.go diff --git a/src/govpn/tap.go b/src/cypherpunks.ru/govpn/tap.go similarity index 100% rename from src/govpn/tap.go rename to src/cypherpunks.ru/govpn/tap.go diff --git a/src/govpn/tap_freebsd.go b/src/cypherpunks.ru/govpn/tap_freebsd.go similarity index 100% rename from src/govpn/tap_freebsd.go rename to src/cypherpunks.ru/govpn/tap_freebsd.go diff --git a/src/govpn/tap_linux.go b/src/cypherpunks.ru/govpn/tap_linux.go similarity index 100% rename from src/govpn/tap_linux.go rename to src/cypherpunks.ru/govpn/tap_linux.go diff --git a/src/govpn/verifier.go b/src/cypherpunks.ru/govpn/verifier.go similarity index 97% rename from src/govpn/verifier.go rename to src/cypherpunks.ru/govpn/verifier.go index 0dc9388..a452a50 100644 --- a/src/govpn/verifier.go +++ b/src/cypherpunks.ru/govpn/verifier.go @@ -25,6 +25,7 @@ import ( "fmt" "io/ioutil" "log" + "os" "strings" "github.com/agl/ed25519" @@ -125,9 +126,9 @@ func KeyRead(path string) (string, error) { var err error var pass string if path == "" { - fmt.Print("Passphrase:") + os.Stderr.Write([]byte("Passphrase:")) p, err = terminal.ReadPassword(0) - fmt.Print("\n") + os.Stderr.Write([]byte("\n")) pass = string(p) } else { p, err = ioutil.ReadFile(path)