From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 14 Feb 2017 10:10:35 +0000 (+0300)
Subject: Merge branch 'develop'
X-Git-Tag: 7.2^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=8699e7d19344ad654e18e24381e660717609bbba;hp=eb63bd7cb200da72cc782f4fef873ebfdc6c0eba

Merge branch 'develop'
---

diff --git a/VERSION b/VERSION
index 0f0fefa..5904f7a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.1
+7.2
diff --git a/doc/download.texi b/doc/download.texi
index 60ac685..a9ee391 100644
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -18,6 +18,10 @@ Tarballs include all necessary required libraries:
 @multitable {XXXXX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx}
 @headitem Version @tab Size @tab Tarball @tab SHA256 checksum
 
+@item @ref{Release 7.1, 7.1} @tab 289 KiB
+@tab @url{download/govpn-7.1.tar.xz, link} @url{download/govpn-7.1.tar.xz.sig, sign}
+@tab @code{DB656A87 508D6902 B9C8964D C20937BF C95E1E78 1998311F F8F85A95 F64862BB}
+
 @item @ref{Release 7.0, 7.0} @tab 287 KiB
 @tab @url{download/govpn-7.0.tar.xz, link} @url{download/govpn-7.0.tar.xz.sig, sign}
 @tab @code{DF85E42D F1228E8C FA5D582D AEF90553 23033630 E12B0B26 D7DEFBEB B25DBC4C}
diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 9f7ebf0..3c76464 100644
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,13 @@
 @node Новости
 @section Новости
 
+@node Релиз 7.2
+@subsection Релиз 7.2
+@itemize
+@item Исправлена фатальная ошибка в коде генерирования nonce-ов,
+появившаяся в версии 7.1. Всем @strong{необходимо} обновиться.
+@end itemize
+
 @node Релиз 7.1
 @subsection Релиз 7.1
 @itemize
diff --git a/doc/news.texi b/doc/news.texi
index 21104e0..861004d 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,13 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 7.2
+@section Release 7.2
+@itemize
+@item Fixed fatal bug in nonce generation code, appeared in 7.1 version.
+Everyone @strong{have to} update.
+@end itemize
+
 @node Release 7.1
 @section Release 7.1
 @itemize
diff --git a/src/cypherpunks.ru/govpn/peer.go b/src/cypherpunks.ru/govpn/peer.go
index e43dc9c..37bd840 100644
--- a/src/cypherpunks.ru/govpn/peer.go
+++ b/src/cypherpunks.ru/govpn/peer.go
@@ -63,7 +63,7 @@ func newNonces(key *[32]byte, i uint64) chan *[NonceSize]byte {
 			buf := new([NonceSize]byte)
 			binary.BigEndian.PutUint64(buf[:], i)
 			mac.Write(buf[:])
-			mac.Sum(sum[0:])
+			mac.Sum(sum[:0])
 			copy(buf[:], sum)
 			nonces <- buf
 			mac.Reset()