Merge branch 'release/3.0.2'

Author: isislovecruft

README

@@ -4,7 +4,7 @@
 pretty-bad-protocol (a.k.a. python-gnupg) |On PyPI|
 *******************************************************
 
-Complete rewrite of `Vinay Sajip's python-gnupg <https://code.google.com/p/python-gnupg/>`__,
+Complete rewrite of `Vinay Sajip's python-gnupg <https://bitbucket.org/vinay.sajip/python-gnupg>`__,
 including patches to fix a shell injection vulnerability due to unsanitised
 inputs being passed to ``subprocess.Popen([...], shell=True)``.
 
@@ -21,7 +21,7 @@ From `PyPI <https://pypi.python.org>`__
 
 It's simple. Just do::
 
-    [sudo] pip install pretty-bad-security
+    [sudo] pip install pretty-bad-protocol
 
 Additionally, the legacy way to install versions of this library <
 3.0.0 is::
@@ -47,9 +47,13 @@ Optionally, to build the Sphinx documentation_, do::
 To get started using python-gnupg's API, see the documentation_,
 and import the module like so::
 
+.. code-block:: python
+
     >>> from pretty_bad_protocol import gnupg
 
-The primary interface class you'll likely want to interact with is ``gnupg.GPG``::
+The primary interface class you'll likely want to interact with is ``gnupg.GPG``:
+
+.. code-block:: python
 
     >>> gpg = gnupg.GPG(binary='/usr/bin/gpg',
     ...     homedir='./keys',
@@ -72,7 +76,7 @@ The primary interface class you'll likely want to interact with is ``gnupg.GPG``
     >>> message = "The crow flies at midnight."
     >>> encrypted = str(gpg.encrypt(message, key.fingerprint))
     >>> decrypted = str(gpg.decrypt(encrypted))
-    >>> assert(decrypted == message)
+    >>> assert decrypted == message
 
 .. _documentation: https://pythonhosted.org/gnupg/
 

pretty_bad_protocol/_meta.py

@@ -32,6 +32,7 @@
 import locale
 import os
 import platform
+import re
 import shlex
 import subprocess
 import sys
@@ -53,6 +54,8 @@
 from ._parsers import _sanitise_list
 from ._util    import log
 
+_VERSION_RE = re.compile('^\d+\.\d+\.\d+$')
+
 
 class GPGMeta(type):
     """Metaclass for changing the :meth:GPG.__init__ initialiser.
@@ -521,8 +524,12 @@ def _check_sane_and_get_gpg_version(self):
                            "Are you sure you specified the corrent (and full) "
                            "path to the gpg binary?"))
 
-        version_line = str(result.data).partition(':version:')[2]
+        version_line = result.data.partition(b':version:')[2].decode()
+        if not version_line:
+            raise RuntimeError("Got invalid version line from gpg: %s\n" % result.data)
         self.binary_version = version_line.split('\n')[0]
+        if not _VERSION_RE.match(self.binary_version):
+            raise RuntimeError("Got invalid version line from gpg: %s\n" % self.binary_version)
         log.debug("Using GnuPG version %s" % self.binary_version)
 
     def _make_args(self, args, passphrase=False):
@@ -641,7 +648,15 @@ def _read_response(self, stream, result):
                        the ``handle_status()`` method of that class will be
                        called in order to parse the output of ``stream``.
         """
+        # All of the userland messages (i.e. not status-fd lines) we're not
+        # interested in passing to our logger
+        userland_messages_to_ignore = []
+
+        if self.ignore_homedir_permissions:
+            userland_messages_to_ignore.append('unsafe ownership on homedir')
+
         lines = []
+
         while True:
             line = stream.readline()
             if len(line) == 0:
@@ -657,15 +672,19 @@ def _read_response(self, stream, result):
                 line = _util._deprefix(line, 'gpg: ')
                 keyword, value = _util._separate_keyword(line)
 
-                # Log gpg's userland messages at our own levels:
-                if keyword.upper().startswith("WARNING"):
-                    log.warn("%s" % value)
-                elif keyword.upper().startswith("FATAL"):
-                    log.critical("%s" % value)
-                    # Handle the gpg2 error where a missing trustdb.gpg is,
-                    # for some stupid reason, considered fatal:
-                    if value.find("trustdb.gpg") and value.find("No such file"):
-                        result._handle_status('NEED_TRUSTDB', '')
+                # Silence warnings from gpg we're supposed to ignore
+                ignore = any(msg in value for msg in userland_messages_to_ignore)
+
+                if not ignore:
+                    # Log gpg's userland messages at our own levels:
+                    if keyword.upper().startswith("WARNING"):
+                        log.warn("%s" % value)
+                    elif keyword.upper().startswith("FATAL"):
+                        log.critical("%s" % value)
+                        # Handle the gpg2 error where a missing trustdb.gpg is,
+                        # for some stupid reason, considered fatal:
+                        if value.find("trustdb.gpg") and value.find("No such file"):
+                            result._handle_status('NEED_TRUSTDB', '')
             else:
                 if self.verbose:
                     log.info("%s" % line)
@@ -936,7 +955,7 @@ def _encrypt(self, data, recipients,
         >>> encrypted = str(gpg.encrypt(message, key.fingerprint))
         >>> assert encrypted != message
         >>> assert not encrypted.isspace()
-        >>> decrypted = str(gpg.decrypt(encrypted))
+        >>> decrypted = str(gpg.decrypt(encrypted, passphrase='foo'))
         >>> assert not decrypted.isspace()
         >>> decrypted
         'The crow flies at midnight.'

pretty_bad_protocol/_parsers.py

@@ -1091,7 +1091,7 @@ def _handle_status(self, key, value):
         elif key == "NODATA":
             self.status = nodata(value)
         elif key == "PROGRESS":
-            self.status = progress(value.split(" ", 1)[0])
+            self.status = progress(value.split(' ', 1)[0])
         else:
             raise ValueError("Unknown status message: %r" % key)
 
@@ -1343,13 +1343,14 @@ def _handle_status(self, key, value):
 
         :raises ValueError: if the status message is unknown.
         """
+        informational_keys = ["KEY_CONSIDERED"]
         if key in ("EXPORTED"):
             self.fingerprints.append(value)
         elif key == "EXPORT_RES":
             export_res = value.split()
             for x in self.counts.keys():
                 self.counts[x] += int(export_res.pop(0))
-        else:
+        elif key not in informational_keys:
             raise ValueError("Unknown status message: %r" % key)
 
     def summary(self):

pretty_bad_protocol/gnupg.py

@@ -70,8 +70,8 @@ def __init__(self, binary=None, homedir=None, verbose=False,
                            sufficient permissions.
 
         :param str homedir: Full pathname to directory containing the public
-                            and private keyrings. Default is whatever GnuPG
-                            defaults to.
+                            and private keyrings. Default is
+                            `~/.config/python-gnupg`.
 
         :type ignore_homedir_permissions: :obj:`bool`
         :param ignore_homedir_permissions: If true, bypass check that homedir
@@ -369,7 +369,7 @@ def recv_keys(self, *keyids, **kwargs):
         """Import keys from a keyserver.
 
         >>> gpg = gnupg.GPG(homedir="doctests")
-        >>> key = gpg.recv_keys('hkp://pgp.mit.edu', '3FF0DB166A7476EA')
+        >>> key = gpg.recv_keys('3FF0DB166A7476EA', keyserver='hkp://pgp.mit.edu')
         >>> assert key
 
         :param str keyids: Each ``keyids`` argument should be a string
@@ -629,6 +629,8 @@ def expire(self, keyid, expiration_time='1y', passphrase=None, expire_subkeys=Tr
         p.stdin.write(expiration_input)
 
         result = self._result_map['expire'](self)
+        p.stdin.write(expiration_input)
+
         self._collect_output(p, result, stdin=p.stdin)
         return result
 
@@ -1029,7 +1031,7 @@ def encrypt(self, data, *recipients, **kwargs):
         >>> encrypted = str(gpg.encrypt(message, key.fingerprint))
         >>> assert encrypted != message
         >>> assert not encrypted.isspace()
-        >>> decrypted = str(gpg.decrypt(encrypted))
+        >>> decrypted = str(gpg.decrypt(encrypted, passphrase='foo'))
         >>> assert not decrypted.isspace()
         >>> decrypted
         'The crow flies at midnight.'

pretty_bad_protocol/test/files/test_key_1.pub

@@ -1,31 +1,31 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
+Version: GnuPG v1
 
 mQENBFPcAbUBCADyAcv3Xb3A+j0ndtFNEw3fxfwcTnMBePTmLGmsz60y+DL8N0mb
 U2qpmglb2ONkFJJDa2fhl9XHwalmKCxynNE0kMNvTnTJFhFL3QSS8BPDUYKrCPfH
 NcuDtpAwEZJF6PnTy+8eNciT3Ru/NT1cw1K9YkTT5XqKvfgqhaSybHSMrPlx4rAE
 Is5oX0MwX3RdEtX+GzvGiz8s8+pPMX2Vh09pj6wsV+zBexXNvQnO0VzP2eteTEwV
 5ezgvmh6Ss3OMPJTKxc98jczRMVYtZlv05KdziKK0VWtshp2Xubt2VVRKSCOYk8r
 trR75b6yyDeFrGrvl22X2IUdttyb3XlMCJ+rABEBAAG0OXB5dGhvbi1nbnVwZyB0
-ZXN0IGtleSAjMSAoRE8gTk9UIFVTRSkgPHRlc3RAcHl0aG9uLWdudXBnPokBPgQT
-AQIAKAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlbazHQFCQxkzD8ACgkQ
-dMU6jvwynOPnswf+O23ssUsXdjEzDWo06m4w2tCxMRaP6gg3JSrHCxDtDBtwnoIz
-QL4rX+rA4ZGHz6QKsxg1pD+ze/dxKlyJ9p7qYvN1hln+JX0c72EsmXEbmHITW0qC
-sUJ+PpuIGO/kN0as++y/T9zmAeTYkrdBiy1ZAw/gNqHkEvnP24r7A4FSFPmo3RWD
-HCvlGPFEKU+BInmGTauhf2EkXa4NgMO9aucxj+q3kflFYwqEXYm+VeUg3qnBNpbx
-CihL2uufqLqI9crJ//FfQ6ICUw1s7PM1UR9RTHYbfWKgIlxlxKYl+VauK8+1nHwx
-GiYTrvN5XBitrEnqS45A6OlCEHvutaIhfBLhp7kBDQRT3AG1AQgAv40d8IxornLJ
-s15tOdWqhf5VQeJDgVYKBSQc/MZWiLE3L7d6GO1GwBDUblUIaU28MAC4/m5ioSSg
-Cq60J+lAi6Caan+VXxYpkNK++nTXRLj/HGGZL7dBxDdpkY0+PhGIwx7fDgO9eDn7
-wt+y1ky46QjXI89eD6Re+XvnQ04newCFTvXrNmOJhcjfNApQPZXQyJ57MIajcq0p
-LkcUBDzIkY5RgPznLVhN2Yps4kPHf4/r6wTjljo1vb8XJMdb7BGx9BkFxMnFnw/A
-PSciLTCDeBb+BxkiDVmUsvtJSAm3tJsfhXLB7bOzIRjL3WH8UtuF8nclAUmsPHdT
-Oew4I6Ve1QARAQABiQElBBgBAgAPBQJT3AG1AhsMBQkB4TOAAAoJEHTFOo78Mpzj
-dTYIANSpZj8aV6mxNfimC2tw7tKYLPcO0WrbnPtCdnRefhajdJX7R/iqcr+SBrq6
-ZY30vF9A+s8IfK3T8753KrDiyb5J3dhYMkpstqquMjM4vupM3DB9pX8S0UT6Rmqp
-Bbh4IhdrnpoJ5XxROsDG4KwHAgVI8WT8c1yj7Is31dJAA6Nvq/eOhDPjaI2pujD2
-7+4OCcEx4YzS/y84s8S9geZjMv2gtJE+MeMFzpzVAEoGQhhPDQQIlnenUXT0A2Ap
-S6KDKWh/mmaGRyzSNOmQZvnctjFXrVRFh12JJPh3qqi68a8HPGu8/D9tCp1EbklX
-OiFXr2E+pzFNE2UmGT5K+CMJmBQ=
-=IKK0
+ZXN0IGtleSAjMSAoRE8gTk9UIFVTRSkgPHRlc3RAcHl0aG9uLWdudXBnPokBOAQT
+AQIAIgIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAltY46EACgkQdMU6jvwy
+nOOwGQgA6szPLpeOcIpuW62S1x5zW+9//Nir0AMq+Vkx6p6OdqpcdcEHqAi0jLUY
+r40jTUmTjdQOxe7E4M1pwklrANuVee6wh6oJSSyane/oDhD5lsn4sfsfzY/BaHFw
+qMvEbHNVAXU9PcFDHv3UVUPXdjWlPc8SUVjpnlg6Tn3NS6vFH5XvZtoP9eLUwtEV
+tn+TW4qyu3KO04iiS4PdWEQX2l5FSNNA6qc5YPEqEF8Wm9pUA8UjGzn7J7bPe+Rq
+L+3PYp0k4VoMB6++9tjEj9FUHze/lAz72mMlq4YJpYm8noZAFdu7R1kQhy/KMWIN
+0xsNvOl+98bSnZrpXFFODcgcsCVEE7kBDQRT3AG1AQgAv40d8IxornLJs15tOdWq
+hf5VQeJDgVYKBSQc/MZWiLE3L7d6GO1GwBDUblUIaU28MAC4/m5ioSSgCq60J+lA
+i6Caan+VXxYpkNK++nTXRLj/HGGZL7dBxDdpkY0+PhGIwx7fDgO9eDn7wt+y1ky4
+6QjXI89eD6Re+XvnQ04newCFTvXrNmOJhcjfNApQPZXQyJ57MIajcq0pLkcUBDzI
+kY5RgPznLVhN2Yps4kPHf4/r6wTjljo1vb8XJMdb7BGx9BkFxMnFnw/APSciLTCD
+eBb+BxkiDVmUsvtJSAm3tJsfhXLB7bOzIRjL3WH8UtuF8nclAUmsPHdTOew4I6Ve
+1QARAQABiQEfBBgBAgAJAhsMBQJbWOOEAAoJEHTFOo78MpzjZPMIAMuUn9qsK7tK
+wuxoL/dBWps6dvzupm3sbld3hm5aK04LWOO0yNTT5Lmi77QKposycOxWKaJpoutR
+tkWhF5A0gw9tfle1kHFQBISGAns/B73NauXLEEnu0PLoIZCsnvDwm4yeN/Bm/DVv
+9f3wbNQCpAeO7QXasFa7W4sC5Sx3erD4CP5B4cXbujIjl1q4UA0jMWoJ95DPy22r
+LwMygHmXCXj8Ai4YFWupxbM8RePJsjdeCWF7lOpnIajE6Y+GBRbZzB7DObtxcBvM
+IAYWxvJ9wA8TPC2r/1Ap2PwZGHsG9ZPNbzECwQyWA5TjIVfZVyniuQGfKFdKtBNP
+Uh6hM2yznQg=
+=6++F
 -----END PGP PUBLIC KEY BLOCK-----

pretty_bad_protocol/test/files/test_key_1.sec

@@ -1,5 +1,5 @@
 -----BEGIN PGP PRIVATE KEY BLOCK-----
-Version: GnuPG v2
+Version: GnuPG v1
 
 lQOYBFPcAbUBCADyAcv3Xb3A+j0ndtFNEw3fxfwcTnMBePTmLGmsz60y+DL8N0mb
 U2qpmglb2ONkFJJDa2fhl9XHwalmKCxynNE0kMNvTnTJFhFL3QSS8BPDUYKrCPfH
@@ -21,38 +21,38 @@ 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
-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
-Cp1EbklXOiFXr2E+pzFNE2UmGT5K+CMJmBQ=
-=pZI3
+RSkgPHRlc3RAcHl0aG9uLWdudXBnPokBOAQTAQIAIgIbAwYLCQgHAwIGFQgCCQoL
+BBYCAwECHgECF4AFAltY46EACgkQdMU6jvwynOOwGQgA6szPLpeOcIpuW62S1x5z
+W+9//Nir0AMq+Vkx6p6OdqpcdcEHqAi0jLUYr40jTUmTjdQOxe7E4M1pwklrANuV
+ee6wh6oJSSyane/oDhD5lsn4sfsfzY/BaHFwqMvEbHNVAXU9PcFDHv3UVUPXdjWl
+Pc8SUVjpnlg6Tn3NS6vFH5XvZtoP9eLUwtEVtn+TW4qyu3KO04iiS4PdWEQX2l5F
+SNNA6qc5YPEqEF8Wm9pUA8UjGzn7J7bPe+RqL+3PYp0k4VoMB6++9tjEj9FUHze/
+lAz72mMlq4YJpYm8noZAFdu7R1kQhy/KMWIN0xsNvOl+98bSnZrpXFFODcgcsCVE
+E50DmART3AG1AQgAv40d8IxornLJs15tOdWqhf5VQeJDgVYKBSQc/MZWiLE3L7d6
+GO1GwBDUblUIaU28MAC4/m5ioSSgCq60J+lAi6Caan+VXxYpkNK++nTXRLj/HGGZ
+L7dBxDdpkY0+PhGIwx7fDgO9eDn7wt+y1ky46QjXI89eD6Re+XvnQ04newCFTvXr
+NmOJhcjfNApQPZXQyJ57MIajcq0pLkcUBDzIkY5RgPznLVhN2Yps4kPHf4/r6wTj
+ljo1vb8XJMdb7BGx9BkFxMnFnw/APSciLTCDeBb+BxkiDVmUsvtJSAm3tJsfhXLB
+7bOzIRjL3WH8UtuF8nclAUmsPHdTOew4I6Ve1QARAQABAAf9GLyxKqD/XdP+H1do
+9KiWwoIjYYRGYnwJhDtzMOOuRi3YqiVgM7rkwaYKwQrjMLI0xOA7A8SeoR/ZOTfx
+lRvm1YFSn8FFOYfjq0vEFRUkvb/EVlZ2UXaxnBTp4b2jVaGvDz+735P1EoMuc66u
+6kTzNkkJe5rqk0uPZlmtdoAv0g735/vc8IwtobO8DQ0eSl/upSw0Ulgh7KZ+ztaA
+VOgqAaHVs73iq2iZlzsPyy4BWASlGOrJrSxaaT+s4R0s8i/AlCq0MSjytOk4EdYq
+8O1X8U8YIAxb+mAXc29E2GkICVllmBM5K7ajo/OlRvdkf9qND37+qJ714Gou8uei
+0HV2sQQAwKeBTG97ZpoGZanxYO27MrzuAIE5hGH7+SR6z1UcFgPFhZ5j/zyZPVMV
+/FWbxR0YoRAp5IbXQFGpuvgLLVsS/fAUWHWr9GZfDKjLOXn2wPXqbxQcSMJSCeaG
+ICLn3Ref5Ox0EN/DNUJY3XRflvLXWignBdf6aefGm2WmXFfQORkEAP6IwuNV8Z0U
+R8C7xhtSgk8gbbkdPL/SgXF0H6+U5zrTPMz8o0S7H9tPTxksER5ohA2pilLFde+7
+ioUfBCOTWSaBS4VfDXzVyHYlJZN1rawbB2Lb7KaD9+TzXU1Ur2I/K6/p3gBw5mS3
+bzV1UKHc2KmeXJQ7Hy5D7m1bapKMh/8dBACpb/qsyELNu4imgQbOSTeKOicBzVFI
+lWSOXPnOYFSfaHEqb2CI5l1/tUmuh5ip/vP8s0CRvJ+xK5LyTeWJU9NF2gbYQuM+
+nFodR2qOdj5yDXGwhDDgaQah/rhxPxrRStUc2NZSfhgSuj3+CftcsE6/QE1EbCLD
+DZyAjBnOdMWC90FNiQEfBBgBAgAJAhsMBQJbWOOEAAoJEHTFOo78MpzjZPMIAMuU
+n9qsK7tKwuxoL/dBWps6dvzupm3sbld3hm5aK04LWOO0yNTT5Lmi77QKposycOxW
+KaJpoutRtkWhF5A0gw9tfle1kHFQBISGAns/B73NauXLEEnu0PLoIZCsnvDwm4ye
+N/Bm/DVv9f3wbNQCpAeO7QXasFa7W4sC5Sx3erD4CP5B4cXbujIjl1q4UA0jMWoJ
+95DPy22rLwMygHmXCXj8Ai4YFWupxbM8RePJsjdeCWF7lOpnIajE6Y+GBRbZzB7D
+ObtxcBvMIAYWxvJ9wA8TPC2r/1Ap2PwZGHsG9ZPNbzECwQyWA5TjIVfZVyniuQGf
+KFdKtBNPUh6hM2yznQg=
+=w7N6
 -----END PGP PRIVATE KEY BLOCK-----

pretty_bad_protocol/test/files/test_key_2.pub

@@ -1,31 +1,31 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
+Version: GnuPG v1
 
 mQENBFPcAfMBCADbXmLUb4kYJO1DfKLwmPZ7AFHTqYCFABr2QwMP59llR7VyPU8W
 7v9pER/D+IGOQ9Hw/vx9YEcb7qvN5kDBAEwUyU0KjJXrIpsPooAj3YcMHGRwiITV
 o40+1ZojGOEAb4+Nos8whYFMT0IOlfaRtUkoUwiQ/HdNFxbo8YUnHrLK44fAG4qn
 B/Nw5lAUy7HfxCQ5JmV/Qsv8A7sBqD0Pijf/6LAGGlo1EVLpaec6mnjZlUoR5a7Y
 a3WCrvN2js4esn7hj8hGX17qgbHLI5ktFbkyw8IhjiSlF5SZRuM3dukcGp+O1cDC
 kAcEOZiAfoGRWL2Uy/vwW+TmtXNG0COPf4Q9ABEBAAG0OnB5dGhvbi1nbnVwZyB0
-ZXN0IGtleSAjMiAoRE8gTk9UIFVTRSkgPHRlc3QyQHB5dGhvbi1nbnVwZz6JAT4E
-EwECACgCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheABQJW2syHBQkMZMwUAAoJ
-EC/3/4irrDSi2RQH+wau1P2QYB42J/vJe8wachmTvXKpCNwGJVWAnj3XU2sgP1A/
-pcFo6oBJxfGx+g9jpahHZUHS4am9rkxPou6/H0rliQgBKl/mvJjKv3DHuWZsHlh7
-uHnhaoMqk84hxoOK6XNRKJ5HMl6RqyvNJmNx3cFDMMjQn7b6jzk5TYx9pkxAdwap
-x5FxnxZIzf/05Ifey6KCP747DmqfA5xsNNLHDnDh6pp5fVEthJwMK+m+D25M4IPW
-ER31mv7mT32bR4oG8EOrvTydE+QS0cXETXvWQL7xgeawPDbUkvubGKBvvrob3mf4
-JYp1lXUN5bQ2J9UZuBvfwsBUd6II8f2wh4tOFNi5AQ0EU9wB8wEIAMAUN6oVuvfT
-Koci7BrKlSRpZYeLkxxS7b7gQUkPu665rIREyT6AfBrk1NK/ILho6JmF1TjOZLuG
-rOXrFT+SCSqPoMUUVpp5f9Xn55W9MTJje9u8skbdxYZm6l/pKlQJbrhKacFdrbqU
-w/zHC2BIlP4Ve1aGoJGW5CRHYSvH6fZLMvJbNb0Yy75oXdBHQ4aawD6IL0Z++oXc
-VvQOKhkRqvnbbzFRDgQRjng9+FjCbfXZgzdUWq1japl1U7sn95n+I4dLO9WESqOQ
-o9Prpxk2C4jHzFThRy4W83xm8sfLv2GHfCeqD9p0diQarIeuOMJZ/cDjj1a5j0q2
-LfIwyFZNyR8AEQEAAYkBJQQYAQIADwUCU9wB8wIbDAUJAeEzgAAKCRAv9/+Iq6w0
-ovftCACsGvKitzjyHamFts5qccBgd5a/sssLea9BqP4zPQuubO+brM3dqunCpGbh
-msWfPF7iDGfXJH8TC6QhMi0UDzFd5EsF4PozMV0KjkgzIFFYh8DB+HxdNsx03YoZ
-7qxC5LW+kWzLzZ1492CqxjrPNucxEkTd7PQ15I6LZteffBceQsamK1IGaV5qPo82
-DVotfrX4ziYGcPF3yXKPKQLi1D1M9eEObNbdVz8J4tbYEDzZ3S+eqhSiqpSX6cIF
-2I+A3+1uOz0bvCMgEnXk4aa62xF1GYHJ4QJ5P+sRUnThBXzktN9suJdsevHOuHuu
-Xl8+ntjPe8a7wEqullJG2p+dnIm8
-=KyUg
+ZXN0IGtleSAjMiAoRE8gTk9UIFVTRSkgPHRlc3QyQHB5dGhvbi1nbnVwZz6JATgE
+EwECACICGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheABQJbWOT4AAoJEC/3/4ir
+rDSiAkMH/jWCh+wM9XRpGi+KtAH/74XXSjmHrLtpc7jjKb4rmRoAh40QerHocU8S
+tQouOrlfn/QcvnzPBIBACMqcEDnA4Jnuew+KMDQ2Kh72dDF6SclFZ3T3/MTVzEx4
+LAWuJgJrSD8MLdq3nziEmZ7mguzfERT0jvLQPYvxJSD+RrvJJXDY6TbtN9HueKWi
+f8MvG+QbYkFh9nYrNcdQV027B+sh/Ozb6vzQslrTzFVkxcDhxV2L88bDblV6rZhK
+M7hBtPGTcLpLdImvi0iotnxHnTh4p3edFDGv8GN5O+bRDBTA9w1EIaKQO8YPJb6m
+lU3kah/WW3++Bz52dORMmKwbgYg3pwi5AQ0EU9wB8wEIAMAUN6oVuvfTKoci7BrK
+lSRpZYeLkxxS7b7gQUkPu665rIREyT6AfBrk1NK/ILho6JmF1TjOZLuGrOXrFT+S
+CSqPoMUUVpp5f9Xn55W9MTJje9u8skbdxYZm6l/pKlQJbrhKacFdrbqUw/zHC2BI
+lP4Ve1aGoJGW5CRHYSvH6fZLMvJbNb0Yy75oXdBHQ4aawD6IL0Z++oXcVvQOKhkR
+qvnbbzFRDgQRjng9+FjCbfXZgzdUWq1japl1U7sn95n+I4dLO9WESqOQo9Prpxk2
+C4jHzFThRy4W83xm8sfLv2GHfCeqD9p0diQarIeuOMJZ/cDjj1a5j0q2LfIwyFZN
+yR8AEQEAAYkBHwQYAQIACQIbDAUCW1jlBgAKCRAv9/+Iq6w0otHvB/9N9d+CGDX2
+y9DfRK+3z/mCdGFqaOeoi6K4D6uHd0hfiQjMD/EjrB+BvUcM9Aommydvi7lk9WGQ
+EQUYwZBGIdddj4jFzc/7m/27pQb2zwpxD90riybNQpcCC6EEzKXxEskYcm457ZOd
+za743hdQXC9W4TjIKA/evfxn87UfZBW4wduh5Vznhu3JkGKOQy5iWea7jR6SzZ/y
+gn0mqLzF3BNyfvSpVf/f1KNSZbCah+T/Geuj6qDuiKDCbjR05XyiZMWxfMEzfBCf
+EzgXCgUHH3jUgKXRTP/AOM3R+tn6/cKBqnkvWqFRbyaJ4eHaqG9+njgbIK9gXXBI
+bZXs8K4e1EgF
+=tUCn
 -----END PGP PUBLIC KEY BLOCK-----