Forbid any later GNU GPL versions autousage

diff --git a/pygost/asn1schemas/cms.py b/pygost/asn1schemas/cms.py
index f168c1c93de8720044c0538f921f6a7ca8cbb158..e3f3244b4c9148e3cb1d8364587688eb13029830 100644 (file)
--- a/pygost/asn1schemas/cms.py
+++ b/pygost/asn1schemas/cms.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/asn1schemas/pfx.py b/pygost/asn1schemas/pfx.py
index acc7787d6d7d61570072b859794ed1fe06f93367..737ebdbb641510d0bb84ecd4e73bd4ae1ba3f3c9 100644 (file)
--- a/pygost/asn1schemas/pfx.py
+++ b/pygost/asn1schemas/pfx.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/asn1schemas/x509.py b/pygost/asn1schemas/x509.py
index 7e3938591e4e0c70d7e8c5396358333c47c470c5..1ab0975479818a97e9245028d6f23a40d7f84ea6 100644 (file)
--- a/pygost/asn1schemas/x509.py
+++ b/pygost/asn1schemas/x509.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/gost28147.py b/pygost/gost28147.py
index a6a819f8bb4a5efa378e887b6204c9f82bcb9fc6..ce84dc2e6ea9bbb505995dfef42ac7403055a103 100644 (file)
--- a/pygost/gost28147.py
+++ b/pygost/gost28147.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/gost28147_mac.py b/pygost/gost28147_mac.py
index 22924878041e2c9b6f92494d08f834595cc054ab..c027d630eda7054c406f5be67e5e83ff1d5c81c3 100644 (file)
--- a/pygost/gost28147_mac.py
+++ b/pygost/gost28147_mac.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/gost3410.py b/pygost/gost3410.py
index 500c0c944d8d0edcd563cacd5d721498478998d0..b506406736208cc99a167ed00fdb51ebae167cde 100644 (file)
--- a/pygost/gost3410.py
+++ b/pygost/gost3410.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/gost3410_vko.py b/pygost/gost3410_vko.py
index eebaf4a7ceeffeba26a1bfc8c88d10338131665e..612f4bc073385379157f8332cf5eceb54714c850 100644 (file)
--- a/pygost/gost3410_vko.py
+++ b/pygost/gost3410_vko.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/gost34112012.py b/pygost/gost34112012.py
index b753274243688664da794930434e8f552bbb6421..e433c5bc291852c0315dca05ec7982e4cebf7142 100644 (file)
--- a/pygost/gost34112012.py
+++ b/pygost/gost34112012.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/gost341194.py b/pygost/gost341194.py
index 21ebb15e2acf49de13b25ee5ac28a7b1cacf3b5d..e1192f3970f1fe6dc5fa0668c13c709ad5289053 100644 (file)
--- a/pygost/gost341194.py
+++ b/pygost/gost341194.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/gost3412.py b/pygost/gost3412.py
index 7b4cc780253cf54e38123c811d1a5fa2762b8ee6..c6528da3f83460ef2da0edcee19a265b86a2fd8e 100644 (file)
--- a/pygost/gost3412.py
+++ b/pygost/gost3412.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/gost3413.py b/pygost/gost3413.py
index d26f69cc5e387b5230d2c259b3a692c931df3aa4..15f83061ffd1d598c2663df0677a911b97df1165 100644 (file)
--- a/pygost/gost3413.py
+++ b/pygost/gost3413.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/test_cms.py b/pygost/test_cms.py
index 68354bef2a5cede09201c0153f4fb06b87982deb..9359875800a7a3ab756234384e0361b2ffa94c9a 100644 (file)
--- a/pygost/test_cms.py
+++ b/pygost/test_cms.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/test_gost28147.py b/pygost/test_gost28147.py
index b79b6e44d2581ea575fc0a0201361167b8c01858..554343edbb249f0f7606d5dbdb9dda0a1cf36beb 100644 (file)
--- a/pygost/test_gost28147.py
+++ b/pygost/test_gost28147.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/test_gost28147_mac.py b/pygost/test_gost28147_mac.py
index 98fd85c0a859914674247586f8e878b6958512b7..1f016197cdb5f63fa54221c959c8e93ed63a00ab 100644 (file)
--- a/pygost/test_gost28147_mac.py
+++ b/pygost/test_gost28147_mac.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/test_gost3410.py b/pygost/test_gost3410.py
index 681902ce66546e1b9ef5a8ac50ff8a7e8c05e087..8404a355e1f2a6ab8d774d99ba2b1eec4d7c6e47 100644 (file)
--- a/pygost/test_gost3410.py
+++ b/pygost/test_gost3410.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/test_gost3410_vko.py b/pygost/test_gost3410_vko.py
index 01a3d3be7b76329bc078a2ce0aa3d9ff0be01690..290bde3397a448cd6d802519842ef9fea6ce982b 100644 (file)
--- a/pygost/test_gost3410_vko.py
+++ b/pygost/test_gost3410_vko.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/test_gost34112012.py b/pygost/test_gost34112012.py
index 78a638461ffaa58644d7d5c861aa1f58c7284513..6216f8ef234c4b537c0dbe3e2e80b7230a7a3405 100644 (file)
--- a/pygost/test_gost34112012.py
+++ b/pygost/test_gost34112012.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/test_gost341194.py b/pygost/test_gost341194.py
index 6b6fe4b22df3a69b09a841a8a477ef3d92ae76ae..16a0b779bee08244cc712e970522bfcebf3590d9 100644 (file)
--- a/pygost/test_gost341194.py
+++ b/pygost/test_gost341194.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/test_gost3412.py b/pygost/test_gost3412.py
index cbf28e8d220e13a92ee07917bea587a7e4ac2eae..f2a63a0a7a2da4569b81ec3b0ac81fcbc7f97aca 100644 (file)
--- a/pygost/test_gost3412.py
+++ b/pygost/test_gost3412.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/test_gost3413.py b/pygost/test_gost3413.py
index 5b2dd088f27a9cb2079437e934bce4610d2ba25b..78a9d748d99f953d6e39231d9e4206d1604d75c4 100644 (file)
--- a/pygost/test_gost3413.py
+++ b/pygost/test_gost3413.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/test_pfx.py b/pygost/test_pfx.py
index 831dd4734247ae8d19a07133854a456e614acc8f..106c66d258686ef2da93b505a985e48a541bfbaf 100644 (file)
--- a/pygost/test_pfx.py
+++ b/pygost/test_pfx.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/test_wrap.py b/pygost/test_wrap.py
index e419a8e3cebb1591e8108ab0ae4fabb634020ffa..78393e8914a4a16a58ec5fb7512074508bf38425 100644 (file)
--- a/pygost/test_wrap.py
+++ b/pygost/test_wrap.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/test_x509.py b/pygost/test_x509.py
index a2112ad44c8d5f4b19ebfab62f4560c8cc9be01f..8339935993d83cac11f01dfbfd22f92e449eb733 100644 (file)
--- a/pygost/test_x509.py
+++ b/pygost/test_x509.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/utils.py b/pygost/utils.py
index 3ed80e4b4f14ba75834279a17228a2c633ce8f80..8718792deee3278bfba36117c9ca8444b42c2a3c 100644 (file)
--- a/pygost/utils.py
+++ b/pygost/utils.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pygost/wrap.py b/pygost/wrap.py
index b0995eef2329c139ee7019273d5a9a3fd0eab7c9..b063fec48600f65a2f0e7bcd426587154c2cbb67 100644 (file)
--- a/pygost/wrap.py
+++ b/pygost/wrap.py
@@ -4,8 +4,7 @@
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/setup.py b/setup.py
index 0093ad01c6df98a8a8a971f1b00b6c8d61adef9c..798e8223364b71cb6486e3d50836c63788d153bf 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -10,11 +10,11 @@ setup(
     author="Sergey Matveev",
     author_email="stargrave@stargrave.org",
     url="http://pygost.cypherpunks.ru/",
-    license="GPLv3+",
+    license="GPLv3",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
-        "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Natural Language :: English",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 2",

diff --git a/www.texi b/www.texi
index 7f3c0f20d6820ddadc0d6cdfa3d7efb80deca809..468d5465011a896dc00abfd3a0ba1c59b0ac7db5 100644 (file)
--- a/www.texi
+++ b/www.texi
@@ -14,7 +14,7 @@ GOST is GOvernment STandard of Russian Federation (and Soviet Union).
 It is
 @url{https://www.gnu.org/philosophy/pragmatic.html, copylefted}
 @url{https://www.gnu.org/philosophy/free-sw.html, free software}:
-licenced under @url{https://www.gnu.org/licenses/gpl-3.0.html, GPLv3+}.
+licenced under @url{https://www.gnu.org/licenses/gpl-3.0.html, GPLv3}.
 You can read about GOST algorithms @url{http://gost.cypherpunks.ru/, more}.
 
 Currently supported algorithms are: