PUBKEY-PGP.asc | 33 --------------------------------- PUBKEY-SSH.pub | 2 +- PUBKEY-SSH.pub.asc | 13 +++++-------- README | 8 ++++---- doc/INSTALL | 13 +++++-------- doc/Integrity | 24 ++++++------------------ doc/NEWS | 2 +- doc/index | 4 ++-- doc/mk-html | 4 ++-- makedist | 68 ++++++++++++++++++++--------------------------------- pygost/asn1schemas/x509.py | 2 +- pygost/mgm.py | 2 +- setup.py | 2 +- diff --git a/PUBKEY-PGP.asc b/PUBKEY-PGP.asc deleted file mode 100644 index 1c2a2965a63a360fb76d697070feeed0cae36a87d9e2083eda89c4ffc111060a..0000000000000000000000000000000000000000 --- a/PUBKEY-PGP.asc +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQENBFfXoPQBCACfxmT1M/oDKh+3DxiIHwA2YdyJ0joxe+QhT1cACApvD9GBOlbS -QqJU3kyO1+uOO5QzeTsSYdZbdcXF+Y7koEUsAVGY6aTKNKuuOrhVPTnhbG8Em++p -i6LPAvHs1/pD9xYWgSyGueu5OrcUu1bk7Ii16BePkGdoVqIo53OrteNH8fabJ5Ga -Rqvn2SxyTZ/HrgSfWqXOPmP62oiUKD6ztQPv1qP5GoSqPT3zXRF+c7yoJzAi09/D -trKpOH+eZqj/5M1v853i/TIQE975+AH9HNuIK3XYt67VQiDqU3CFeWC6wFUt/FOD -eAA9pKuJvY7eCyKVCOuNYJ5af1fGuxrEZPxJABEBAAG0J1B5R09TVCByZWxlYXNl -cyA8cHlnb3N0QGN5cGhlcnB1bmtzLnJ1PokBQAQTAQgAKgUCV9eg9AIbAwwLCgkN -CAwHCwMEAQIHFQoJCAsDAgUWAgEDAAIeAQIXgAAKCRDm/RJpzQwAnkiQB/wLD29x -75urRIOCxLKrynERF2z/lxUv8aA6VB6Bp3/c08xbrtrNKpq970WvcxyNrsTFgcno -Sc2QBwGjSM4Oh5z1UxHt8wLvk+FTOYxlkUiOQv9uCwhU4ZtypV7Ps759dwneY2nS -Y0R5oGa3nFhi7JujBu7/9Xr2riBBczsGh3chFUe/WeQZxwfF4ZJFN/ykJpvlwkhe -txhAWSG2JTR9xDxbt6JBzdZ8hmS9YNZrzzyU3XUkdATi6zgkgv8BYPlc/QUCBVYp -xukpfqopwuT0QPKXZjPEBUNRAXGtPMo83OQyanMLm/BkSJXFBO2mVjaalEohc7Iq -jMcy/DjqMIpsOdVfiF4EEBEIAAYFAlfXoRkACgkQrhqBCeSYV+9zEgD/Weliq0bC -bQbT+AV0oPSsh4cl7/7yBWXuERUm0uIsDRsA/RSss+81tbyKTt8oObmDqi3gt8ka -6j2AvJWj4I8J/fT9iHUEEBYKAB0WIQQSrTJonGYNQmln/XXLggVjIQetigUCYuo6 -aAAKCRDLggVjIQetihMDAQD6dNWqOu1kzs36wvraLCUSjqmcYmEhsP/mAplOAnk9 -WAEAkzQxSY8Xk21ZvesWhlaK8dY9M4h8rjNBeTfnZwmGUQe0J1B5R09TVCByZWxl -YXNlcyA8cHlnb3N0QGN5cGhlcnB1bmtzLnN1PokBTAQTAQoANhYhBPVadhk6DDI6 -oDEOa+b9EmnNDACeBQJmmTpNAhsDBAsJCgcCIgICFQoEFgIBAAIeBwIXgAAKCRDm -/RJpzQwAntB/B/49E6NXH47/MABSZoUvY2EBFtTbuw8tAJbt4ujayi9UXikzoJFM -dLnN2lLasVspB7c5jgisHVjm90aaWVI9cOoPplxrEtMfK844FoIKpYiGgqqqmm8E -bk9Ldkpr7qxOyuxUs9pCnRZDE8aam0aWx78VvTgj4YpHlQS1nRMkhLcIE1koMPQV -lQG05U1ENUy5BeRoapcn+5w0vXfqLQ8VGkiQSAqzVIMpmvXMdr6ymNLfehZ5Avxo -ryJcF7lkW/DK219suilo5HtWxW9IPq5HvLxOi3/yu+W60tf5EsMNdbuwqI5zoyo7 -cdxdu2sIlIhYIegzXsmf0TcGEjkvgnBp1u2yiHUEEBYKAB0WIQQSrTJonGYNQmln -/XXLggVjIQetigUCZpk6WwAKCRDLggVjIQetirLbAP9zjP1dYM8/4FZ0bFfKB8pz -jvnTkIV2yQFAQQABToKngwD+OhigfAB/TKUM4kX7865iqDvPoONJRYf0tx75Thuu -twU= -=tZUG ------END PGP PUBLIC KEY BLOCK----- diff --git a/PUBKEY-SSH.pub b/PUBKEY-SSH.pub index 09bfe85acd63b38ab7dd81c90b347a2cd7bcea9b1e84daf438301a0f97253135..e803706ead4480a9d70a4192184ac3ffb2ef8fdce7a00b52e678e46c6a551507 100644 --- a/PUBKEY-SSH.pub +++ b/PUBKEY-SSH.pub @@ -1 +1 @@ -pygost@cypherpunks.su ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPM7eh6HlPQVqV44/sBNMFZ6esa0KtGb3nl26Sj5NHbr +pygost@stargrave.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPM7eh6HlPQVqV44/sBNMFZ6esa0KtGb3nl26Sj5NHbr diff --git a/PUBKEY-SSH.pub.asc b/PUBKEY-SSH.pub.asc index 6514298f7a0c96df72dc4c3930e2d0153234d6f93756c96b4ddf5fc88b3b9735..0c1db59d6188d87e4154e88577edfd6c64a27386263a1faf35d5fdb710980841 100644 --- a/PUBKEY-SSH.pub.asc +++ b/PUBKEY-SSH.pub.asc @@ -1,11 +1,8 @@ -----BEGIN PGP SIGNATURE----- -iQFKBAABCgA0FiEE9Vp2GToMMjqgMQ5r5v0Sac0MAJ4FAmaZOxgWHHB5Z29zdEBj -eXBoZXJwdW5rcy5ydQAKCRDm/RJpzQwAnlQXCACHekEZzBZlr8SPQItqiujRSHXc -/1dCshDClk1fAkNMqqIu9riK6PBVLj/NieoF7Tlj/gRDyz2+gzvp+M/eI2GnjDQq -x+cxcddlH4+firXOejZ2H48EOAf6lrwFrt5Zho7cLnuZkkiZEFNsYXngQNqM5m6t -ymRTE/A3jFAgIQoXIz8lFkWy7ZrlWNym59hXQRpOo9YWJsvAPYPTHaaA3uodLRJ9 -l/rWVJGEmqjYx6JVz3Mh7emYgfAsrrZD3QN/o0RtgHtpqEIn8QsPtgd1lwoKXyZD -pFnVxQMYFQqu8cY2PphavJw6gCSQ+I+g7kUcIJ0h7CyyEQ/eorotdPphXIVl -=hs7j +iJEEABYKADkWIQTbL/jtRAp+lJhvt3bSI36ECQhstwUCacE4NRsUgAAAAAAEAA5t +YW51MiwyLjUrMS4xMiwyLDMACgkQ0iN+hAkIbLdACgD/a9/kb39dQMqCMx0i3KG/ +HLigq25l8hgp7rnTq82KCmcBAMnKdLvP7SGA5vgY7+55ZtWx9/kgQq66bXzhGE1j +U0MF +=XT9b -----END PGP SIGNATURE----- diff --git a/README b/README index 7b028e3ca4bfafb83e7bb9849f380658b39c0de8781f32337eef2c72755a98fd..c40a27a2c81eb0b5813db96b516996ba49fd6b1d790d484c29586a43063f6e67 100644 --- a/README +++ b/README @@ -63,12 +63,12 @@ pygost/asn1schemas/cert-selfsigned-example.py. PyGOST is free software: see the file COPYING for copying conditions. -PyGOST'es home page is: http://www.pygost.cypherpunks.su/ -You can read about GOST algorithms more: http://www.gost.cypherpunks.su/ +PyGOST'es home page is: http://www.pygost.stargrave.org/ +You can read about GOST algorithms more: http://www.gost.stargrave.org/ Please send questions, bug reports and patches to -http://lists.cypherpunks.su/gost.html mailing list. +http://lists.stargrave.org/gost.html mailing list. Announcements also go to this mailing list. Development Git source code repository currently is located here: -http://www.git.cypherpunks.su/?p=pygost.git;a=summary +http://www.git.stargrave.org/?p=pygost.git;a=summary diff --git a/doc/INSTALL b/doc/INSTALL index cc5509d0ada0283e49002932386beaa9707d5636bdd32adcfab4aec4c76f9b5d..e6c73ae36deb06755cb172e5cee0079cee2ffe1420c490cfa7c81e7b832a374b 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -3,20 +3,17 @@ Preferable way is to [Download] tarball with the signature: $ v=6.0 - $ fetch http://www.pygost.cypherpunks.su/pygost-$v.tar.zst - $ fetch http://www.pygost.cypherpunks.su/pygost-$v.tar.zst.{asc,sig} + $ fetch http://www.pygost.stargrave.org/pygost-$v.tar.zst + $ fetch http://www.pygost.stargrave.org/pygost-$v.tar.zst.sig [Integrity] verify $ zstd -d https://librepgp.org/ LibrePGP - .asc ed25519 signature. - => https://www.gnupg.org/ GNU Privacy Guard - => PUBKEY-PGP.asc public key - - pub rsa2048/0xE6FD1269CD0C009E 2016-09-13 - F55A 7619 3A0C 323A A031 0E6B E6FD 1269 CD0C 009E - uid PyGOST releases - - $ gpg --auto-key-locate dane --locate-keys pygost@cypherpunks.su - $ gpg --auto-key-locate wkd --locate-keys pygost@cypherpunks.su +you retrieved trusted and untampered software. => https://www.openssh.com/ OpenSSH - .sig ed25519 signature. - => PUBKEY-SSH.pub public key - => PUBKEY-SSH.pub.asc its LibrePGP signature - Fingerprint: SHA256:/Z3T/T2sXaaunefAL6tz3ZykHTDYIMh5TLd9Hh9mxlU +.sig ed25519 signature. +=> PUBKEY-SSH.pub public key +=> PUBKEY-SSH.pub.asc its LibrePGP signature +Fingerprint: SHA256:/Z3T/T2sXaaunefAL6tz3ZykHTDYIMh5TLd9Hh9mxlU - $ ssh-keygen -Y verify -f PUBKEY-SSH.pub -I pygost@cypherpunks.su -n file \ + $ ssh-keygen -Y verify -f PUBKEY-SSH.pub -I pygost@stargrave.org -n file \ -s pygost-$v.tar.zst.sig http://www.pyderasn.cypherpunks.su/ + => http://www.pyderasn.stargrave.org/ A 3.14 3.14 diff --git a/doc/index b/doc/index index 633f1683140b1cca9197b06388905dda7b07a1314b3b647d3f8dcd642dfbad1c..8deae71257d2909998c314463a757b386c3651d4a0b788302a15d0e156bcd9b8 100644 --- a/doc/index +++ b/doc/index @@ -5,7 +5,7 @@ => https://www.gnu.org/philosophy/free-sw.html free software licenced under => https://www.gnu.org/licenses/gpl-3.0.html GPLv3 You can read more -=> http://www.gost.cypherpunks.su/ about GOST algorithms. +=> http://www.gost.stargrave.org/ about GOST algorithms. Currently supported algorithms are: @@ -75,5 +75,5 @@ [FAQ] [NEWS] [INSTALL] [THANKS] Please send questions, bug reports and patches to -=> http://lists.cypherpunks.su/gost.html mailing list +=> http://lists.stargrave.org/gost.html mailing list Announcements also go to this mailing list. diff --git a/doc/mk-html b/doc/mk-html index 1dcf1d6de4774a2d48174d7ac9015896ef7b479028f0fee309b6277a0966e5c4..ad222cd82a2f118fd8fc34786db9708b10860f1032c6a8961a6e8b01dbc4ac2e 100755 --- a/doc/mk-html +++ b/doc/mk-html @@ -9,8 +9,8 @@ ( cd $html export ATOM_ID="98c5d1c8-b867-4eee-91b0-ef2c507e93b9" export NAME=PyGOST - export BASE_URL=http://www.pygost.cypherpunks.su - export AUTHOR_EMAIL=pygost@cypherpunks.su + export BASE_URL=http://www.pygost.stargrave.org + export AUTHOR_EMAIL=pygost@stargrave.org ~/work/releases-feed/releases.atom.zsh ) perl -i -npe 'print "\n" if /^<\/head>/' $html/Download.html diff --git a/makedist b/makedist index 17b831ec996290c5d548d93786616987c2fde5b4333897b966075bdf034779ee..198d17fca4e366aa1597b139a4a7255765d68aa889e0b1f587bd347cdaf40085 100755 --- a/makedist +++ b/makedist @@ -19,47 +19,33 @@ cd .. detpax pygost-$release >pygost-$release.tar zstd -22 --ultra -v pygost-$release.tar tarball=pygost-$release.tar.zst -ssh-keygen -Y sign -f ~/.ssh/sign/pygost@cypherpunks.su -n file $tarball -gpg --armor --detach-sign --sign --local-user pygost@cypherpunks.su $tarball +ssh-keygen -Y sign -f ~/.ssh/sign/pygost@stargrave.org -n file $tarball meta4ra-create -fn $tarball -mtime $tarball \ -sig-pgp $tarball.asc -sig-ssh $tarball.sig \ - "1|ru|http://www.pygost.cypherpunks.su/$tarball" \ - "2|ru|http://msk.www.pygost.cypherpunks.su/$tarball" \ - "2|ru|http://spb.www.pygost.cypherpunks.su/$tarball" \ - "3|ru|https://www.pygost.cypherpunks.su/$tarball" \ - "4|ru|https://msk.www.pygost.cypherpunks.su/$tarball" \ - "4|ru|https://spb.www.pygost.cypherpunks.su/$tarball" \ - "5|ru|http://y.www.pygost.cypherpunks.su/$tarball" \ + "1|ru|http://www.pygost.stargrave.org/$tarball" \ + "2|ru|http://msk.www.pygost.stargrave.org/$tarball" \ + "2|ru|http://spb.www.pygost.stargrave.org/$tarball" \ + "3|ru|https://www.pygost.stargrave.org/$tarball" \ + "4|ru|https://msk.www.pygost.stargrave.org/$tarball" \ + "4|ru|https://spb.www.pygost.stargrave.org/$tarball" \ + "5|ru|http://y.www.pygost.stargrave.org/$tarball" \ "5|ru|http://[322:3bd:cc26:9545:b00b:56a5:870a:16a4]/$tarball" \ - "6|ru|sftp://anonwww@msk.www.cypherpunks.su/pygost.cypherpunks.su/$tarball" \ - "6|ru|sftp://anonwww@spb.www.cypherpunks.su/pygost.cypherpunks.su/$tarball" \ + "6|ru|sftp://anonwww@msk.www.stargrave.org/pygost.stargrave.org/$tarball" \ + "6|ru|sftp://anonwww@spb.www.stargrave.org/pygost.stargrave.org/$tarball" \ <$tarball >$tarball.meta4 -meta4ra-create -add $tarball.meta4 -fn $tarball.asc -hashers "" \ - -id "LibrePGP detached signature" \ - "1|ru|http://www.pygost.cypherpunks.su/$tarball.asc" \ - "2|ru|http://msk.www.pygost.cypherpunks.su/$tarball.asc" \ - "2|ru|http://spb.www.pygost.cypherpunks.su/$tarball.asc" \ - "3|ru|https://www.pygost.cypherpunks.su/$tarball.asc" \ - "4|ru|https://msk.www.pygost.cypherpunks.su/$tarball.asc" \ - "4|ru|https://spb.www.pygost.cypherpunks.su/$tarball.asc" \ - "5|ru|http://y.www.pygost.cypherpunks.su/$tarball.asc" \ - "5|ru|http://[322:3bd:cc26:9545:b00b:56a5:870a:16a4]/$tarball.asc" \ - "6|ru|sftp://anonwww@msk.www.cypherpunks.su/pygost.cypherpunks.su/$tarball.asc" \ - "6|ru|sftp://anonwww@spb.www.cypherpunks.su/pygost.cypherpunks.su/$tarball.asc" \ - <$tarball.asc >$tarball.meta4_ mv $tarball.meta4_ $tarball.meta4 meta4ra-create -add $tarball.meta4 -fn $tarball.sig -hashers "" \ -id "OpenSSH signature" \ - "1|ru|http://www.pygost.cypherpunks.su/$tarball.sig" \ - "2|ru|http://msk.www.pygost.cypherpunks.su/$tarball.sig" \ - "2|ru|http://spb.www.pygost.cypherpunks.su/$tarball.sig" \ - "3|ru|https://www.pygost.cypherpunks.su/$tarball.sig" \ - "4|ru|https://msk.www.pygost.cypherpunks.su/$tarball.sig" \ - "4|ru|https://spb.www.pygost.cypherpunks.su/$tarball.sig" \ - "5|ru|http://y.www.pygost.cypherpunks.su/$tarball.sig" \ + "1|ru|http://www.pygost.stargrave.org/$tarball.sig" \ + "2|ru|http://msk.www.pygost.stargrave.org/$tarball.sig" \ + "2|ru|http://spb.www.pygost.stargrave.org/$tarball.sig" \ + "3|ru|https://www.pygost.stargrave.org/$tarball.sig" \ + "4|ru|https://msk.www.pygost.stargrave.org/$tarball.sig" \ + "4|ru|https://spb.www.pygost.stargrave.org/$tarball.sig" \ + "5|ru|http://y.www.pygost.stargrave.org/$tarball.sig" \ "5|ru|http://[322:3bd:cc26:9545:b00b:56a5:870a:16a4]/$tarball.sig" \ - "6|ru|sftp://anonwww@msk.www.cypherpunks.su/pygost.cypherpunks.su/$tarball.sig" \ - "6|ru|sftp://anonwww@spb.www.cypherpunks.su/pygost.cypherpunks.su/$tarball.sig" \ + "6|ru|sftp://anonwww@msk.www.stargrave.org/pygost.stargrave.org/$tarball.sig" \ + "6|ru|sftp://anonwww@spb.www.stargrave.org/pygost.stargrave.org/$tarball.sig" \ <$tarball.sig >$tarball.meta4_ mv $tarball.meta4_ $tarball.meta4 touch -r $tarball $tarball.meta4 @@ -92,20 +78,18 @@ ------------------------ >8 ------------------------ -PyGOST'es home page is: http://www.pygost.cypherpunks.su/ +PyGOST'es home page is: http://www.pygost.stargrave.org/ URLs to source code, its checksums and signatures can be found in an attached Metalink4 file. -LibrePGP key: F55A 7619 3A0C 323A A031 0E6B E6FD 1269 CD0C 009E - PyGOST releases OpenSSH key: SHA256:/Z3T/T2sXaaunefAL6tz3ZykHTDYIMh5TLd9Hh9mxlU Please send questions regarding the use of PyGOST, bug reports and patches -to mailing list: http://lists.cypherpunks.su/gost.html +to mailing list: http://lists.stargrave.org/gost.html EOF echo mutt -s \"[EN] PyGOST $release release announcement\" \ - gost@lists.cypherpunks.su \ + gost@lists.stargrave.org \ -a $cur/doc/pygost.html/$tarball.meta4 cat <8 ------------------------ -Домашняя страница PyGOST: http://www.pygost.cypherpunks.su/ +Домашняя страница PyGOST: http://www.pygost.stargrave.org/ Ссылки на исходный код, его контрольные суммы и подписи могут быть найдены в приложенном Metalink4 файле. -LibrePGP ключ: F55A 7619 3A0C 323A A031 0E6B E6FD 1269 CD0C 009E - PyGOST releases OpenSSH ключ: SHA256:/Z3T/T2sXaaunefAL6tz3ZykHTDYIMh5TLd9Hh9mxlU Пожалуйста, все вопросы касающиеся использования PyGOST, отчёты об ошибках и патчи отправляйте в gost почтовую рассылку: -http://lists.cypherpunks.su/gost.html +http://lists.stargrave.org/gost.html EOF echo mutt -s \"[RU] Состоялся релиз PyGOST $release\" \ - gost@lists.cypherpunks.su \ + gost@lists.stargrave.org \ -a $cur/doc/pygost.html/$tarball.meta4 diff --git a/pygost/asn1schemas/x509.py b/pygost/asn1schemas/x509.py index 316cdc72929d4573e52a2f19d8e96828983cea57d9995587be92b3f0f9c14651..5a86e95089069c15fc7d2afff6ad198a480f7642d220031161f3759b96fa2543 100644 --- a/pygost/asn1schemas/x509.py +++ b/pygost/asn1schemas/x509.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . """:rfc:`5280` related structures (**NOT COMPLETE**) -They are taken from `PyDERASN