Mistaken domain in the signing key

diff --git a/PUBKEY-PGP.asc b/PUBKEY-PGP.asc
index 0375a04b9de024ed7a7db6a28403a2a3ab595b6b..50117c20e5629c264c6b6b07a7f4a4f0ab55a519 100644 (file)
--- a/PUBKEY-PGP.asc
+++ b/PUBKEY-PGP.asc
@@ -1,12 +1,12 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mDMEZNX0PxYJKwYBBAHaRw8BAQdAjqIcK22xCUdd+5yNnsir/dQTuNkNY/pSvWs4
-0ioQeXe0LXRvZnVwcm94eSByZWxlYXNlcyA8dG9mdXByb3h5QGN5cGhlcnB1bmtz
-LnJ1PoiOBBMWCgA2AhsDBAsJCgcCIgICFQoEFgIBAAIeBwIXgBYhBELHuGpKfcRL
-g3xDQ4HL+wBxR4UWBQJk1fSTAAoJEIHL+wBxR4UWsAwA/jzeKUvXSTiG+6UDB8R/
-lfue4FKQJq+ngFAcfn+SSao8AQClRp4saZntAY1pQ4vvmCblpJDbd+VYIDdesOHe
-K+3YDYh1BBAWCgAdFiEEEq0yaJxmDUJpZ/11y4IFYyEHrYoFAmTV9P8ACgkQy4IF
-YyEHrYpP8AEA7B/jnpfvmV3pFSGSMLZqPUo2CCrLPzdMOJJEvq1FCIcA/18cnROY
-SgUDbIvSWzPeyJR53Swpd7dsEcAZssJCxHsE
-=4gmV
+mDMEZNYyOhYJKwYBBAHaRw8BAQdA67+poAzLTVmjjhjTmwEKbObE7+QPHIlIKeqB
+rSlGqxq0LHRvZnVwcm94eSByZWxlYXNlcyA8dG9mdXByb3h5QHN0YXJncmF2ZS5v
+cmc+iI4EExYKADYCGwMECwkKBwIiAgIVCgQWAgEAAh4HAheAFiEENHfTKSx3W/Od
+qg4HWSHVlqMy+EQFAmTWMmoACgkQWSHVlqMy+ESH3QEAqjT0p/3VyvNiHfFSCeTg
+8tiWr9rih8uCRnHmi4TcuA4BAKW4Db22XQ7u9xrdiH10jrOamFnYtbqsdJPQMUgh
+6gIAiHUEEBYKAB0WIQQSrTJonGYNQmln/XXLggVjIQetigUCZNYyhAAKCRDLggVj
+IQetipNVAQDQLJ4HCRx4aXBTW+ORwOIx/KvL2d8K9L/s1SHecWCtVAD+MONev0wj
+WiY3s2T5d5qAya19Bw9k5Ox0Pcq7XNrBBgQ=
+=cIlF
 -----END PGP PUBLIC KEY BLOCK-----

diff --git a/PUBKEY-SSH.pub b/PUBKEY-SSH.pub
index 230952c2aed676f046a6c5081902ec3c2e692d35..d25cdd96fe458eb5c498f6f0e245ec1b5ad47983 100644 (file)
--- a/PUBKEY-SSH.pub
+++ b/PUBKEY-SSH.pub
@@ -1 +1 @@
-tofuproxy@cypherpunks.ru ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKoLFahYbMEPEjbknT4EMbBvWLK3OOfTvm+qOITY/Dxk
+tofuproxy@stargrave.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHMLJe/s8c65ZAZBwmzQI811KGwyr2eOP1XQAxezlbHC

diff --git a/PUBKEY-SSH.pub.asc b/PUBKEY-SSH.pub.asc
index 15bacf38aabc905abc075559efec7bb9e3393e85..17c4c01012167799a4a6c24d43237d0b8673e644 100644 (file)
--- a/PUBKEY-SSH.pub.asc
+++ b/PUBKEY-SSH.pub.asc
@@ -1,8 +1,7 @@
 -----BEGIN PGP SIGNATURE-----
 
-iI8EABYKADcWIQRCx7hqSn3ES4N8Q0OBy/sAcUeFFgUCZNX7MxkcdG9mdXByb3h5
-QGN5cGhlcnB1bmtzLnJ1AAoJEIHL+wBxR4UWm9cBAL7vim1KF1tcJb/d7MVAoovP
-QyUbcDSqbebws5hLK9gsAPoC5vhtaVW1H/O8DzcBHtt1Ix9HkQGrBezE+DSSQ/EE
-BQ==
-=f3Zr
+iI4EABYKADYWIQQ0d9MpLHdb852qDgdZIdWWozL4RAUCZNYy9hgcdG9mdXByb3h5
+QHN0YXJncmF2ZS5vcmcACgkQWSHVlqMy+ES7RgEAgXxAD1LRvH1oMZxbb/9Z2/bo
+r933/GUiVvYqcC3dbS8BAMebsfKiNwUvQOKUENtOqYjwyraX/HSdc6/WY6X6jVQK
+=GohX
 -----END PGP SIGNATURE-----

diff --git a/doc/integrity.texi b/doc/integrity.texi
index 2420afb447bf53a764d6609bb4ed88a62fdd1f2e..04571a7011bc28defc643ff27935391e9d38bdb8 100644 (file)
--- a/doc/integrity.texi
+++ b/doc/integrity.texi
@@ -11,20 +11,20 @@ that you retrieved trusted and untampered software. There are two options:
     check alternate resources.
 
 @verbatim
-pub   ed25519/0x81CBFB0071478516 2023-08-11
-      42C7 B86A 4A7D C44B 837C  4343 81CB FB00 7147 8516
-uid   tofuproxy releases <tofuproxy@cypherpunks.ru>
+pub   ed25519/0x5921D596A332F844 2023-08-11
+      3477 D329 2C77 5BF3 9DAA  0E07 5921 D596 A332 F844
+uid   tofuproxy releases <tofuproxy@stargrave.org>
 @end verbatim
 
 @example
-$ gpg --auto-key-locate dane --locate-keys tofuproxy at cypherpunks dot ru
-$ gpg --auto-key-locate  wkd --locate-keys tofuproxy at cypherpunks dot ru
+$ gpg --auto-key-locate dane --locate-keys tofuproxy at stargrave dot org
+$ gpg --auto-key-locate  wkd --locate-keys tofuproxy at stargrave dot org
 @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:TFmIjNNqfRmyz7gq/ajvsmz6CAvs1FEAvgDZk3zNDy8}.
+    Its fingerprint: @code{SHA256:NIDt9iZUizwivY3GoxmGvbQTH7mz/dmV7ZFOXeYfa2o}.
 
 @example
 $ ssh-keygen -Y verify -f PUBKEY-SSH.pub -I tofuproxy@@cypherpunks.ru -n file \

diff --git a/doc/www.do b/doc/www.do
index 66148fa5c95c089b2f085ea08d893d343bc947ad..122fc5313565aa8803e3608761e8961d766e2b3f 100644 (file)
--- a/doc/www.do
+++ b/doc/www.do
@@ -16,7 +16,7 @@ cp -a *.webp ../PUBKEY-* $html/
     export ATOM_ID="e1e74079-3844-11ee-9b0c-a4ae1277b945"
     export NAME=tofuproxy
     export BASE_URL=http://www.tofuproxy.stargrave.org/download
-    export AUTHOR_EMAIL=tofuproxy@cypherpunks.ru
+    export AUTHOR_EMAIL=tofuproxy@stargrave.org
     ~/work/releases-feed/releases.atom.zsh
 )
 perl -i -npe 'print "<link rel=\"alternate\" title=\"Releases\" href=\"download/releases.atom\" type=\"application/atom+xml\">\n" if /^<\/head>/' $html/Install.html

diff --git a/makedist b/makedist
index 6430addf0c0e11f36805efdcbceebe4c305a02dc..23c5851dad3b687e5e34d391a6eb5616de458ecf 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -57,8 +57,8 @@ cd ..
 tar cvf tofuproxy-"$release".tar --uid=0 --gid=0 --numeric-owner tofuproxy-"$release"
 zstd -19 -v tofuproxy-"$release".tar
 tarball=tofuproxy-"$release".tar.zst
-ssh-keygen -Y sign -f ~/.ssh/sign/tofuproxy@cypherpunks.ru -n file $tarball
-gpg --armor --detach-sign --sign --local-user 42C7B86A4A7DC44B837C434381CBFB0071478516 "$tarball"
+ssh-keygen -Y sign -f ~/.ssh/sign/tofuproxy@stargrave.org -n file $tarball
+gpg --armor --detach-sign --sign --local-user 3477D3292C775BF39DAA0E075921D596A332F844 "$tarball"
 meta4-create -fn "$tarball" -mtime "$tarball" \
     -sig-pgp "$tarball".asc -sig-ssh "$tarball".sig \
     http://www.tofuproxy.stargrave.org/download/"$tarball" \