Merge branch 'develop'

diff --git a/VERSION b/VERSION
index 0f0fefae5ac96803e7227191df7a6974709eb45d..5904f7adec1a0d8e5e10d8e72fcff747645ef796 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.1
+7.2

diff --git a/doc/download.texi b/doc/download.texi
index 60ac685c47490e505c9cacb845f514dad49ea58d..a9ee391bc1a2468416c754b55e8dc7f9af4f8bbe 100644 (file)
--- 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 9f7ebf05438a07d4e20052d4e14cc2fdb4a14700..3c764644d062b525c66f8df7f42847bdf3a9dc02 100644 (file)
--- 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 21104e0006b478d5f6be8ea13aa67e80bc0ad741..861004dc5032d49b3803e69d8daa65cc1fdb89bc 100644 (file)
--- 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 e43dc9c75c235f54dcf206209e17b62105cde430..37bd8405182afea9f205afd2782c1dbd9b97593e 100644 (file)
--- 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()