From f3806b3cf5a9ccae5c358c1942262cf0f1d16227 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Mon, 7 Aug 2023 14:11:51 +0300 Subject: [PATCH] Armored signature --- download.texi | 64 +++++++++++++++++++++++++-------------------------- install.texi | 4 ++-- makedist | 12 ++++------ 3 files changed, 39 insertions(+), 41 deletions(-) diff --git a/download.texi b/download.texi index d01561d..6546a9e 100644 --- a/download.texi +++ b/download.texi @@ -1,125 +1,125 @@ -@multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {meta4 tar sign} +@multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {meta4 tar sig} @headitem Version @tab Date @tab Size @tab Tarball @item @ref{Release 5.12, 5.12} @tab 2023-04-12 @tab 91 KiB @tab @url{pygost-5.12.tar.zst.meta4, meta4} @url{pygost-5.12.tar.zst, tar} -@url{pygost-5.12.tar.zst.sig, sig} +@url{pygost-5.12.tar.zst.asc, sig} @item @ref{Release 5.11, 5.11} @tab 2022-03-23 @tab 91 KiB @tab @url{pygost-5.11.tar.zst.meta4, meta4} @url{pygost-5.11.tar.zst, tar} -@url{pygost-5.11.tar.zst.sig, sig} +@url{pygost-5.11.tar.zst.asc, sig} @item @ref{Release 5.10, 5.10} @tab 2022-02-04 @tab 91 KiB @tab @url{pygost-5.10.tar.zst.meta4, meta4} @url{pygost-5.10.tar.zst, tar} -@url{pygost-5.10.tar.zst.sig, sig} +@url{pygost-5.10.tar.zst.asc, sig} @item @ref{Release 5.9, 5.9} @tab 2022-02-02 @tab 91 KiB @tab @url{pygost-5.9.tar.zst.meta4, meta4} @url{pygost-5.9.tar.zst, tar} -@url{pygost-5.9.tar.zst.sig, sig} +@url{pygost-5.9.tar.zst.asc, sig} @item @ref{Release 5.8, 5.8} @tab 2021-12-06 @tab 91 KiB @tab @url{pygost-5.8.tar.zst.meta4, meta4} @url{pygost-5.8.tar.zst, tar} -@url{pygost-5.8.tar.zst.sig, sig} +@url{pygost-5.8.tar.zst.asc, sig} @item @ref{Release 5.7, 5.7} @tab 2021-11-26 @tab 91 KiB @tab @url{pygost-5.7.tar.zst.meta4, meta4} @url{pygost-5.7.tar.zst, tar} -@url{pygost-5.7.tar.zst.sig, sig} +@url{pygost-5.7.tar.zst.asc, sig} @item @ref{Release 5.6, 5.6} @tab 2021-04-22 @tab 86 KiB @tab @url{pygost-5.6.tar.xz.meta4, meta4} @url{pygost-5.6.tar.xz, tar} -@url{pygost-5.6.tar.xz.sig, sig} +@url{pygost-5.6.tar.xz.asc, sig} @item @ref{Release 5.5, 5.5} @tab 2021-04-22 @tab 86 KiB @tab @url{pygost-5.5.tar.xz.meta4, meta4} @url{pygost-5.5.tar.xz, tar} -@url{pygost-5.5.tar.xz.sig, sig} +@url{pygost-5.5.tar.xz.asc, sig} @item @ref{Release 5.4, 5.4} @tab 2021-01-26 @tab 80 KiB @tab @url{pygost-5.4.tar.xz.meta4, meta4} @url{pygost-5.4.tar.xz, tar} -@url{pygost-5.4.tar.xz.sig, sig} +@url{pygost-5.4.tar.xz.asc, sig} @item @ref{Release 5.3, 5.3} @tab 2021-01-22 @tab 79 KiB @tab @url{pygost-5.3.tar.xz.meta4, meta4} @url{pygost-5.3.tar.xz, tar} -@url{pygost-5.3.tar.xz.sig, sig} +@url{pygost-5.3.tar.xz.asc, sig} @item @ref{Release 5.2, 5.2} @tab 2020-10-19 @tab 78 KiB @tab @url{pygost-5.2.tar.xz.meta4, meta4} @url{pygost-5.2.tar.xz, tar} -@url{pygost-5.2.tar.xz.sig, sig} +@url{pygost-5.2.tar.xz.asc, sig} @item @ref{Release 5.1, 5.1} @tab 2020-09-24 @tab 79 KiB @tab @url{pygost-5.1.tar.xz.meta4, meta4} @url{pygost-5.1.tar.xz, tar} -@url{pygost-5.1.tar.xz.sig, sig} +@url{pygost-5.1.tar.xz.asc, sig} @item @ref{Release 5.0, 5.0} @tab 2020-09-04 @tab 78 KiB @tab @url{pygost-5.0.tar.xz.meta4, meta4} @url{pygost-5.0.tar.xz, tar} -@url{pygost-5.0.tar.xz.sig, sig} +@url{pygost-5.0.tar.xz.asc, sig} @item @ref{Release 4.9, 4.9} @tab 2020-07-30 @tab 78 KiB @tab @url{pygost-4.9.tar.xz.meta4, meta4} @url{pygost-4.9.tar.xz, tar} -@url{pygost-4.9.tar.xz.sig, sig} +@url{pygost-4.9.tar.xz.asc, sig} @item @ref{Release 4.8, 4.8} @tab 2020-07-24 @tab 69 KiB @tab @url{pygost-4.8.tar.xz.meta4, meta4} @url{pygost-4.8.tar.xz, tar} -@url{pygost-4.8.tar.xz.sig, sig} +@url{pygost-4.8.tar.xz.asc, sig} @item @ref{Release 4.7, 4.7} @tab 2020-07-23 @tab 67 KiB @tab @url{pygost-4.7.tar.xz.meta4, meta4} @url{pygost-4.7.tar.xz, tar} -@url{pygost-4.7.tar.xz.sig, sig} +@url{pygost-4.7.tar.xz.asc, sig} @item @ref{Release 4.6, 4.6} @tab 2020-07-07 @tab 67 KiB @tab @url{pygost-4.6.tar.xz.meta4, meta4} @url{pygost-4.6.tar.xz, tar} -@url{pygost-4.6.tar.xz.sig, sig} +@url{pygost-4.6.tar.xz.asc, sig} @item @ref{Release 4.5, 4.5} @tab 2020-05-14 @tab 67 KiB @tab @url{pygost-4.5.tar.xz.meta4, meta4} @url{pygost-4.5.tar.xz, tar} -@url{pygost-4.5.tar.xz.sig, sig} +@url{pygost-4.5.tar.xz.asc, sig} @item @ref{Release 4.4, 4.4} @tab 2020-02-04 @tab 67 KiB @tab @url{pygost-4.4.tar.xz.meta4, meta4} @url{pygost-4.4.tar.xz, tar} -@url{pygost-4.4.tar.xz.sig, sig} +@url{pygost-4.4.tar.xz.asc, sig} @item @ref{Release 4.3, 4.3} @tab 2019-12-27 @tab 61 KiB @tab @url{pygost-4.3.tar.xz.meta4, meta4} @url{pygost-4.3.tar.xz, tar} -@url{pygost-4.3.tar.xz.sig, sig} +@url{pygost-4.3.tar.xz.asc, sig} @item @ref{Release 4.2, 4.2} @tab 2019-12-27 @tab 62 KiB @tab @url{pygost-4.2.tar.xz.meta4, meta4} @url{pygost-4.2.tar.xz, tar} -@url{pygost-4.2.tar.xz.sig, sig} +@url{pygost-4.2.tar.xz.asc, sig} @item @ref{Release 4.1, 4.1} @tab 2019-12-17 @tab 60 KiB @tab @url{pygost-4.1.tar.xz.meta4, meta4} @url{pygost-4.1.tar.xz, tar} -@url{pygost-4.1.tar.xz.sig, sig} +@url{pygost-4.1.tar.xz.asc, sig} @item @ref{Release 4.0, 4.0} @tab 2019-07-19 @tab 61 KiB @tab @url{pygost-4.0.tar.xz.meta4, meta4} @url{pygost-4.0.tar.xz, tar} -@url{pygost-4.0.tar.xz.sig, sig} +@url{pygost-4.0.tar.xz.asc, sig} @item @ref{Release 3.15, 3.15} @tab 2018-12-09 @tab 54 KiB @tab @url{pygost-3.15.tar.xz.meta4, meta4} @url{pygost-3.15.tar.xz, tar} -@url{pygost-3.15.tar.xz.sig, sig} +@url{pygost-3.15.tar.xz.asc, sig} @item @ref{Release 3.14, 3.14} @tab 2018-12-03 @tab 49 KiB @tab @@ -146,36 +146,36 @@ @item @ref{Release 3.3, 3.3} @tab 2017-06-11 @tab 41 KiB @tab @url{pygost-3.3.tar.xz.meta4, meta4} @url{pygost-3.3.tar.xz, tar} -@url{pygost-3.3.tar.xz.sig, sig} +@url{pygost-3.3.tar.xz.asc, sig} @item @ref{Release 3.2, 3.2} @tab 2017-06-04 @tab 41 KiB @tab @url{pygost-3.2.tar.xz.meta4, meta4} @url{pygost-3.2.tar.xz, tar} -@url{pygost-3.2.tar.xz.sig, sig} +@url{pygost-3.2.tar.xz.asc, sig} @item @ref{Release 3.1, 3.1} @tab 2016-11-28 @tab 39 KiB @tab @url{pygost-3.1.tar.xz.meta4, meta4} @url{pygost-3.1.tar.xz, tar} -@url{pygost-3.1.tar.xz.sig, sig} +@url{pygost-3.1.tar.xz.asc, sig} @item @ref{Release 3.0, 3.0} @tab 2016-11-21 @tab 39 KiB @tab @url{pygost-3.0.tar.xz.meta4, meta4} @url{pygost-3.0.tar.xz, tar} -@url{pygost-3.0.tar.xz.sig, sig} +@url{pygost-3.0.tar.xz.asc, sig} @item @ref{Release 2.4, 2.4} @tab 2016-10-13 @tab 37 KiB @tab @url{pygost-2.4.tar.xz.meta4, meta4} @url{pygost-2.4.tar.xz, tar} -@url{pygost-2.4.tar.xz.sig, sig} +@url{pygost-2.4.tar.xz.asc, sig} @item @ref{Release 2.3, 2.3} @tab 2016-10-04 @tab 37 KiB @tab @url{pygost-2.3.tar.xz.meta4, meta4} @url{pygost-2.3.tar.xz, tar} -@url{pygost-2.3.tar.xz.sig, sig} +@url{pygost-2.3.tar.xz.asc, sig} @end multitable Also there is example P2P F2F E2EE IM written on Python, that uses PyGOST with @url{http://www.pyderasn.cypherpunks.ru/, PyDERASN}: -@url{gostim.txz, GOSTIM} (@url{gostim.txz.sig, sig}) (17 KiB). It is +@url{gostim.txz, GOSTIM} (@url{gostim.txz.asc, sig}) (17 KiB). It is described on russian in @url{https://habr.com/ru/post/452200/, that article}. diff --git a/install.texi b/install.texi index ea2a425..df6780a 100644 --- a/install.texi +++ b/install.texi @@ -7,8 +7,8 @@ Preferable way is to download tarball with the signature: @example $ [fetch|wget] http://www.pygost.cypherpunks.ru/pygost-@value{VERSION}.tar.zst -$ [fetch|wget] http://www.pygost.cypherpunks.ru/pygost-@value{VERSION}.tar.zst.sig -$ gpg --verify pygost-@value{VERSION}.tar.zst.sig pygost-@value{VERSION}.tar.zst +$ [fetch|wget] http://www.pygost.cypherpunks.ru/pygost-@value{VERSION}.tar.zst.asc +$ gpg --verify pygost-@value{VERSION}.tar.zst.asc pygost-@value{VERSION}.tar.zst $ zstd -d < pygost-@value{VERSION}.tar.zst | tar xf - $ cd pygost-@value{VERSION} $ python setup.py install diff --git a/makedist b/makedist index 08e5c58..698c101 100755 --- a/makedist +++ b/makedist @@ -10,9 +10,7 @@ cd $tmp gunzip pygost-"$release".tar.gz zstd -19 -v pygost-"$release".tar tarball=pygost-"$release".tar.zst -gpg --detach-sign --sign --local-user pygost@cypherpunks.ru "$tarball" -gpg --enarmor < "$tarball".sig | - sed "/^Comment:/d ; s/ARMORED FILE/SIGNATURE/" > "$tarball".asc +gpg --armor --detach-sign --sign --local-user pygost@cypherpunks.ru "$tarball" meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \ http://www.pygost.cypherpunks.ru/"$tarball" \ http://y.www.pygost.cypherpunks.ru/"$tarball" < "$tarball" > "$tarball".meta4 @@ -25,7 +23,7 @@ An entry for documentation: @item @ref{Release $release, $release} @tab $release_date @tab $size KiB @tab @url{pygost-${release}.tar.zst.meta4, meta4} @url{pygost-${release}.tar.zst, tar} -@url{pygost-${release}.tar.zst.sig, sig} +@url{pygost-${release}.tar.zst.asc, sig} EOF cat < @@ -78,7 +76,7 @@ PyGOST это свободное программное обеспечение Исходный код и его подпись для этой версии могут быть найдены здесь: http://www.pygost.cypherpunks.ru/pygost-${release}.tar.zst ($size KiB) - http://www.pygost.cypherpunks.ru/pygost-${release}.tar.zst.sig + http://www.pygost.cypherpunks.ru/pygost-${release}.tar.zst.asc GPG ключ: F55A 7619 3A0C 323A A031 0E6B E6FD 1269 CD0C 009E PyGOST releases @@ -88,4 +86,4 @@ GPG ключ: F55A 7619 3A0C 323A A031 0E6B E6FD 1269 CD0C 009E http://lists.cypherpunks.ru/gost.html EOF -mv $tmp/$tarball $tmp/"$tarball".sig $tmp/"$tarball".meta4 $cur/pygost.html/ +mv $tmp/$tarball $tmp/"$tarball".asc $tmp/"$tarball".meta4 $cur/pygost.html/ -- 2.44.0