Remove the version string from generated keys, encrypted files, and sigs.
parent
ce323251ed
commit
04a79a2802
|
@ -207,7 +207,7 @@ class GPG(object):
|
|||
:func:parsers._sanitise. The ``passphrase`` argument needs to be True
|
||||
if a passphrase will be sent to GPG, else False.
|
||||
"""
|
||||
cmd = [self.gpgbinary, '--status-fd 2 --no-tty']
|
||||
cmd = [self.gpgbinary, '--status-fd 2 --no-tty --no-emit-version']
|
||||
if self.gpghome:
|
||||
cmd.append('--homedir "%s"' % self.gpghome)
|
||||
if self.pubring:
|
||||
|
|
|
@ -287,7 +287,7 @@ def _is_allowed(input):
|
|||
'--import',
|
||||
'--export', '--export-secret-keys', '--export-secret-subkeys',
|
||||
'--verify',
|
||||
'--version', '--output',
|
||||
'--version', '--no-emit-version', '--output',
|
||||
'--status-fd', '--no-tty', '--passphrase-fd',
|
||||
'--homedir', '--no-default-keyring', '--default-key',
|
||||
'--keyring', '--secret-keyring', '--primary-keyring',
|
||||
|
|
|
@ -49,7 +49,6 @@ def _make_tempfile(*args, **kwargs):
|
|||
|
||||
|
||||
KEYS_TO_IMPORT = """-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1.4.9 (MingW32)
|
||||
|
||||
mQGiBEiH4QERBACm48JJsg2XGzWfL7f/fjp3wtrY+JIz6P07s7smr35kve+wl605
|
||||
nqHtgjnIVpUVsbI9+xhIAPIkFIR6ZcQ7gRDhoT0bWKGkfdQ7YzXedVRPlQLdbpmR
|
||||
|
@ -213,7 +212,7 @@ class GPGTestCase(unittest.TestCase):
|
|||
self.gpg.keyring = self.secring
|
||||
cmd = self.gpg._make_args(None, False)
|
||||
expected = ['/usr/bin/gpg',
|
||||
'--status-fd 2 --no-tty',
|
||||
'--status-fd 2 --no-tty --no-emit-version',
|
||||
'--homedir "%s"' % HOME_DIR,
|
||||
'--no-default-keyring --keyring %s' % self.pubring,
|
||||
'--secret-keyring %s' % self.secring]
|
||||
|
|
Loading…
Reference in New Issue