OpenSSH signature support

diff --git a/PUBKEY.asc b/PUBKEY-PGP.asc
similarity index 100%
rename from PUBKEY.asc
rename to PUBKEY-PGP.asc

diff --git a/PUBKEY-SSH.pub b/PUBKEY-SSH.pub
new file mode 100644 (file)
index 0000000..05b5df4
--- /dev/null
+++ b/PUBKEY-SSH.pub
@@ -0,0 +1 @@
+goredo@cypherpunks.ru ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMc4zGaPRnrnyAHuA18LZ0zVv/NGxAzUIP64VYN+LkPq

diff --git a/PUBKEY-SSH.pub.asc b/PUBKEY-SSH.pub.asc
new file mode 100644 (file)
index 0000000..87690c2
--- /dev/null
+++ b/PUBKEY-SSH.pub.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+
+iIwEABYKADQWIQR1MbuE+vC/NZYMY7k6Uo3elSx+kwUCZNJaOhYcZ29yZWRvQGN5
+cGhlcnB1bmtzLnJ1AAoJEDpSjd6VLH6T4tIA/jih0EOFSSZIbN+sYXoedker9/nl
+nitXCbDKKyqICwAaAP9zgRCzK+MXj7zLzHuf1lOACD25RQ/iR5OoS13AnLU7CQ==
+=E3j1
+-----END PGP SIGNATURE-----

diff --git a/doc/download.texi b/doc/download.texi
index aa7d0b3650245393e9b73c21a065bd91edee20cf..aca0c9f69e380918bb1fee03ffb053b90a12ee7b 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -1,199 +1,238 @@
-@multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {meta4 tar sig}
+@multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {meta4 tar pgp ssh}
 @headitem Version @tab Date @tab Size @tab Tarball
 
 @item @ref{Release 1_30_0, 1.30.0} @tab 2023-01-18 @tab 431 KiB @tab
 @url{download/goredo-1.30.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.30.0.tar.zst, tar}
-@url{download/goredo-1.30.0.tar.zst.asc, sig}
+@url{download/goredo-1.30.0.tar.zst.asc, pgp}
+@url{download/goredo-1.30.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_29_0, 1.29.0} @tab 2023-01-17 @tab 431 KiB @tab
 @url{download/goredo-1.29.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.29.0.tar.zst, tar}
-@url{download/goredo-1.29.0.tar.zst.asc, sig}
+@url{download/goredo-1.29.0.tar.zst.asc, pgp}
+@url{download/goredo-1.29.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_28_0, 1.28.0} @tab 2022-11-14 @tab 429 KiB @tab
 @url{download/goredo-1.28.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.28.0.tar.zst, tar}
-@url{download/goredo-1.28.0.tar.zst.asc, sig}
+@url{download/goredo-1.28.0.tar.zst.asc, pgp}
+@url{download/goredo-1.28.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_27_1, 1.27.1} @tab 2022-09-09 @tab 424 KiB @tab
 @url{download/goredo-1.27.1.tar.zst.meta4, meta4}
 @url{download/goredo-1.27.1.tar.zst, tar}
-@url{download/goredo-1.27.1.tar.zst.asc, sig}
+@url{download/goredo-1.27.1.tar.zst.asc, pgp}
+@url{download/goredo-1.27.1.tar.zst.sig, ssh}
 
 @item @ref{Release 1_27_0, 1.27.0} @tab 2022-08-28 @tab 424 KiB @tab
 @url{download/goredo-1.27.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.27.0.tar.zst, tar}
-@url{download/goredo-1.27.0.tar.zst.asc, sig}
+@url{download/goredo-1.27.0.tar.zst.asc, pgp}
+@url{download/goredo-1.27.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_26_0, 1.26.0} @tab 2022-08-26 @tab 424 KiB @tab
 @url{download/goredo-1.26.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.26.0.tar.zst, tar}
-@url{download/goredo-1.26.0.tar.zst.asc, sig}
+@url{download/goredo-1.26.0.tar.zst.asc, pgp}
+@url{download/goredo-1.26.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_25_0, 1.25.0} @tab 2022-05-08 @tab 402 KiB @tab
 @url{download/goredo-1.25.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.25.0.tar.zst, tar}
-@url{download/goredo-1.25.0.tar.zst.asc, sig}
+@url{download/goredo-1.25.0.tar.zst.asc, pgp}
+@url{download/goredo-1.25.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_24_0, 1.24.0} @tab 2022-03-01 @tab 401 KiB @tab
 @url{download/goredo-1.24.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.24.0.tar.zst, tar}
-@url{download/goredo-1.24.0.tar.zst.asc, sig}
+@url{download/goredo-1.24.0.tar.zst.asc, pgp}
+@url{download/goredo-1.24.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_23_0, 1.23.0} @tab 2022-02-23 @tab 401 KiB @tab
 @url{download/goredo-1.23.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.23.0.tar.zst, tar}
-@url{download/goredo-1.23.0.tar.zst.asc, sig}
+@url{download/goredo-1.23.0.tar.zst.asc, pgp}
+@url{download/goredo-1.23.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_22_0, 1.22.0} @tab 2022-01-26 @tab 388 KiB @tab
 @url{download/goredo-1.22.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.22.0.tar.zst, tar}
-@url{download/goredo-1.22.0.tar.zst.asc, sig}
+@url{download/goredo-1.22.0.tar.zst.asc, pgp}
+@url{download/goredo-1.22.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_21_0, 1.21.0} @tab 2021-11-20 @tab 387 KiB @tab
 @url{download/goredo-1.21.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.21.0.tar.zst, tar}
-@url{download/goredo-1.21.0.tar.zst.asc, sig}
+@url{download/goredo-1.21.0.tar.zst.asc, pgp}
+@url{download/goredo-1.21.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_20_0, 1.20.0} @tab 2021-11-19 @tab 385 KiB @tab
 @url{download/goredo-1.20.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.20.0.tar.zst, tar}
-@url{download/goredo-1.20.0.tar.zst.asc, sig}
+@url{download/goredo-1.20.0.tar.zst.asc, pgp}
+@url{download/goredo-1.20.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_19_0, 1.19.0} @tab 2021-11-09 @tab 385 KiB @tab
 @url{download/goredo-1.19.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.19.0.tar.zst, tar}
-@url{download/goredo-1.19.0.tar.zst.asc, sig}
+@url{download/goredo-1.19.0.tar.zst.asc, pgp}
+@url{download/goredo-1.19.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_18_0, 1.18.0} @tab 2021-10-27 @tab 388 KiB @tab
 @url{download/goredo-1.18.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.18.0.tar.zst, tar}
-@url{download/goredo-1.18.0.tar.zst.asc, sig}
+@url{download/goredo-1.18.0.tar.zst.asc, pgp}
+@url{download/goredo-1.18.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_17_0, 1.17.0} @tab 2021-10-19 @tab 387 KiB @tab
 @url{download/goredo-1.17.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.17.0.tar.zst, tar}
-@url{download/goredo-1.17.0.tar.zst.asc, sig}
+@url{download/goredo-1.17.0.tar.zst.asc, pgp}
+@url{download/goredo-1.17.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_16_0, 1.16.0} @tab 2021-10-14 @tab 387 KiB @tab
 @url{download/goredo-1.16.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.16.0.tar.zst, tar}
-@url{download/goredo-1.16.0.tar.zst.asc, sig}
+@url{download/goredo-1.16.0.tar.zst.asc, pgp}
+@url{download/goredo-1.16.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_15_0, 1.15.0} @tab 2021-09-30 @tab 392 KiB @tab
 @url{download/goredo-1.15.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.15.0.tar.zst, tar}
-@url{download/goredo-1.15.0.tar.zst.asc, sig}
+@url{download/goredo-1.15.0.tar.zst.asc, pgp}
+@url{download/goredo-1.15.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_14_0, 1.14.0} @tab 2021-09-15 @tab 392 KiB @tab
 @url{download/goredo-1.14.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.14.0.tar.zst, tar}
-@url{download/goredo-1.14.0.tar.zst.asc, sig}
+@url{download/goredo-1.14.0.tar.zst.asc, pgp}
+@url{download/goredo-1.14.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_13_0, 1.13.0} @tab 2021-08-06 @tab 392 KiB @tab
 @url{download/goredo-1.13.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.13.0.tar.zst, tar}
-@url{download/goredo-1.13.0.tar.zst.asc, sig}
+@url{download/goredo-1.13.0.tar.zst.asc, pgp}
+@url{download/goredo-1.13.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_12_0, 1.12.0} @tab 2021-08-01 @tab 392 KiB @tab
 @url{download/goredo-1.12.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.12.0.tar.zst, tar}
-@url{download/goredo-1.12.0.tar.zst.asc, sig}
+@url{download/goredo-1.12.0.tar.zst.asc, pgp}
+@url{download/goredo-1.12.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_11_0, 1.11.0} @tab 2021-08-01 @tab 392 KiB @tab
 @url{download/goredo-1.11.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.11.0.tar.zst, tar}
-@url{download/goredo-1.11.0.tar.zst.asc, sig}
+@url{download/goredo-1.11.0.tar.zst.asc, pgp}
+@url{download/goredo-1.11.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_10_0, 1.10.0} @tab 2021-08-01 @tab 392 KiB @tab
 @url{download/goredo-1.10.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.10.0.tar.zst, tar}
-@url{download/goredo-1.10.0.tar.zst.asc, sig}
+@url{download/goredo-1.10.0.tar.zst.asc, pgp}
+@url{download/goredo-1.10.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_9_0, 1.9.0} @tab 2021-07-31 @tab 392 KiB @tab
 @url{download/goredo-1.9.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.9.0.tar.zst, tar}
-@url{download/goredo-1.9.0.tar.zst.asc, sig}
+@url{download/goredo-1.9.0.tar.zst.asc, pgp}
+@url{download/goredo-1.9.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_8_0, 1.8.0} @tab 2021-07-02 @tab 389 KiB @tab
 @url{download/goredo-1.8.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.8.0.tar.zst, tar}
-@url{download/goredo-1.8.0.tar.zst.asc, sig}
+@url{download/goredo-1.8.0.tar.zst.asc, pgp}
+@url{download/goredo-1.8.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_7_0, 1.7.0} @tab 2021-06-23 @tab 389 KiB @tab
 @url{download/goredo-1.7.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.7.0.tar.zst, tar}
-@url{download/goredo-1.7.0.tar.zst.asc, sig}
+@url{download/goredo-1.7.0.tar.zst.asc, pgp}
+@url{download/goredo-1.7.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_6_0, 1.6.0} @tab 2021-06-22 @tab 387 KiB @tab
 @url{download/goredo-1.6.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.6.0.tar.zst, tar}
-@url{download/goredo-1.6.0.tar.zst.asc, sig}
+@url{download/goredo-1.6.0.tar.zst.asc, pgp}
+@url{download/goredo-1.6.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_5_0, 1.5.0} @tab 2021-06-21 @tab 387 KiB @tab
 @url{download/goredo-1.5.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.5.0.tar.zst, tar}
-@url{download/goredo-1.5.0.tar.zst.asc, sig}
+@url{download/goredo-1.5.0.tar.zst.asc, pgp}
+@url{download/goredo-1.5.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_4_1, 1.4.1} @tab 2021-04-29 @tab 383 KiB @tab
 @url{download/goredo-1.4.1.tar.zst.meta4, meta4}
 @url{download/goredo-1.4.1.tar.zst, tar}
-@url{download/goredo-1.4.1.tar.zst.asc, sig}
+@url{download/goredo-1.4.1.tar.zst.asc, pgp}
+@url{download/goredo-1.4.1.tar.zst.sig, ssh}
 
 @item @ref{Release 1_4_0, 1.4.0} @tab 2021-04-29 @tab 383 KiB @tab
 @url{download/goredo-1.4.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.4.0.tar.zst, tar}
-@url{download/goredo-1.4.0.tar.zst.asc, sig}
+@url{download/goredo-1.4.0.tar.zst.asc, pgp}
+@url{download/goredo-1.4.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_3_0, 1.3.0} @tab 2021-02-15 @tab 339 KiB @tab
 @url{download/goredo-1.3.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.3.0.tar.zst, tar}
-@url{download/goredo-1.3.0.tar.zst.asc, sig}
+@url{download/goredo-1.3.0.tar.zst.asc, pgp}
+@url{download/goredo-1.3.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_2_0, 1.2.0} @tab 2021-01-29 @tab 338 KiB @tab
 @url{download/goredo-1.2.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.2.0.tar.zst, tar}
-@url{download/goredo-1.2.0.tar.zst.asc, sig}
+@url{download/goredo-1.2.0.tar.zst.asc, pgp}
+@url{download/goredo-1.2.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_1_0, 1.1.0} @tab 2021-01-24 @tab 338 KiB @tab
 @url{download/goredo-1.1.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.1.0.tar.zst, tar}
-@url{download/goredo-1.1.0.tar.zst.asc, sig}
+@url{download/goredo-1.1.0.tar.zst.asc, pgp}
+@url{download/goredo-1.1.0.tar.zst.sig, ssh}
 
 @item @ref{Release 1_0_0, 1.0.0} @tab 2021-01-16 @tab 338 KiB @tab
 @url{download/goredo-1.0.0.tar.zst.meta4, meta4}
 @url{download/goredo-1.0.0.tar.zst, tar}
-@url{download/goredo-1.0.0.tar.zst.asc, sig}
+@url{download/goredo-1.0.0.tar.zst.asc, pgp}
+@url{download/goredo-1.0.0.tar.zst.sig, ssh}
 
 @item @ref{Release 0_12_3, 0.12.3} @tab 2021-01-13 @tab 336 KiB @tab
 @url{download/goredo-0.12.3.tar.zst.meta4, meta4}
 @url{download/goredo-0.12.3.tar.zst, tar}
-@url{download/goredo-0.12.3.tar.zst.asc, sig}
+@url{download/goredo-0.12.3.tar.zst.asc, pgp}
+@url{download/goredo-0.12.3.tar.zst.sig, ssh}
 
 @item @ref{Release 0_12_2, 0.12.2} @tab 2021-01-13 @tab 336 KiB @tab
 @url{download/goredo-0.12.2.tar.zst.meta4, meta4}
 @url{download/goredo-0.12.2.tar.zst, tar}
-@url{download/goredo-0.12.2.tar.zst.asc, sig}
+@url{download/goredo-0.12.2.tar.zst.asc, pgp}
+@url{download/goredo-0.12.2.tar.zst.sig, ssh}
 
 @item @ref{Release 0_12_1, 0.12.1} @tab 2021-01-13 @tab 336 KiB @tab
 @url{download/goredo-0.12.1.tar.zst.meta4, meta4}
 @url{download/goredo-0.12.1.tar.zst, tar}
-@url{download/goredo-0.12.1.tar.zst.asc, sig}
+@url{download/goredo-0.12.1.tar.zst.asc, pgp}
+@url{download/goredo-0.12.1.tar.zst.sig, ssh}
 
 @item @ref{Release 0_12_0, 0.12.0} @tab 2021-01-12 @tab 379 KiB @tab
 @url{download/goredo-0.12.0.tar.zst.meta4, meta4}
 @url{download/goredo-0.12.0.tar.zst, tar}
-@url{download/goredo-0.12.0.tar.zst.asc, sig}
+@url{download/goredo-0.12.0.tar.zst.asc, pgp}
+@url{download/goredo-0.12.0.tar.zst.sig, ssh}
 
 @item @ref{Release 0_11_0, 0.11.0} @tab 2021-01-10 @tab 379 KiB @tab
 @url{download/goredo-0.11.0.tar.zst.meta4, meta4}
 @url{download/goredo-0.11.0.tar.zst, tar}
-@url{download/goredo-0.11.0.tar.zst.asc, sig}
+@url{download/goredo-0.11.0.tar.zst.asc, pgp}
+@url{download/goredo-0.11.0.tar.zst.sig, ssh}
 
 @item @ref{Release 0_10_0, 0.10.0} @tab 2021-01-09 @tab 436 KiB @tab
 @url{download/goredo-0.10.0.tar.zst.meta4, meta4}
 @url{download/goredo-0.10.0.tar.zst, tar}
-@url{download/goredo-0.10.0.tar.zst.asc, sig}
+@url{download/goredo-0.10.0.tar.zst.asc, pgp}
+@url{download/goredo-0.10.0.tar.zst.sig, ssh}
 
 @end multitable

diff --git a/doc/install.texi b/doc/install.texi
index d5743d7c6d453aa9519193b66fad57308b8b253b..50d0ff643068c39aa202adce41be262764598df2 100644 (file)
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -41,8 +41,8 @@ Preferable way is to download tarball with the signature from website:
 
 @example
 $ [fetch|wget] http://www.goredo.cypherpunks.ru/download/goredo-@value{VERSION}.tar.zst
-$ [fetch|wget] http://www.goredo.cypherpunks.ru/download/goredo-@value{VERSION}.tar.zst.asc
-$ gpg --verify goredo-@value{VERSION}.tar.zst.asc goredo-@value{VERSION}.tar.zst
+$ [fetch|wget] http://www.goredo.cypherpunks.ru/download/goredo-@value{VERSION}.tar.zst.@{asc,sig@}
+[verify signature]
 $ zstd -d < goredo-@value{VERSION}.tar.zst | tar xf -
 $ cd goredo-@value{VERSION}/src
 $ go build -mod=vendor
@@ -51,36 +51,9 @@ $ export PATH=`pwd`:$PATH   # let your system know about goredo
 @end example
 
 @include download.texi
+@include integrity.texi
 
-You @strong{have to} verify downloaded tarballs integrity and
-authenticity to be sure that you retrieved trusted and untampered
-software. @url{https://www.gnupg.org/, GNU Privacy Guard} is used
-for that purpose.
-
-For the very first time it is necessary to get signing public key and
-import it. It is provided below, but you should check alternative
-resources.
-
-@verbatim
-pub   ed25519/0x3A528DDE952C7E93 2021-01-09 [SC]
-      7531BB84FAF0BF35960C63B93A528DDE952C7E93
-uid   goredo releases <goredo@cypherpunks.ru>
-@end verbatim
-
-@itemize
-
-@item
-@example
-$ gpg --auto-key-locate dane --locate-keys goredo at cypherpunks dot ru
-$ gpg --auto-key-locate  wkd --locate-keys goredo at cypherpunks dot ru
-@end example
-
-@item
-@verbatiminclude ../PUBKEY.asc
-
-@end itemize
-
-It is also @command{go install}-able:
+@command{goredo} is also @command{go install}-able:
 
 @example
 $ go install go.cypherpunks.ru/goredo

diff --git a/doc/integrity.texi b/doc/integrity.texi
new file mode 100644 (file)
index 0000000..ad671f1
--- /dev/null
+++ b/doc/integrity.texi
@@ -0,0 +1,34 @@
+You @strong{have to} verify downloaded tarballs authenticity to be sure
+that you retrieved trusted and untampered software. There are two options:
+
+@table @asis
+
+@item @url{https://www.openpgp.org/, OpenPGP} @file{.asc} signature
+    Use @url{https://www.gnupg.org/, GNU Privacy Guard} free software
+    implementation.
+    For the very first time it is necessary to get signing public key and
+    import it. It is provided @url{PUBKEY-PGP.asc, here}, but you should
+    check alternate resources.
+
+@verbatim
+pub   ed25519/0x3A528DDE952C7E93 2021-01-09
+      7531BB84FAF0BF35960C63B93A528DDE952C7E93
+uid   goredo releases <goredo@cypherpunks.ru>
+@end verbatim
+
+@example
+$ gpg --auto-key-locate dane --locate-keys goredo at cypherpunks dot ru
+$ gpg --auto-key-locate  wkd --locate-keys goredo at cypherpunks dot ru
+@end example
+
+@item @url{https://www.openssh.com/, OpenSSH} @file{.sig} signature
+    @url{PUBKEY-SSH.pub, Public key} and its OpenPGP
+    @url{PUBKEY-SSH.pub.asc, signature} made with the key above.
+    Its fingerprint: @code{SHA256:ddOaswnUBtNbuoEBYQtfcF59sR3Bvzo9pIfSlw9sKx8}.
+
+@example
+$ ssh-keygen -Y verify -f PUBKEY-SSH.pub -I goredo@@cypherpunks.ru -n file \
+    -s goredo-@value{VERSION}.tar.zst.sig < goredo-@value{VERSION}.tar.zst
+@end example
+
+@end table

diff --git a/doc/www.do b/doc/www.do
index 06104a29b2f20122ca31aad052c83f80c5043ba8..d58adace7e87c7b096ad31214862508d4f151c18 100644 (file)
--- a/doc/www.do
+++ b/doc/www.do
@@ -10,6 +10,7 @@ ${MAKEINFO:=makeinfo} --html \
     --set-customization-variable DATE_IN_HEADER=1 \
     --set-customization-variable ASCII_PUNCTUATION=1 \
     --output $html index.texi
+cp ../PUBKEY-* $html/
 (
     cd $html/download
     export ATOM_ID="d089a6f2-cd88-47e5-aa11-55f60adfb977"

diff --git a/makedist b/makedist
index 337c8f13f216232f2a4016902df8d82672a95c9a..ba5f8ceb1a59d59a0e04050a50db58147ef9edef 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -44,7 +44,6 @@ cat > $texi <<EOF
 @include install.texi
 @bye
 EOF
-perl -i -p -e "s/.verbatiminclude .*PUBKEY.asc/Look in PUBKEY.asc file./" install.texi
 mkinfo --output INSTALL $texi
 
 cat > $texi <<EOF
@@ -86,8 +85,10 @@ cd ..
 tar cvf goredo-"$release".tar --uid=0 --gid=0 --numeric-owner goredo-"$release"
 zstd -19 -v goredo-"$release".tar
 tarball=goredo-"$release".tar.zst
+ssh-keygen -Y sign -f ~/.ssh/sign/goredo@cypherpunks.ru -n file $tarball
 gpg --armor --detach-sign --sign --local-user 3A528DDE952C7E93 "$tarball"
-meta4-create -fn "$tarball" -mtime "$tarball" -sig "$tarball".asc \
+meta4-create -fn "$tarball" -mtime "$tarball" \
+    -sig-pgp "$tarball".asc -sig-ssh "$tarball".sig \
     http://www.goredo.cypherpunks.ru/download/"$tarball" \
     http://y.www.goredo.cypherpunks.ru/download/"$tarball" < "$tarball" > "$tarball".meta4
 
@@ -100,10 +101,11 @@ An entry for documentation:
 @item @ref{Release $release_underscored, $release} @tab $release_date @tab $size KiB @tab
 @url{download/$tarball.meta4, meta4}
 @url{download/$tarball, tar}
-@url{download/$tarball.sig, sig}
+@url{download/$tarball.asc, pgp}
+@url{download/$tarball.sig, ssh}
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".asc $tarball.meta4 $cur/doc/goredo.html/download
+mv $tmp/$tarball $tmp/"$tarball".asc $tmp/"$tarball".sig $tarball.meta4 $cur/doc/goredo.html/download
 
 cat <<EOF
 Subject: goredo $release release announcement
@@ -125,10 +127,11 @@ goredo's home page is: http://www.goredo.cypherpunks.ru/
 Source code and its signature for that version can be found here:
 
     http://www.goredo.cypherpunks.ru/download/goredo-${release}.tar.zst ($size KiB)
-    http://www.goredo.cypherpunks.ru/download/goredo-${release}.tar.zst.asc
+    http://www.goredo.cypherpunks.ru/download/goredo-${release}.tar.zst.{asc,sig}
 
-GPG key ID: 0x3A528DDE952C7E93 goredo releases <goredo@cypherpunks.ru>
-Fingerprint: 7531 BB84 FAF0 BF35 960C  63B9 3A52 8DDE 952C 7E93
+OpenPGP key: 7531 BB84 FAF0 BF35 960C  63B9 3A52 8DDE 952C 7E93
+             goredo releases <goredo@cypherpunks.ru>
+OpenSSH key: SHA256:ddOaswnUBtNbuoEBYQtfcF59sR3Bvzo9pIfSlw9sKx8
 
 Please send questions regarding the use of goredo, bug reports and patches
 to mailing list: http://lists.cypherpunks.ru/goredo_002ddevel.html