PUBKEY-SSH.pub | 2 +- PUBKEY-SSH.pub.asc | 10 +++++----- doc/install.texi | 2 +- doc/integrity.texi | 2 +- makedist | 5 ++--- version.go | 2 +- diff --git a/PUBKEY-SSH.pub b/PUBKEY-SSH.pub index 7df87a181b3b3517ec062aaea850b1ae63ed6033156527068b7e47667511eeab..ab1a909edb8b699899746384aba2242a3fd67f3207d6050e2bb8d3e42f124fe3 100644 --- a/PUBKEY-SSH.pub +++ b/PUBKEY-SSH.pub @@ -1 +1 @@ -tofuproxy@stargrave.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHMLJe/s8c65ZAZBwmzQI811KGwyr2eOP1XQAxezlbHC +tofuproxy@stargrave.org ssh-mldsa44-ed25519@openssh.com AAAAH3NzaC1tbGRzYTQ0LWVkMjU1MTlAb3BlbnNzaC5jb20AAAVAtA6ncfkvCh/nO1lDQ0rRfNuhLvvM0KIc0oAKYpvZwMXoDnMQzZNl+5H8B2q83QVsmaKANPru9j7zcy7YWHGfza7tpCRVXb35H/65oOYLtcJGs2T7Zmxr+6ngiNyAA5uYBLI+PNr9iPMFknKybMh4816gory7utU35jqHLdvquL3w6Eo8VNR/5A4c9u2v3yopHTqaI7URAR5xC1tzD8rmBDXVxTm2dcs4HqVffoHwGpzkP+SO5ZNsrJhY68EUaq/UH3TCbHygpGZnv9CvkS+5C3D6oUmhgZMFM0/5hx60Tyd3yv0FGgMkaOYiROfYqXJQJ06Ug6ed4mRn8fRuMesfONWmAoMe/79J4xcuWEjav+a+RRIr55XzNG5Zkf8AVUhmlgapVwLYHPFs+DA4bThVE4Z40i3LT45NWTCXes6AsXCh+yfcYQzIVC/OGPAQL7AuX6jVMifYa6gaZhk9ccTmAp6hA/8SGBC9DaAaTkYqYWpoRSh685315CKZW1yguuj0KTvOV/galY/tZ11dDwo8GXJJXh9mUHO9gSCrW6doTNGDIkqPRl9LnUInoAYRN61kB0h7BumCcDzQB43qfzISrFDQ2cI4QywkeXGz4H8Xa/iruJ2n6EPr2hgSsNHwF3XbvSdVwuhineJg3BBqdMwQmqCppaD01IElXYU86olMM/dr6NflIAFLNUMXWSRB7/Gbhlt7DgIr0iY2UOyBojnMjoSUT5hMQsp922qIADyO8OjOrO72OSZUSCeSSUmYdKnAAFs9+t0HT5yugBiaA+vpu6Vw/8guvCzVYwn86MF4aawP+EPs8oo/gPrtSb3kPDbo6in9syUkaEDOCiWTPq78OBPxcGaI82Uudcji2fzPyCOmjTlUpkUBnEJTurqSCbT4eTLaEHPn/7eNIj/X0A2JgnOx/eLPcXakLU5Utqbxfx8hTAT712P7hcqdU57QIwQBPrNizOBdKVv4qQSgaImK9dH4OvcIokxoWwNlqAlgmfUwDJ9KaBa3X8glQeuhhZyLi3BRBfl/UtREOkedWAF+bI7WW/baNDLjkV1zesvsgBjxOSmwGqlyto3sVRjpW4d1tpqeYWLPx++2MLJbBlKnxxs3HCbmvYma666lnLzp9eH603A/Mn8m9kkr9hnmqN6+tWRuGOtgQxbh2KwbTp8HyaX5SMb7X6qI3rrFFWMrLaGupLgY0qPwO8Vj5DpzqDqJz8eauuQncawx250+RD5RjNz0ZiFx9Q9NBHoIwvGzHhUmxUQbHhIRjtCYZCxgxSvIHU+2dnh1TtBFC3c7eaiVk/a+5jaWZ2Ncr9wDzpBRSee70GEBu0derFrgkflPPnqG7IkWcgM7T5dx7YtMCiMSLlmd3uQwoWsQhVEQiOHdsaSWY5jVAe7yUPVkfl1brVtjw7bFBheyVSbQZDQ7OQ7Ps6TObgVcf4ZiRmL2yd4idmoykf6lgWXjghdAWRP0lWu8QbZ8594B3xo/R9Ayy4IfUgWa7xGliajRaawUryd2/tr1hmgg4S0oFGa4QATgZxVNk5XPEAT0PXpx2YqULDCrZF9UdJCH+2Rjtoy6mf8nvRcNgSqtpddEuClQYLhgiprK0EmDSRA3fPMKieifMTWaAzfkbkj9/qnqp/BukY4aIYpr93psB+Hi8ClYnr3XTXOMQt9z6hjpwpIcT2N7buZRRoJ7cQQXS7QpRn9Xw/+c6K8fyAgAA6Kk/ivtPqL523IbSZOG1rjLICOC1+zSEHzBI8uTSlhIRxgLAO7p/3rSg3LZRCos3eq3rfx8oEMoYsdx diff --git a/PUBKEY-SSH.pub.asc b/PUBKEY-SSH.pub.asc index e88acdeda5b4a5a65cf7c699e2cd6bd3b76b42c523ef81cef63b8e97758a333a..89116d69fbdf19ea6c67476ac47a75f349ca77a75dc082a5b20cd1292d7d4735 100644 --- a/PUBKEY-SSH.pub.asc +++ b/PUBKEY-SSH.pub.asc @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNATURE----- -iJEEABYKADkWIQTbL/jtRAp+lJhvt3bSI36ECQhstwUCacJyPxsUgAAAAAAEAA5t -YW51MiwyLjUrMS4xMiwyLDMACgkQ0iN+hAkIbLeuIAEA5QgypAjeMRItnmyM5cSp -Cp1phDWKvt+f5Fs+aAs9duoA/39hOCyoyQYx4WziQvjSfCpXetfjPovVzxbpBlSP -9NoA -=GrcE +iJEEABYKADkWIQTbL/jtRAp+lJhvt3bSI36ECQhstwUCakynSBsUgAAAAAAEAA5t +YW51MiwyLjUrMS4xMiwyLDMACgkQ0iN+hAkIbLfm0wEA8ofHQBbVCXEFSPOvn45U +ZRzMVqsDkJeHPIIkx2SObusA/iQeSukEepkuQA4P00Ws6DKcZ1CzoJnorTFTFocR +z8kD +=4Dxh -----END PGP SIGNATURE----- diff --git a/doc/install.texi b/doc/install.texi index 5ac75eb72867e5ef713eabf325df1fb06811b08c2342a62c655a1c880a5c75f4..801daa3cd949b6390abd0a1173980f9c459b3c5cdc5a2f79ced9f3b608709a65 100644 --- a/doc/install.texi +++ b/doc/install.texi @@ -8,7 +8,7 @@ WARCs support. @example $ fetch http://www.tofuproxy.stargrave.org/download/tofuproxy-@value{VERSION}.tar.zst -$ fetch http://www.tofuproxy.stargrave.org/download/tofuproxy-@value{VERSION}.tar.zst.@{asc,sig@} +$ fetch http://www.tofuproxy.stargrave.org/download/tofuproxy-@value{VERSION}.tar.zst.sig [verify signature] $ tar xf tofuproxy-@value{VERSION}.tar.zst $ cd tofuproxy-@value{VERSION} diff --git a/doc/integrity.texi b/doc/integrity.texi index 9577dff4c4d902968b976c230a11dfdaf4fbf46276e435d082d188b62fe940ff..397f96ebd26fb4dd2a6a2390972ba45ccdee60f70e83e6829a1f215f65619a09 100644 --- a/doc/integrity.texi +++ b/doc/integrity.texi @@ -4,7 +4,7 @@ @url{https://www.openssh.com/, OpenSSH} @file{.sig} signature, @url{PUBKEY-SSH.pub, Public key} and its LibrePGP @url{PUBKEY-SSH.pub.asc, signature} made with the key above. -Its fingerprint: @code{SHA256:NIDt9iZUizwivY3GoxmGvbQTH7mz/dmV7ZFOXeYfa2o}. +Its fingerprint: @code{SHA256:y67HEbtmtxKNjtAha0QZNmX13Izibey8QUzqKnyCzio}. @example $ ssh-keygen -Y verify -f PUBKEY-SSH.pub -I tofuproxy@@stargrave.org -n file \ diff --git a/makedist b/makedist index 710aa6572e7dafb216e7c685968b6c3cf50c525e67bc00b678ca2c8c9ea5747b..a2c9ac5eb2fb5428a18dd65aa6e0b120288a96df1bc7acd49a73afd9ea69ef09 100755 --- a/makedist +++ b/makedist @@ -59,7 +59,7 @@ zstd -22 --ultra -v tofuproxy-"$release".tar tarball=tofuproxy-"$release".tar.zst ssh-keygen -Y sign -f ~/.ssh/sign/tofuproxy@stargrave.org -n file $tarball meta4ra-create -fn "$tarball" -mtime "$tarball" \ - -sig-pgp "$tarball".asc -sig-ssh "$tarball".sig \ + -sig-ssh "$tarball".sig \ "1|ru|http://www.tofuproxy.stargrave.org/download/$tarball" \ "2|ru|https://www.tofuproxy.stargrave.org/download/$tarball" \ "|ru|http://y.www.tofuproxy.stargrave.org/download/$tarball" \ @@ -74,8 +74,7 @@ An entry for documentation: @item $release @tab $release_date @tab $size KiB @tab @url{download/$tarball.meta4, meta4} @url{download/$tarball, tar} - @url{download/$tarball.asc, pgp} @url{download/$tarball.sig, ssh} EOF -mv $tmp/$tarball $tmp/"$tarball".asc $tmp/"$tarball".sig $tarball.meta4 $cur/doc/tofuproxy.html/download +mv $tmp/$tarball $tmp/"$tarball".sig $tarball.meta4 $cur/doc/tofuproxy.html/download diff --git a/version.go b/version.go index 6177f930e1d36536fa2d6e13b3e209e6bd9a9875d6dcc3cc064af29c29c68c16..f26f9fa3e7bd799a6765fcf6b1eb8f0cd82787d6174655e58e9c02d3a33d317a 100644 --- a/version.go +++ b/version.go @@ -1,3 +1,3 @@ package tofuproxy -const Version = "0.6.0" +const Version = "0.7.0"