Add ASCII format of PGP keys, remove SHA-1 from release signing key

media/pgp/11E9DE8848F2B65222AA75B8D1820DB22A11534E.asc

@@ -0,0 +1,51 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+qbO3wgTCCdnoticOvw==
+=xmBr
+-----END PGP PUBLIC KEY BLOCK-----

media/pgp/A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8.asc

@@ -0,0 +1,78 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFCCu4cBEADNDLretQkViqptiL275IKrc+VaGvUAIfFZoNTZHYrBAGCFNU++
+bXMqVxXM6QFhyXDbVSTAbl0gdmMPEQzi3ErtatyMsH3PDhU6mxLjwc61/P2JWNVf
+4JGgEaqM/Gb0KEFnOWHGH1IDGMAxCL/duch8D3XrODOxqxCVLn/yFpjCANr9sXfh
+V+K05KIvTE3ar8SZjVDH3APmdFYv2KSs01aoR+Zj0MIdJKgBIPUKod8VodH03RTu
+ob4I1jocMad56hsMJk3NE179xxDA+DN7muIzv2yY+bw2EId+PhmvArKWgwFOvhmU
+TTYNA5UOzC9jvzxVI/4g1ERImXXGdYBX9SllY5hqkk36EFchVAOmLz39zSTUQfIT
+S9ugMiH3VudjSinNsn/R5iRvbuO1kHDGL583DT9qDadkXBxoFBgafgoEwiLLPuyH
+BLdaZ51fmgvfupt0tP9F0Tcy4xCjz+Fesi3RtXlLJv351KIIbJsy8hNh1tSe/32t
+dN4KoaULR2fGu+7NHeZBRk0r7+OjtRaXZWyaYfx4XAKqqdxcDcgYS8vb111JpkFN
+/zf2HZtIA7IMUGQrf23O3xUun6voQb14qEMtWS49DxXmBc5g2KITtkpoVBSzHNVO
+6aUzpgjeV8bRGTobpVvilz6Af34/gYIsvo0JQ14xB/F7cyaA1e4d6BtzSwARAQAB
+tC1XZWVDaGF0IChzaWduaW5nIGtleSkgPHdlYm1hc3RlckB3ZWVjaGF0Lm9yZz6J
+AjgEEwECACIFAlCCu4cCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPgv
+SxbexAj4JAoP+gMurI1HgmWK7pqO+/Hn5SAMKvHYwtHTpGqdDfponnTW3JgWUm2X
+fgvHk5ZAew6a6hbLE73v8LSbepbCM6mzdtqO4FPXV8t+x/qLu3zbi9Q6Fd+bP+2G
+ZDfRyZdk1UaeW2wOhwcvP8+kQxBB8gK7kgaD7rWG4CbU1jTQjdpBsibT/iXhszaC
+kIe0ExaUYS7B58IbumjH+B3tcwhOW0SKImY5H4DKYAgWQ5/oSOwGf3fp3K2xT05c
+MBiywTBBlXmtSY77yA0YxTYi/vIkPOuqKhMwc9Si5Ak4U2NvInGa3WOQoXH5OWYr
+Ipe4nzpFMcBt0tMDbErkQsQFVsZE9YrOdoAHvMqn3Dxo99N3vX+CxmziWpzF2V6c
+RyqFEFc0IYxABLpKNTgL9WUy+dwMsvuGR6/sob9hE5drJ8YeDEWLGZuVMys4vTvE
+ctP+cedxgz2ZTyvWPCaR7k7L5yOvBTIwvYG6pu7utpxVnIpVRDs3hXl3VPNbu4SC
+0JpAC0fB77VlOCbI205GTbcFxh82qiyJSZRmZF+tXOlBna7Jq/Fmtdyfh6COi5Tw
+EVKzdXc+uBNxmrgkf1AIWaKXP5IdvHs75c+/WW93bjTC2QmUtv3NZG4HPo2NX6G+
+QMkMJOO+vnAQzYo/2BM6s2zCnR8oFKPt3t9ktz992D3PDkYwClKsz+8BiQKSBBMB
+CACGBYJnjQLkBAsJCAcJEPgvSxbexAj4RxQAAAAAAB4AIHNhbHRAbm90YXRpb25z
+LnNlcXVvaWEtcGdwLm9yZ8xkN7XPz0+IfHm0Vum9h4TaIeM5VKVG06TgCaw2tYoP
+AxUICgQWAgMBAheAAhsDAh4BFiEEqatat3j6XDUi/QN4+C9LFt7ECPgAAOXLD/9o
+fLszU9MZD+r2JTwcBy+IpQXQ46oR6fl8ONQ6lNPie2M6XTVBscwD0dFK4/iowmpH
+8PG+RYYIk+a9yiGvk84kSo8FsnY6Ae3L2Z7SZO5neQ+qyNf3b8ikDja3kQL+TkUu
+19XFbAiucNrL5lZkcKryaAa8HdZ19EGudjBsrW+FJ/0g05AoslYNlSP2WUU5wOoC
+8qyAw6fbAyyeowf6BfXLPRxI3o1/6uIGFbxmoqR6vXh4s3x9pHDSx98imRuHpG/3
+APhNx2skU5h6prkb9BXsU6kAMfma+jbUvjlDNgvshsumIOj99oPZoFCchM6YnGFr
+Lka6TxtdOaS6+K2ZetHMcCp8PjufijgI3WM61+6/6lb4jMNKjhHPmze9uHjkPYOr
+VkL9FbeK+cA8UHy3UWNPs0CmtUcm+nlzrmFJQznjpPcZBoRk+KkvQYyaFTXcSkrb
+hB4T8oy/Gwn8bwwV68R+76o2RfMWZmCXwz+rYxdYhyWFeFMfDSdZrzSlJqJDsrYG
+lQwmX0VjJoRdER89cKvl6wiCRvS3ibp+snHq/6h530winszZcTIvv389IFDZWbPH
+yGFNnvGk8NZrPt5WIkQzojBw5QHisnV2bbAVdl68pTUHZf+uI0YpYH1PQeokxCUJ
+L1L3qNNVIEcCQUjc/pcCcvpkANtnkUJI8l0LZh/iE7kCDQRQgruHARAA1mEnU+rl
+m5WeE/5Ijo8HZJXCLjQiYSCOG1zZci45tsU9gHrHMEM9TFRjvlFSF5OmCmME9yPg
+kcf1LrU0w/LNN8hNy3ObHM7Xaf0taRF9Wob1SN3pY9Pg6UL5qEAeWji+eeS7JBQ6
+PHVB54P6teyB6Jx7hpyCubnyw/wjL0syDpi/+TwSsiN02dtTeac/uD8xtMEjE0kH
+LYkhKXHHn7l8qgQ32sSVbrhN8v/AGctoW6ehB4yZBohxPPcl8a6SZD1L/YvA+zPf
+LqBEaJ+pmu8Wv2B4d0ETkhvqF/ALhMZoW0q/WZIE233HoUKGRKQIE6rMQYT4qwZz
+q9ZQwHR7+2Y69qjxtrnswKNZpAu6uqkKnwyUB2E0zgQ7Ip/0yaSpmtmS72O++aLQ
+EtJ8McL0AAOC1rSZ7ZTGQGT3oK1X63t7czOVfTEnhjBNaBb+i/TK5aUyW8ptZDmu
+GoFfntfwAxAzxxEbp8nO9+T609aE2Gx+cEKU1z0XYFCBSv//vun2cu4TvSVv8XcD
+03+BUTi+E9bQoP4VvzAu/v60kGedFHH+IYEdUFY7nTDDw1aqhwvvRChNf6SFZ+hT
+RjdGHz5d/zXldHWjHHjmYdfh3QXwHD1rjlDiKVJALe4ADu4aCBFTGlRTs3U07nxc
+6IVdL6JarAMgRyA++4f5o0U4AnMpzWa8s7EAEQEAAYkCHwQYAQIACQUCUIK7hwIb
+DAAKCRD4L0sW3sQI+NlmEACKucymLKaQMtQ3li/JbZjmxI0rP49OxK+tigW94828
+xm40Mm3J3m9vSO5J5roD1aP0BJ1M8DkB0W8zGeN6ZHEojzZoQPDTIG5Xa5s4Vgv+
+bnhcAuM1wRBYQLlcAsl+gJV6xsq8TO9rm7gk84lYygeC7SBXwBLCkVBdq9eFN5nC
+bkpv/q7yQRHTnNHHER0M55AEXPeOSjgA/xWNXFxz+BaO0n0/MCghkBp+OOS6Ke6x
+yoa4WfunnpzyAHKFVBCtWnn+e1SLXEpk9yADG65DGWgl/DBEFhjHQbf4Dnz5pJph
+sBLxapMgaHqx2JoGgeEjhcI1oK4DAYrooVBmWX3Sb4hfjQevO+u/4pL6LfwAkjs7
+AdgbJTYeoxj8DlHUROG/wdQrQ5u1JG/sNUW7pkArTtTOuJofcGz6fG5470uTltRN
+IBKmRaFzST2FFd+SLm1nji9viz5bSROafZ807b8lxtmiYZZ1uUqTe2/zg9MErtEk
+8XW5lEydVhc+z/B4Zk9XeXEUvEP+SI8FiUQMqMmPwgRGI8/hbHhRdo78VnHiR7E6
+OyoSi1QHAebQKgHW6ZGxBeuRQ87BUM+UJfgt04kGjR0ax8q1JYPzaq2Zj4jU746d
+zIeco+XvJpDkf/emLh4xe9mFp8m1QrefqJRa6/b9PrgiVNevDm2ZQjli1wSzqitG
+dIkCfgQYAQgAcgWCZ40C5AkQ+C9LFt7ECPhHFAAAAAAAHgAgc2FsdEBub3RhdGlv
+bnMuc2VxdW9pYS1wZ3Aub3Jn/0GXYOaVpJxCtXEjdb+uZFclabOh+/xJDYE45nAs
+c9MCGwwWIQSpq1q3ePpcNSL9A3j4L0sW3sQI+AAANsUQALGKxCo7EFPdTUVubtxB
+hrnVGFRHQF7zZe1lZg4lHv7crdNT2xcXqZSrREPO4+Mb1kZx0JfydAIrpmtNt4sI
+/4Vy67t0EsubuYZYHtdxIdytNBoRIox5fNB4bNlWAxgBU2mXakLcgUX+kUA2UxsL
+32mHcqirgmusVEM2Bz2Zk+oJoHg4O95q1pEtWeMtgP/c1z8HDwpsJhWanGzHyki4
+zpO1gzClGezmyKie+X2KgifNYD0hBTFMwGTpsaLHpZ2Y6Hp1Oba9Pf6U8O7eFxBc
+TGi1y7EtLK1O9i44/hNet4kuvert8wHqsRdNntDswaLACnOj0xiD8tjYhjOSL4vC
+1v0wkhJ2VgZ3LEFRV/F+lok75t9haDMW/PGNFIKLlrDimlt+qqIjJMCXg9oDci+5
+y6YvrHRzibNaBR7AOzN7VF10SJPWRDnZj9hQm32BaSSKLWC4QxlmL/yZmBOFdPG6
+ZX5lc1w+9JjIrAFBwnd5r7+aAhbIZ92IMDLkd87kLD5oujlcFnDC3VmgqVOIWm1Y
+1Knc0r2jfVbsX0xTAEn5WTZSAgPMwdr01//CKbwQB/WhICJynO4RI0XbaQgYjJ8u
+H5/Q953qo6keD/PBjqJI82CH8j/dm2bgNJxyDsiflXkkKD3VT+IEydptf5k+280I
+VAs2O8VIZ3kuhhCpM5z0Dskv
+=whBR
+-----END PGP PUBLIC KEY BLOCK-----

weechat/dev/views.py

@@ -79,7 +79,13 @@
     ),
     (
         'release_signing_key',
-        gettext_lazy('Release signing key (format: PGP public key).'),
+        gettext_lazy('Release signing key '
+                     '(format: PGP public key as binary file).'),
+    ),
+    (
+        'release_signing_key_asc',
+        gettext_lazy('Release signing key '
+                     '(format: PGP public key as ASCII file).'),
     ),
     (
         'debian_repository_signing_fingerprint',
@@ -89,7 +95,12 @@
     (
         'debian_repository_signing_key',
         gettext_lazy('Debian/Ubuntu repository signing key '
-                     '(format: PGP public key).'),
+                     '(format: PGP public key as binary file).'),
+    ),
+    (
+        'debian_repository_signing_key_asc',
+        gettext_lazy('Debian/Ubuntu repository signing key '
+                     '(format: PGP public key as ASCII file).'),
     ),
     (
         'all',
@@ -98,7 +109,15 @@
     ),
 )
 
-BINARY_INFO_KEYS = ('release_signing_key', 'debian_repository_signing_key')
+INFO_PGP_KEYS_BIN = (
+    'release_signing_key',
+    'debian_repository_signing_key',
+)
+INFO_PGP_KEYS_ASC = (
+    'release_signing_key_asc',
+    'debian_repository_signing_key_asc',
+)
+INFO_PGP_KEYS = INFO_PGP_KEYS_BIN + INFO_PGP_KEYS_ASC
 
 PGP_KEYS = {
     'release_signing': 'A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8',
@@ -248,17 +267,25 @@ def get_info(name, version):
     if name == 'debian_repository_signing_fingerprint':
         return PGP_KEYS['debian_repository_signing']
     if name == 'release_signing_key':
-        fingerprint = PGP_KEYS['release_signing']
-        with open(media_path_join('pgp', fingerprint), 'rb') as _file:
+        filename = PGP_KEYS['release_signing']
+        with open(media_path_join('pgp', filename), 'rb') as _file:
+            return _file.read()
+    if name == 'release_signing_key_asc':
+        filename = PGP_KEYS['release_signing'] + '.asc'
+        with open(media_path_join('pgp', filename), 'r', encoding='utf-8') as _file:
             return _file.read()
     if name == 'debian_repository_signing_key':
-        fingerprint = PGP_KEYS['debian_repository_signing']
-        with open(media_path_join('pgp', fingerprint), 'rb') as _file:
+        filename = PGP_KEYS['debian_repository_signing']
+        with open(media_path_join('pgp', filename), 'rb') as _file:
+            return _file.read()
+    if name == 'debian_repository_signing_key_asc':
+        filename = PGP_KEYS['debian_repository_signing'] + '.asc'
+        with open(media_path_join('pgp', filename), 'r', encoding='utf-8') as _file:
             return _file.read()
     if name == 'all':
         infos = []
         for key in INFO_KEYS:
-            if key[0] != name and key[0] not in BINARY_INFO_KEYS:
+            if key[0] != name and key[0] not in INFO_PGP_KEYS:
                 infos.append(f'{key[0]}:{get_info(key[0], version)}')
         return '\n'.join(infos)
     return ''
@@ -283,11 +310,17 @@ def info(request, name=None):
             },
         )
     if name:
-        if name in BINARY_INFO_KEYS:
+        if name in INFO_PGP_KEYS_BIN:
             response = HttpResponse(get_info(name, version),
                                     content_type='application/octet-stream')
-            response['Content-Disposition'] = (
-                f'attachment; filename="weechat_{name}.pgp"')
+            filename = f'weechat_{name}.pgp'
+            response['Content-Disposition'] = f'attachment; filename="{filename}"'
+            return response
+        if name in INFO_PGP_KEYS_ASC:
+            response = HttpResponse(get_info(name, version),
+                                    content_type='text/plain')
+            filename = f'weechat_{name.replace("_asc", "")}.pgp.asc'
+            response['Content-Disposition'] = f'attachment; filename="{filename}"'
             return response
         return render(
             request,
@@ -299,8 +332,8 @@ def info(request, name=None):
         )
     infos = []
     for oneinfo in INFO_KEYS:
-        if oneinfo[0] in BINARY_INFO_KEYS:
-            value = gettext('(binary data)')
+        if oneinfo[0] in INFO_PGP_KEYS:
+            value = gettext('(file)')
         else:
             value = get_info(oneinfo[0], version)
         if oneinfo[0].endswith('_number'):