Merge branch 'develop'

diff --git a/README b/README
index 221809ea61dc3139fa8eb0c19c0578160dcf2d29..24a4086c777891549b91825e3da80fddef786b23 100644 (file)
--- a/README
+++ b/README
@@ -15,8 +15,6 @@ GNU/Linux and FreeBSD support.
 GoVPN is free software: see the file COPYING for copying conditions.
 
 Home page: http://www.govpn.info/
-Also available as I2P service:
-http://zy2qxyziqzledqqb5vcq5unfxnn2csv6revteliybd7qxb64dpxq.b32.i2p/
 
 Please send questions regarding the use of GoVPN, bug reports and
 patches to govpn-devel mailing list:

diff --git a/README.RU b/README.RU
index f1731a21830c7355e28dfb1c904ffdc4f70d5046..79cd42fbbb9ee1d8de1de250ae82a5ac28c74384 100644 (file)
--- a/README.RU
+++ b/README.RU
@@ -19,8 +19,6 @@ GoVPN это свободное программное обеспечением:
 находятся в файле COPYING.
 
 Домашняя страница: http://www.govpn.info/
-Также доступная как I2P сервис:
-http://zy2qxyziqzledqqb5vcq5unfxnn2csv6revteliybd7qxb64dpxq.b32.i2p/
 
 Пожалуйста все вопросы касающиеся использования GoVPN, отчёты об ошибках
 и патчи отправляйте в govpn-devel почтовую рассылку:

diff --git a/VERSION b/VERSION
index 37722ebbc756a3160e7f4aeb04d4c8f69e5fa8a3..c382960e38796254910dcdfb506d19fcf1685cf4 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.4
+7.5

diff --git a/doc/contacts.texi b/doc/contacts.texi
index 1c8b5b27219e7e370461db8333350028ef1c2755..d808e6441c3e962d4a28c2069ab4631042a64dd1 100644 (file)
--- a/doc/contacts.texi
+++ b/doc/contacts.texi
@@ -5,6 +5,4 @@ Please send questions regarding the use of GoVPN, bug reports and patches to
 @url{https://lists.cypherpunks.ru/pipermail/govpn-devel/, govpn-devel}
 mailing list. Announcements also go to this mailing list.
 
-Official website is @url{http://www.govpn.info/}, also available as
-@url{https://geti2p.net/en/, I2P} service
-@url{http://zy2qxyziqzledqqb5vcq5unfxnn2csv6revteliybd7qxb64dpxq.b32.i2p/}.
+Official website is @url{http://www.govpn.info/}.

diff --git a/doc/download.texi b/doc/download.texi
index 463aa91408662278ddc0c4276575c0cfd960e630..ec51dbca9edc854a134b91139217cb66816081bb 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -19,6 +19,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.4, 7.4} @tab 494 KiB
+@tab @url{download/govpn-7.4.tar.xz, link} @url{download/govpn-7.4.tar.xz.sig, sign}
+@tab @code{2335504F 2975B8E2 F3835BB1 E5FECDDC 6E426F71 D29359E0 83F09F79 2A0763EF}
+
 @item @ref{Release 7.3, 7.3} @tab 289 KiB
 @tab @url{download/govpn-7.3.tar.xz, link} @url{download/govpn-7.3.tar.xz.sig, sign}
 @tab @code{C3A27353 4A448112 09C4CB1D CA26EBFE 56644D5A D51C8216 BA22EC18 150A4EE8}
@@ -140,5 +144,3 @@ Tarballs include all necessary required libraries:
 @tab @code{715B07D4 D1EA4396 C3E37014 CA65EC37 68818423 521F3C12 E7200B6E DCA48C31}
 
 @end multitable
-
-Also you can try its @ref{Contacts, .i2p} version.

diff --git a/doc/faq.ru.texi b/doc/faq.ru.texi
index 18e5db7c888d0d24900d0483db1175ae9104d6bd..d89c4293acf1a4a9ec6c71c30903d5bb60e9d24a 100644 (file)
--- a/doc/faq.ru.texi
+++ b/doc/faq.ru.texi
@@ -67,7 +67,7 @@ Go очень легко читается, поддаётся ревью и по
 @node Почему ручная настройка сети
 @subsection Почему вся настройка сети делается вручную?
 
-Потому-что существует так много вариантов использования, конфигураций и
+Потому что существует так много вариантов использования, конфигураций и
 установок, что или я поддерживаю их все, или использую громоздкие
 протоколы типы PPP, или просто даю право выбора администратору. VPN это
 всего-лишь прослойка.

diff --git a/doc/index.texi b/doc/index.texi
index 624abba1fc673dcfcf1708086573e5a026f6811f..e39c1b7ca3295e313787b3e44405c2b50cbbd15d 100644 (file)
--- a/doc/index.texi
+++ b/doc/index.texi
@@ -7,7 +7,7 @@ This manual is for GoVPN -- simple free software virtual private network
 daemon, aimed to be reviewable, secure, DPI/censorship-resistant,
 written on Go.
 
-Copyright @copyright{} 2014-2017 @email{stargrave@@stargrave.org, Sergey Matveev}
+Copyright @copyright{} 2014-2018 @email{stargrave@@stargrave.org, Sergey Matveev}
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/doc/media.texi b/doc/media.texi
index 578efc8eaa170cf93eb347ef99f50ddf1baf89ef..bc2be860dc83e2b571475473fb8637ec36e890b1 100644 (file)
--- a/doc/media.texi
+++ b/doc/media.texi
@@ -8,4 +8,5 @@
 @item @url{http://www.linuxspace.org/archives/9449, Установка и настройка безопасного VPN-демона GoVPN 3.2} (on russian)
 @item @url{http://www.linuxspace.org/archives/14123, Установка и настройка безопасного VPN-демона GoVPN 5.10} (on russian)
 @item @url{https://www.youtube.com/watch?v=Civ3CKW71pA, Презентация GoVPN на CryptoInstallFest 3} (on russian)
+@item @url{https://xakep.ru/2016/10/07/vpn-review/, Строим туннели. Разбираемся с новинками VPN} (on russian)
 @end itemize

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 08aa4c792c698d60564ac5b489f757e928634263..40a0421064f3f7ae8fdacb9255fc647cb989bc8b 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,13 @@
 @node Новости
 @section Новости
 
+@node Релиз 7.5
+@subsection Релиз 7.5
+@itemize
+@item Обновлены зависимые криптографические библиотеки для совместимости
+с Go 1.11.
+@end itemize
+
 @node Релиз 7.4
 @subsection Релиз 7.4
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index 03d61ef30df7ea66c02ca10ff9314cde2bf4a3f5..47639f61f510e59c33c3685155905e514be2ff9f 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,13 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 7.5
+@section Release 7.5
+@itemize
+@item Dependant cryptographic libraries are updated for compatibility
+with Go 1.11.
+@end itemize
+
 @node Release 7.4
 @section Release 7.4
 @itemize

diff --git a/src/chacha20 b/src/chacha20
index 95f85aa47858705926bd6a73ccbf4f9d7bf5df74..883eae7b16454a384fbc1de37140612edafeec3e 120000 (symlink)
--- a/src/chacha20
+++ b/src/chacha20
@@ -1 +1 @@
-golang.org/x/crypto/chacha20poly1305/internal/chacha20
\ No newline at end of file
+golang.org/x/crypto/internal/chacha20
\ No newline at end of file

diff --git a/src/cypherpunks.ru/balloon b/src/cypherpunks.ru/balloon
index 3cd3006ad829a0afc7ca3d964ff333ef068464bd..92c161713a13cc78403468c09f1557eb7c4a3a4a 160000 (submodule)
--- a/src/cypherpunks.ru/balloon
+++ b/src/cypherpunks.ru/balloon
@@ -1 +1 @@
-Subproject commit 3cd3006ad829a0afc7ca3d964ff333ef068464bd
+Subproject commit 92c161713a13cc78403468c09f1557eb7c4a3a4a

diff --git a/src/cypherpunks.ru/govpn/aont/aont_test.go b/src/cypherpunks.ru/govpn/aont/aont_test.go
index b586775bdd8650cf1e0105b6db58f11a2ca02499..1248addc5b132ff4a6ed33e107df333a2b33343c 100644 (file)
--- a/src/cypherpunks.ru/govpn/aont/aont_test.go
+++ b/src/cypherpunks.ru/govpn/aont/aont_test.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/aont/oaep.go b/src/cypherpunks.ru/govpn/aont/oaep.go
index b648ccb7e26695f2fab2581d2844c1684eb034b7..4cedaaac081ad0f294daf0eb39be2a6c5d5277a4 100644 (file)
--- a/src/cypherpunks.ru/govpn/aont/oaep.go
+++ b/src/cypherpunks.ru/govpn/aont/oaep.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/client/client.go b/src/cypherpunks.ru/govpn/client/client.go
index 3014bdfab6adf0bf9276d6e31a7575286917791b..0d12023a846ebe846c1b254512242f5d5daeb449 100644 (file)
--- a/src/cypherpunks.ru/govpn/client/client.go
+++ b/src/cypherpunks.ru/govpn/client/client.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/client/proxy.go b/src/cypherpunks.ru/govpn/client/proxy.go
index be7d1149fa3e4d44e257a195fe92151c11e8ec8d..843381e5607f058465d15219f1597ab5c88cf600 100644 (file)
--- a/src/cypherpunks.ru/govpn/client/proxy.go
+++ b/src/cypherpunks.ru/govpn/client/proxy.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -55,6 +55,6 @@ func (c *Client) proxyTCP() {
                c.Error <- fmt.Errorf("Unexpected response from proxy: %s", err.Error())
                return
        }
-       govpn.Printf(`[proxy-connected remote="%s" addr="%s"]`, c.config.RemoteAddress, *proxyAddr)
+       govpn.Printf(`[proxy-connected remote="%s" addr="%s"]`, c.config.RemoteAddress, (*proxyAddr).String())
        go c.handleTCP(conn)
 }

diff --git a/src/cypherpunks.ru/govpn/client/tcp.go b/src/cypherpunks.ru/govpn/client/tcp.go
index 4bb7a5fd4856390f812045da4b03bd831270709d..4c16b707b6b8bcf61b742d2acd10ff80c5248ad5 100644 (file)
--- a/src/cypherpunks.ru/govpn/client/tcp.go
+++ b/src/cypherpunks.ru/govpn/client/tcp.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/client/udp.go b/src/cypherpunks.ru/govpn/client/udp.go
index bb29dccd961f4fd0385046a23f33de123277d433..70000d3e5f190d5daf322e3b6a97773d62859416 100644 (file)
--- a/src/cypherpunks.ru/govpn/client/udp.go
+++ b/src/cypherpunks.ru/govpn/client/udp.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
index 8fcd988ecc8c6d1bb8bf3a688482df4751fa8c28..08f73b4807b985437bb9021ce7d50f653c924728 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go
index e0e8e033da043f42a000a219f3559d1f0fbda613..65e94b7a0eb96b3ca238439bce2fd3a2a3c510d6 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go
index 62eca02437fa6135046345d0aa92c974a39c7e30..f5b4dd8f8269c470f80bed68f6486f8c3305cf0a 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
index 0dfd8ab83198f449f7d4148f8e1e11c780eff189..8a1f2a4864aaf4d5e84e80a6bf315fbc6d39f6be 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/proxy.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/proxy.go
index 87e3455e13b700d5ce288791f83744816e44d368..c9478f642b8319852aa5384bbcff219c3dae58b0 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/proxy.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/proxy.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/tcp.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/tcp.go
index aab59b723c57986d5520e64e6251f45c5f3e812e..3034b5444b66e4fc5d0b27202d77ba4a7f244140 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/tcp.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/tcp.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/udp.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/udp.go
index f074df47a6740ff390a665c3cfc94c3bfb1e0454..de0b8dccfe720cf646f9a7196e35d5713aa9d7f8 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/udp.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/udp.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
index aac36bafb664d5bce876f60bd25a9d105eaa216e..9b38bcbade68e7c14b3a871aad68f1500f2fb534 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/cnw/cnw.go b/src/cypherpunks.ru/govpn/cnw/cnw.go
index eaf0958b1cbdbc7d17fd213fd3abde1c81363c02..baf59d59022d600fc62530d05a643f195ed59c38 100644 (file)
--- a/src/cypherpunks.ru/govpn/cnw/cnw.go
+++ b/src/cypherpunks.ru/govpn/cnw/cnw.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/cnw/cnw_test.go b/src/cypherpunks.ru/govpn/cnw/cnw_test.go
index 29e408f42405a6a0936b4e70f4c3bd84057e52f4..b25d3af1dec5fe91fb355783ed24a92d224cd0f5 100644 (file)
--- a/src/cypherpunks.ru/govpn/cnw/cnw_test.go
+++ b/src/cypherpunks.ru/govpn/cnw/cnw_test.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/common.go b/src/cypherpunks.ru/govpn/common.go
index 030794c726a5d13ba47a97d286ef237c4262519e..de293ae90d2d08e42447e1e27a5412583c2d3e5c 100644 (file)
--- a/src/cypherpunks.ru/govpn/common.go
+++ b/src/cypherpunks.ru/govpn/common.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/conf.go b/src/cypherpunks.ru/govpn/conf.go
index 7a9c4b8ce6ba00da4c9bad96e84eeeac10b17ee7..6c079331945a2355c4dfc7fe4281b716bfa96310 100644 (file)
--- a/src/cypherpunks.ru/govpn/conf.go
+++ b/src/cypherpunks.ru/govpn/conf.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/egd.go b/src/cypherpunks.ru/govpn/egd.go
index f54c1168d11e0ce4287090e0079678414443316a..9b4424f0fea0248cc671d814b9e499b5272170b0 100644 (file)
--- a/src/cypherpunks.ru/govpn/egd.go
+++ b/src/cypherpunks.ru/govpn/egd.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/encless.go b/src/cypherpunks.ru/govpn/encless.go
index 966a2dde65aac3498de3dddcebd5c8f5b1f7d9fe..7a576ab54b922ab725b331006063a6f4c4da3d3d 100644 (file)
--- a/src/cypherpunks.ru/govpn/encless.go
+++ b/src/cypherpunks.ru/govpn/encless.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/encless_test.go b/src/cypherpunks.ru/govpn/encless_test.go
index e0c78c4bc6655353150a4b198fb86718850f239c..8063e6b1c43f1b0fe5f0d91383486cb3f779a3df 100644 (file)
--- a/src/cypherpunks.ru/govpn/encless_test.go
+++ b/src/cypherpunks.ru/govpn/encless_test.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/handshake.go b/src/cypherpunks.ru/govpn/handshake.go
index a824acef902629fcb16515eb8011f6294e00519f..cce621b48508fedd42cada1c957f901ae6e87591 100644 (file)
--- a/src/cypherpunks.ru/govpn/handshake.go
+++ b/src/cypherpunks.ru/govpn/handshake.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/handshake_test.go b/src/cypherpunks.ru/govpn/handshake_test.go
index 077146583c654c5fb726aaab70e03430b14cf104..87b6e6b76198ce9b3ea8142b4ad9f14319f11a2f 100644 (file)
--- a/src/cypherpunks.ru/govpn/handshake_test.go
+++ b/src/cypherpunks.ru/govpn/handshake_test.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/identity.go b/src/cypherpunks.ru/govpn/identity.go
index 262bca658be887c4b779dacef6b503ecbaf66b96..b7f9f9099f46f35100a1e1b8041ad4e9518b6e3d 100644 (file)
--- a/src/cypherpunks.ru/govpn/identity.go
+++ b/src/cypherpunks.ru/govpn/identity.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/logger.go b/src/cypherpunks.ru/govpn/logger.go
index 48a32356d928b6f07ba461628c868bee90f437d8..8f34d88310603fc11300176e4eab16254d10e7e1 100644 (file)
--- a/src/cypherpunks.ru/govpn/logger.go
+++ b/src/cypherpunks.ru/govpn/logger.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/peer.go b/src/cypherpunks.ru/govpn/peer.go
index 37bd8405182afea9f205afd2782c1dbd9b97593e..a059111ba12855f81132e882331389ae7ddbc10d 100644 (file)
--- a/src/cypherpunks.ru/govpn/peer.go
+++ b/src/cypherpunks.ru/govpn/peer.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/peer_test.go b/src/cypherpunks.ru/govpn/peer_test.go
index 6c16469f18c008298918d43f34e902fd965dacec..2ac2ba7e62c8652f421c7378105b557f6e43790c 100644 (file)
--- a/src/cypherpunks.ru/govpn/peer_test.go
+++ b/src/cypherpunks.ru/govpn/peer_test.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/stats.go b/src/cypherpunks.ru/govpn/stats.go
index 8354d39de8a2f73008cb0883ae23eea51d0946b3..cfcdde7a82f688374b5a3c79fbb4f84fa6629d2b 100644 (file)
--- a/src/cypherpunks.ru/govpn/stats.go
+++ b/src/cypherpunks.ru/govpn/stats.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/tap.go b/src/cypherpunks.ru/govpn/tap.go
index faf88ba9f6b9e1db4359ab792fad59ca5acbf5a5..e1faa55559ab2916cdd5421c82dcfb49eee3442a 100644 (file)
--- a/src/cypherpunks.ru/govpn/tap.go
+++ b/src/cypherpunks.ru/govpn/tap.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/cypherpunks.ru/govpn/tap_freebsd.go b/src/cypherpunks.ru/govpn/tap_freebsd.go
index 03d4554fce9a5973744684646a74645c5d09c772..c39c3d1d13783e9d03e4ce7044f09d3904e8e099 100644 (file)
--- a/src/cypherpunks.ru/govpn/tap_freebsd.go
+++ b/src/cypherpunks.ru/govpn/tap_freebsd.go
@@ -2,7 +2,7 @@
 
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 */
 
 package govpn

diff --git a/src/cypherpunks.ru/govpn/tap_linux.go b/src/cypherpunks.ru/govpn/tap_linux.go
index 388853d817e58ef2d2726fff707636a4828d4b00..841f614c64b25e719ba1d6da547b3cb4802b509a 100644 (file)
--- a/src/cypherpunks.ru/govpn/tap_linux.go
+++ b/src/cypherpunks.ru/govpn/tap_linux.go
@@ -2,7 +2,7 @@
 
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 */
 
 package govpn

diff --git a/src/cypherpunks.ru/govpn/verifier.go b/src/cypherpunks.ru/govpn/verifier.go
index 26e0275df46e7db2226c9d8b388663e530ed4a7a..0ea94a314f9705185b03a8e440cf557f07283420 100644 (file)
--- a/src/cypherpunks.ru/govpn/verifier.go
+++ b/src/cypherpunks.ru/govpn/verifier.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/src/golang.org/x/crypto b/src/golang.org/x/crypto
index 81e90905daefcd6fd217b62423c0908922eadb30..614d502a4dac94afa3a6ce146bd1736da82514c6 160000 (submodule)
--- a/src/golang.org/x/crypto
+++ b/src/golang.org/x/crypto
@@ -1 +1 @@
-Subproject commit 81e90905daefcd6fd217b62423c0908922eadb30
+Subproject commit 614d502a4dac94afa3a6ce146bd1736da82514c6

diff --git a/src/golang.org/x/sys b/src/golang.org/x/sys
index 2d6f6f883a06fc0d5f4b14a81e4c28705ea64c15..d99a578cf41bfccdeaf48b0845c823a4b8b0ad5e 160000 (submodule)
--- a/src/golang.org/x/sys
+++ b/src/golang.org/x/sys
@@ -1 +1 @@
-Subproject commit 2d6f6f883a06fc0d5f4b14a81e4c28705ea64c15
+Subproject commit d99a578cf41bfccdeaf48b0845c823a4b8b0ad5e

diff --git a/src/gopkg.in/yaml.v2 b/src/gopkg.in/yaml.v2
index a5b47d31c556af34a302ce5d659e6fea44d90de0..5420a8b6744d3b0345ab293f6fcba19c978f1183 160000 (submodule)
--- a/src/gopkg.in/yaml.v2
+++ b/src/gopkg.in/yaml.v2
@@ -1 +1 @@
-Subproject commit a5b47d31c556af34a302ce5d659e6fea44d90de0
+Subproject commit 5420a8b6744d3b0345ab293f6fcba19c978f1183

diff --git a/utils/makedist.sh b/utils/makedist.sh
index 7b1547bdd7a15b9c00b17e1ca9e451ce7028aac2..a79377cd2fd2548935ab808e0971292b52a5c5fc 100755 (executable)
--- a/utils/makedist.sh
+++ b/utils/makedist.sh
@@ -28,15 +28,17 @@ golang.org/x/crypto/LICENSE
 golang.org/x/crypto/PATENTS
 golang.org/x/crypto/README.md
 golang.org/x/crypto/blake2b
-golang.org/x/crypto/chacha20poly1305/internal/chacha20
 golang.org/x/crypto/curve25519
+golang.org/x/crypto/internal/chacha20
+golang.org/x/crypto/internal/subtle
 golang.org/x/crypto/poly1305
 golang.org/x/crypto/ssh/terminal
 golang.org/x/sys/AUTHORS
 golang.org/x/sys/CONTRIBUTORS
 golang.org/x/sys/LICENSE
 golang.org/x/sys/PATENTS
-golang.org/x/sys/README
+golang.org/x/sys/README.md
+golang.org/x/sys/cpu
 golang.org/x/sys/unix
 EOF
 tar cfCI - src $tmp/includes | tar xfC - $tmp
@@ -106,8 +108,6 @@ $(git cat-file -p $release | sed -n '6,/^.*BEGIN/p' | sed '$d')
 ------------------------ >8 ------------------------
 
 GoVPN's home page is: http://www.govpn.info/
-Also available as I2P service:
-http://zy2qxyziqzledqqb5vcq5unfxnn2csv6revteliybd7qxb64dpxq.b32.i2p/
 
 Source code and its signature for that version can be found here:
 
@@ -153,8 +153,6 @@ $(git cat-file -p $release | sed -n '6,/^.*BEGIN/p' | sed '$d')
 ------------------------ >8 ------------------------
 
 Домашняя страница GoVPN: http://www.govpn.info/
-Также доступная как I2P сервис:
-http://zy2qxyziqzledqqb5vcq5unfxnn2csv6revteliybd7qxb64dpxq.b32.i2p/
 Коротко о демоне: http://www.govpn.info/O-demone.html
 
 Исходный код и его подпись для этой версии находятся здесь: