February 2015 - tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 24 Feb '15

24 Feb '15

commit f4a72222beb324c596476f07a9ddb147be829136 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 24 07:15:04 2015 +0000 Update translations for gettor --- sq/gettor.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sq/gettor.po b/sq/gettor.po index 00d048a..46f7d58 100644 --- a/sq/gettor.po +++ b/sq/gettor.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2015-02-24 06:41+0000\n" +"PO-Revision-Date: 2015-02-24 06:56+0000\n" "Last-Translator: Bujar Tafili\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/torproject/language/sq/)\n" "MIME-Version: 1.0\n" @@ -163,44 +163,44 @@ msgstr "Pasi t'i keni marrë të gjitha pjesët, ju duhet t'i rimblidhni ato tek #: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk." -msgstr "1.) Ruajini të gjitha bashkëngjitjet e marra në një folder në diskun tuaj." +msgstr "1.) Ruajini të gjitha bashkëngjitjet e marra në një dosje në diskun tuaj." #: lib/gettor/i18n.py:115 msgid "" "2.) Unzip all files ending in \".z\". If you saved all attachments to\n" "a fresh folder before, simply unzip all files in that folder. If you don't\n" "know how to unzip the .z files, please see the UNPACKING THE FILES section." -msgstr "" +msgstr "2.) Çngjishini të gjithë skedarët që përfundojnë me\".z\". Nëse ju i keni ruajtur më parë të gjitha bashkëngjitjet tek\nnjë dosje e re, thjesht çngjishini të gjithë skedarët në atë dosje. Nëse ju nuk\n dini sesi t'i çngjishni skedarët \".z\", ju lutemi shihni seksionin SHPAKETIMI I SKEDARËVE." #: lib/gettor/i18n.py:119 msgid "" "3.) Verify all files as described in the mail you received with \n" "each package. (gpg --verify)" -msgstr "" +msgstr "3.) Verifikojini të gjithë skedarët, siç përshkruhet në e-postën që morët me \nsecilën paketë. (gpg --verifikoni)" #: lib/gettor/i18n.py:122 msgid "" "4.) Now unpack the multi-volume archive into one file by double-\n" "clicking the file ending in \"..split.part01.exe\". This should start the \n" "process automatically." -msgstr "" +msgstr "4.) Tani shpaketoni arkivin shumëvëllimësh në një skedar, përmes klikimit\ntë dyfishtë të skedarit që përfundon me \"..split.part01.exe\". Kjo duhet ta nisë \nprocesin automatikisht." #: lib/gettor/i18n.py:126 msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "" +msgstr "5.) Pasi shpaketimi të ketë përfunduar, ju do të gjeni një \nskedar\".exe\" të sapoformuar në dosjen ku do të vendoset. Thjesht klikojeni dy herë\natë dhe Paketa e Tor Browser do të nisë brenda pak sekondash." #: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "" +msgstr "6.) Kaq ishte. E kryet. Ju falënderojmë që përdorni Tor dhe u kënaqshi!" #: lib/gettor/i18n.py:132 msgid "" "SUPPORT\n" "=======" -msgstr "" +msgstr "MBËSHTETJA\n=======" #: lib/gettor/i18n.py:138 msgid ""

1 0

[bridgedb/develop] Update multiple integration tests to point to the new .gnupg directory.
by isis＠torproject.org 24 Feb '15

24 Feb '15

commit 2a39538e267fb43a9f96a1410b1e4e979fe65eb1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 10:21:51 2015 +0000 Update multiple integration tests to point to the new .gnupg directory. * UPDATE test_Main.py, test_email_autoresponder.py, and email_helpers.py to use the new .gnupg/ directory (rather than gnupghome/). * ADD new GnuPG options to b.test.email_helpers._createConfig(). --- lib/bridgedb/test/email_helpers.py | 15 ++++++++++++--- lib/bridgedb/test/test_Main.py | 5 ++++- lib/bridgedb/test/test_email_autoresponder.py | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/test/email_helpers.py b/lib/bridgedb/test/email_helpers.py index 867ff58..5e4262d 100644 --- a/lib/bridgedb/test/email_helpers.py +++ b/lib/bridgedb/test/email_helpers.py @@ -26,7 +26,10 @@ from bridgedb.test.test_HTTPServer import DummyBridge EMAIL_DIST = True EMAIL_INCLUDE_FINGERPRINTS = True EMAIL_GPG_SIGNING_ENABLED = True -EMAIL_GPG_SIGNING_KEY = 'TESTING.subkeys.sec' +EMAIL_GPG_HOMEDIR = '.gnupg' +EMAIL_GPG_PRIMARY_KEY_FINGERPRINT = '0017098C5DF4197E3C884DCFF1B240D43F148C21' +EMAIL_GPG_PASSPHRASE = None +EMAIL_GPG_PASSPHRASE_FILE = None EMAIL_DOMAIN_MAP = { 'googlemail.com': 'gmail.com', 'mail.google.com': 'gmail.com', @@ -53,7 +56,10 @@ TEST_CONFIG_FILE = io.StringIO(unicode("""\ EMAIL_DIST = %s EMAIL_INCLUDE_FINGERPRINTS = %s EMAIL_GPG_SIGNING_ENABLED = %s -EMAIL_GPG_SIGNING_KEY = %s +EMAIL_GPG_HOMEDIR = %s +EMAIL_GPG_PRIMARY_KEY_FINGERPRINT = %s +EMAIL_GPG_PASSPHRASE = %s +EMAIL_GPG_PASSPHRASE_FILE = %s EMAIL_DOMAIN_MAP = %s EMAIL_DOMAIN_RULES = %s EMAIL_DOMAINS = %s @@ -71,7 +77,10 @@ EMAIL_PORT = %s """ % (repr(EMAIL_DIST), repr(EMAIL_INCLUDE_FINGERPRINTS), repr(EMAIL_GPG_SIGNING_ENABLED), - repr(EMAIL_GPG_SIGNING_KEY), + repr(EMAIL_GPG_HOMEDIR), + repr(EMAIL_GPG_PRIMARY_KEY_FINGERPRINT), + repr(EMAIL_GPG_PASSPHRASE), + repr(EMAIL_GPG_PASSPHRASE_FILE), repr(EMAIL_DOMAIN_MAP), repr(EMAIL_DOMAIN_RULES), repr(EMAIL_DOMAINS), diff --git a/lib/bridgedb/test/test_Main.py b/lib/bridgedb/test/test_Main.py index 7525b72..0b14319 100644 --- a/lib/bridgedb/test/test_Main.py +++ b/lib/bridgedb/test/test_Main.py @@ -415,7 +415,10 @@ EMAIL_PORT = 55557 EMAIL_N_BRIDGES_PER_ANSWER = 3 EMAIL_INCLUDE_FINGERPRINTS = True EMAIL_GPG_SIGNING_ENABLED = False -EMAIL_GPG_SIGNING_KEY = '../gnupghome/TESTING.subkeys.sec' +EMAIL_GPG_HOMEDIR = '../.gnupg' +EMAIL_GPG_PRIMARY_KEY_FINGERPRINT = '0017098C5DF4197E3C884DCFF1B240D43F148C21' +EMAiL_GPG_PASSPHRASE = None +EMAIL_GPG_PASSPHRASE_FILE = None HTTPS_SHARE = 10 EMAIL_SHARE = 5 RESERVED_SHARE = 2 diff --git a/lib/bridgedb/test/test_email_autoresponder.py b/lib/bridgedb/test/test_email_autoresponder.py index c94c909..2895802 100644 --- a/lib/bridgedb/test/test_email_autoresponder.py +++ b/lib/bridgedb/test/test_email_autoresponder.py @@ -37,7 +37,7 @@ class CreateResponseBodyTests(unittest.TestCase): def _moveGPGTestKeyfile(self): here = os.getcwd() topDir = here.rstrip('_trial_temp') - self.gpgFile = os.path.join(topDir, 'gnupghome', 'TESTING.subkeys.sec') + self.gpgFile = os.path.join(topDir, '.gnupg', 'TESTING.subkeys.sec') self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec') shutil.copy(self.gpgFile, self.gpgMoved)

1 0

[bridgedb/develop] Remove old GPGME-based GnuPG functions from bridgedb.crypto.
by isis＠torproject.org 24 Feb '15

24 Feb '15

commit a87eb73576cd23a9891c69448e44a38732cd963f Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 10:52:15 2015 +0000 Remove old GPGME-based GnuPG functions from bridgedb.crypto. * REMOVE PythonicGpgmeError. * REMOVE LessCrypticGPGMEError. * REMOVE _createGPGMEErrorInterpreters. * REMOVE gpgmeErrorTranslations. * REMOVE getGPGContext. * REMOVE gpgSignMessage. * REMOVE all associated tests. --- lib/bridgedb/crypto.py | 208 -------------------------------------- lib/bridgedb/test/test_crypto.py | 202 ------------------------------------ 2 files changed, 410 deletions(-) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index 724d649..a16e45a 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -41,7 +41,6 @@ Module Overview from __future__ import absolute_import from __future__ import unicode_literals -import gpgme import hashlib import hmac import io @@ -93,46 +92,6 @@ class PKCS1PaddingError(Exception): class RSAKeyGenerationError(Exception): """Raised when there was an error creating an RSA keypair.""" -class PythonicGpgmeError(Exception): - """Replacement for ``gpgme.GpgmeError`` with understandable error info.""" - -class LessCrypticGPGMEError(Exception): - """Holds interpreted info on source/type of a ``gpgme.GpgmeError``.""" - - def __init__(self, gpgmeError, *args): - self.interpretCrypticGPGMEError(gpgmeError) - super(LessCrypticGPGMEError, self).__init__(self.message) - - def interpretCrypticGPGMEError(self, gpgmeError): - """Set our ``message`` attribute with a decoded explanation of the - GPGME error code received. - - :type gpgmeError: ``gpgme.GpgmeError`` - :param gpgmeError: An exception raised by the gpgme_ module. - - .. _gpgme: https://bazaar.launchpad.net/~jamesh/pygpgme/trunk/view/head:/src/pygpgme-e… - """ - try: - errorSource, errorCode, errorMessage = gpgmeError.args - except (AttributeError, ValueError): - self.message = "Could not get error code from gpgme.GpgmeError!" - return - - if errorCode and errorSource: - try: - sources = gpgmeErrorTranslations[str(errorSource)] - except KeyError: - sources = ['UNKNOWN'] - sources = ', '.join(sources).strip(',') - - try: - names = gpgmeErrorTranslations[str(errorCode)] - except KeyError: - names = ['UNKNOWN'] - names = ', '.join(names).strip(',') - - self.message = "GpgmeError: {0} stemming from {1}: '{2}'""".format( - names, sources, str(errorMessage)) def writeKeyToFile(key, filename): """Write **key** to **filename**, with ``0400`` permissions. @@ -314,181 +273,14 @@ def removePKCS1Padding(message): return unpadded -def _createGPGMEErrorInterpreters(): - """Create a mapping of GPGME ERRNOs ←→ human-readable error names/causes. - This function is called automatically when :mod:`this module - <bridgedb.crypto>` is loaded. The resulting dictionary mapping is stored - as :attr:`~bridgedb.crypto.gpgmeErrorTranslations`, and is used by - :exc:`~bridgedb.crypto.LessCrypticGPGMEError`. - :returns: A dict of:: - {str(ERRNO): [ERRORNAME, ANOTHER_ERRORNAME, …], - …, - str(ERRORNAME): str(ERRNO), - …} - for all known error numbers and error names/causes. - """ - errorDict = {} - errorAttrs = [] - - if gpgme is not None: - errorAttrs = dir(gpgme) - - for attr in errorAttrs: - if attr.startswith('ERR'): - errorName = attr - errorCode = getattr(gpgme, attr, None) - if errorCode is not None: - try: - allErrorNames = errorDict[str(errorCode)] - except KeyError: - allErrorNames = [] - allErrorNames.append(str(errorName)) - - errorDict.update({str(errorCode): allErrorNames}) - errorDict.update({str(errorName): str(errorCode)}) - - return errorDict - -#: This is a dictionary which holds a translation of GPGME ERRNOs ←→ all known -#: names/causes for that ERRNO, and vice versa. It is created automatically, -#: via the :func:`_createGPGMEErrorInterpreters` function, when this module is -#: loaded so that :exc:`LessCrypticGPGMEError` can use it to display -#: human-readable information about why GPGME borked itself on something. -gpgmeErrorTranslations = _createGPGMEErrorInterpreters() - -def getGPGContext(cfg): - """Import a key from a file and initialise a context for GnuPG operations. - - The key should not be protected by a passphrase, and should have the - signing flag enabled. - - :type cfg: :class:`bridgedb.persistent.Conf` - :param cfg: The loaded config file. - :rtype: :class:`gpgme.Context` or None - :returns: A GPGME context with the signers initialized by the keyfile - specified by the option EMAIL_GPG_SIGNING_KEY in bridgedb.conf, or - None if the option was not enabled, or was unable to initialize. - """ - try: - # must have enabled signing and specified a key file - if not cfg.EMAIL_GPG_SIGNING_ENABLED or not cfg.EMAIL_GPG_SIGNING_KEY: - return None - except AttributeError: - return None - keyfile = None - ctx = gpgme.Context() - try: - binary = GPGME_CONTEXT_BINARY[0] - except Exception: - # Setting this to ``None`` will cause libgpgme to "use the default - # binary", according their docs: - binary = None - try: - homedir = os.path.abspath(GPGME_CONTEXT_HOMEDIR) - logging.debug("Setting GPG homedir to %r" % homedir) - if not os.path.isdir(homedir): - os.makedirs(homedir) - # This is done to ensure that we don't ever use keys in the process - # owner's $GNUPGHOME directory, see: - # http://www.gnupg.org/documentation/manuals/gpgme/Crypto-Engine.html#Crypto-… - ctx.set_engine_info(gpgme.PROTOCOL_OpenPGP, binary, homedir) - - logging.debug("Opening GPG keyfile %s..." % cfg.EMAIL_GPG_SIGNING_KEY) - keyfile = open(cfg.EMAIL_GPG_SIGNING_KEY) - key = ctx.import_(keyfile) - - if not len(key.imports) > 0: - logging.debug("Unexpected result from gpgme.Context.import_(): %r" - % key) - raise PythonicGpgmeError("Could not import GnuPG key from file %r" - % cfg.EMAIL_GPG_SIGNING_KEY) - - fingerprint = key.imports[0][0] - subkeyFingerprints = [] - # For some reason, if we don't do it exactly like this, we can get - # signatures for *any* key in the current process owner's keyring - # file: - bridgedbKey = ctx.get_key(fingerprint) - bridgedbUID = bridgedbKey.uids[0].uid - logging.info("GnuPG key imported: %s" % bridgedbUID) - logging.info(" Fingerprint: %s" % fingerprint) - for subkey in bridgedbKey.subkeys: - logging.info("Subkey fingerprint: %s" % subkey.fpr) - subkeyFingerprints.append(subkey.fpr) - - ctx.armor = True - ctx.signers = (bridgedbKey,) - - logging.debug("Testing signature created with GnuPG key...") - signatureText, sigs = gpgSignMessage(ctx, "Testing 1 2 3") - - if not len(sigs) == 1: - raise PythonicGpgmeError("Testing couldn't produce a signature "\ - "with GnuPG key: %s" % fingerprint) - - sigFingerprint = sigs[0].fpr - if sigFingerprint in subkeyFingerprints: - logging.info("GPG signatures will use subkey with fingerprint: %s" - % sigFingerprint) - else: - if sigFingerprint != fingerprint: - raise PythonicGpgmeError( - "Test sig fingerprint '%s' not from any appropriate key!" - % sigFingerprint) - - except (IOError, OSError) as error: - logging.debug(error) - logging.error("Could not open or read from GnuPG key file %r!" - % cfg.EMAIL_GPG_SIGNING_KEY) - ctx = None - except gpgme.GpgmeError as error: - lessCryptic = LessCrypticGPGMEError(error) - logging.error(lessCryptic) - ctx = None - except PythonicGpgmeError as error: - logging.error(error) - ctx = None - finally: - if keyfile and not keyfile.closed: - keyfile.close() - - return ctx - -def gpgSignMessage(gpgmeCtx, messageString, mode=None): - """Sign a **messageString** with a GPGME context. - - :param gpgmeCtx: A ``gpgme.Context`` initialised with the appropriate - settings. - :param str messageString: The message to sign. - :param mode: The signing mode. (default: ``gpgme.SIG_MODE_CLEAR``) - :rtype: tuple - :returns: A 2-tuple of ``(signature, list)``, where: - * ``signature`` is the ascii-armored signature text. - * ``list`` is a list of ``gpgme.NewSignature``s. - - .. warning:: The returned signature text and list *may* be empty, if no - signature was created. - """ - if not mode: - mode = gpgme.SIG_MODE_CLEAR - if NEW_BUFFER_INTERFACE: - msgFile = io.BytesIO(buffer(messageString)) - sigFile = io.BytesIO() - else: - msgFile = io.StringIO(unicode(messageString)) - sigFile = io.StringIO() - sigList = gpgmeCtx.sign(msgFile, sigFile, mode) - sigFile.seek(0) - signature = sigFile.read() - return (signature, sigList) class SSLVerifyingContextFactory(ssl.CertificateOptions): diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index 801a369..da93f07 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -15,7 +15,6 @@ from __future__ import print_function from __future__ import unicode_literals import base64 -import gpgme import io import logging import math @@ -24,7 +23,6 @@ import shutil import OpenSSL - from twisted.internet import defer from twisted.trial import unittest from twisted.test.proto_helpers import StringTransport @@ -286,143 +284,6 @@ class RemovePKCS1PaddingTests(unittest.TestCase): self.blob) -class LessCrypticGPGMEErrorTests(unittest.TestCase): - """Unittests for :class:`bridgedb.crypto.LessCrypticGPGMEError`.""" - - def test_error1(self): - """libgpgme will raise an error when given an io.StringIO for the - message or sigfile. - """ - message = io.StringIO(unicode(self.id())) - sigfile = io.StringIO() - - lessCryptic = None - ctx = gpgme.Context() - - try: - ctx.sign(message, sigfile) - except gpgme.GpgmeError as error: - lessCryptic = crypto.LessCrypticGPGMEError(error) - - self.assertTrue('Invalid argument' in lessCryptic.message) - - def test_noGpgmeErrorArgs(self): - """A gpgme.GpgmeError() without error code args should result in a - 'Could not get error code from gpgme.GpgmeError!' message. - """ - error = gpgme.GpgmeError() - lessCryptic = crypto.LessCrypticGPGMEError(error) - self.assertEqual(lessCryptic.message, - 'Could not get error code from gpgme.GpgmeError!') - - def test_unknownErrorSource(self): - """A gpgme.GpgmeError() without a recognisable error source should say - that the error source is 'UNKNOWN'. - """ - msg = "These numbers make more sense than libgpgme's error codes." - error = gpgme.GpgmeError(math.pi, math.e, msg) - lessCryptic = crypto.LessCrypticGPGMEError(error) - self.assertSubstring('UNKNOWN', lessCryptic.message) - self.assertSubstring(msg, lessCryptic.message) - - def test_unknownErrorCode(self): - """A gpgme.GpgmeError() without a recognisable error code should say - that the error code is 'UNKNOWN'. - """ - msg = "These numbers make more sense than libgpgme's error codes." - error = gpgme.GpgmeError(math.pi, math.e, msg) - lessCryptic = crypto.LessCrypticGPGMEError(error) - self.assertSubstring('UNKNOWN', lessCryptic.message) - self.assertSubstring(msg, lessCryptic.message) - - -class GPGContextTests(unittest.TestCase): - """Tests for :func:`bridgedb.crypto.getGPGContext`.""" - - timeout = 15 - - @fileCheckDecorator - def doCopyFile(self, src, dst, description=None): - shutil.copy(src, dst) - - def removeRundir(self): - """Remove the rundir from the _trial_tmp directory.""" - if os.path.isdir(self.runDir): - shutil.rmtree(self.runDir) - - def makeBadKey(self): - """Make a bad keyfile and set its path in our config.""" - keyfile = os.path.join(self.runDir, 'badkey.asc') - with open(keyfile, 'w') as badkey: - badkey.write(str('NO PASARAN, DEATH CAKES!')) - badkey.flush() - self.setKey(keyfile) - - def enableSigning(self, enable=True): - """Enable or disable the config setting for email signing.""" - setattr(self.config, 'EMAIL_GPG_SIGNING_ENABLED', enable) - - def setKey(self, keyfile=''): - """Set the config keyfile path to **keyfile**.""" - setattr(self.config, 'EMAIL_GPG_SIGNING_KEY', keyfile) - - def setUp(self): - here = os.getcwd() - topDir = here.rstrip('_trial_temp') - self.runDir = os.path.join(here, 'rundir') - self.gpgFile = os.path.join(topDir, 'gnupghome', 'TESTING.subkeys.sec') - self.gpgExpr = os.path.join(topDir, 'gnupghome', - 'TESTING.subkeys.sec.EXPIRED-2013-09-11') - - if not os.path.isdir(self.runDir): - os.makedirs(self.runDir) - - self.config = Conf() - self.enableSigning() - self.addCleanup(self.enableSigning) - self.addCleanup(self.removeRundir) - - def test_getGPGContext_good_keyfile(self): - """Test EmailServer.getGPGContext() with a good key filename.""" - self.setKey(self.gpgFile) - ctx = crypto.getGPGContext(self.config) - self.assertIsInstance(ctx, gpgme.Context) - - def test_getGPGContext_missing_keyfile(self): - """Test EmailServer.getGPGContext() with a missing key filename.""" - self.setKey('missing-keyfile.asc') - ctx = crypto.getGPGContext(self.config) - self.assertTrue(ctx is None) - - def test_getGPGContext_bad_keyfile(self): - """Test EmailServer.getGPGContext() with a missing key filename.""" - self.makeBadKey() - ctx = crypto.getGPGContext(self.config) - self.assertTrue(ctx is None) - - def test_getGPGContext_expired_keyfile(self): - """getGPGContext() with an expired key should return None.""" - self.setKey(self.gpgExpr) - ctx = crypto.getGPGContext(self.config) - self.assertTrue(ctx is None) - - def test_getGPGContext_signing_disabled(self): - """getGPGContext() with signing disabled should return None.""" - self.setKey(self.gpgFile) - self.enableSigning(False) - ctx = crypto.getGPGContext(self.config) - self.assertIsNone(ctx) - - def test_getGPGContext_config_signing_missing(self): - """getGPGContext() with a missing/unset 'EMAIL_GPG_SIGNING_ENABLED' - config line should return None. - """ - self.setKey(self.gpgFile) - delattr(self.config, 'EMAIL_GPG_SIGNING_ENABLED') - ctx = crypto.getGPGContext(self.config) - self.assertIsNone(ctx) - - class SSLVerifyingContextFactoryTests(unittest.TestCase, txtagent.FakeReactorAndConnectMixin): """Tests for :class:`bridgedb.crypto.SSLVerifyingContextFactory`.""" @@ -503,66 +364,3 @@ class SSLVerifyingContextFactoryTests(unittest.TestCase, contextFactory = crypto.SSLVerifyingContextFactory(self.url) self.assertIsInstance(contextFactory.getContext(), OpenSSL.SSL.Context) - - -class GetGPGContextTest(unittest.TestCase): - """Unittests for :func:`bridgedb.crypto.getGPGContext`.""" - - timeout = 15 - - @fileCheckDecorator - def doCopyFile(self, src, dst, description=None): - shutil.copy(src, dst) - - def removeRundir(self): - if os.path.isdir(self.runDir): - shutil.rmtree(self.runDir) - - def makeBadKey(self): - self.setKey(self.badKeyfile) - - def setKey(self, keyfile=''): - setattr(self.config, 'EMAIL_GPG_SIGNING_KEY', keyfile) - - def setUp(self): - here = os.getcwd() - topDir = here.rstrip('_trial_temp') - self.runDir = os.path.join(here, 'rundir') - self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec') - self.gpgFile = os.path.join(topDir, 'gnupghome', - 'TESTING.subkeys.sec') - - if not os.path.isdir(self.runDir): - os.makedirs(self.runDir) - - self.badKeyfile = os.path.join(here, 'badkey.asc') - with open(self.badKeyfile, 'w') as badkey: - badkey.write('NO PASARAN, DEATH CAKES!') - badkey.flush() - - self.doCopyFile(self.gpgFile, self.gpgMoved, "GnuPG test keyfile") - - self.config = Conf() - setattr(self.config, 'EMAIL_GPG_SIGNING_ENABLED', True) - setattr(self.config, 'EMAIL_GPG_SIGNING_KEY', - 'gnupghome/TESTING.subkeys.sec') - - self.addCleanup(self.removeRundir) - - def test_getGPGContext_good_keyfile(self): - """Test EmailServer.getGPGContext() with a good key filename.""" - self.setKey(self.gpgMoved) - ctx = crypto.getGPGContext(self.config) - self.assertIsInstance(ctx, crypto.gpgme.Context) - - def test_getGPGContext_missing_keyfile(self): - """Test EmailServer.getGPGContext() with a missing key filename.""" - self.setKey('missing-keyfile.asc') - ctx = crypto.getGPGContext(self.config) - self.assertTrue(ctx is None) - - def test_getGPGContext_bad_keyfile(self): - """Test EmailServer.getGPGContext() with a missing key filename.""" - self.makeBadKey() - ctx = crypto.getGPGContext(self.config) - self.assertTrue(ctx is None)

1 0

[bridgedb/develop] Add integration tests for bridgedb.crypto.initializeGnuPG().
by isis＠torproject.org 24 Feb '15

24 Feb '15

commit 9ed91fb1403b44dbf0f6b6e08e9a0173862c9c3c Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 10:20:36 2015 +0000 Add integration tests for bridgedb.crypto.initializeGnuPG(). --- lib/bridgedb/test/test_crypto.py | 139 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index 2187475..801a369 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -24,6 +24,7 @@ import shutil import OpenSSL + from twisted.internet import defer from twisted.trial import unittest from twisted.test.proto_helpers import StringTransport @@ -33,6 +34,7 @@ from bridgedb import crypto from bridgedb import txrecaptcha from bridgedb.persistent import Conf from bridgedb.test.util import fileCheckDecorator +from bridgedb.test.email_helpers import _createConfig logging.disable(50) @@ -87,6 +89,143 @@ class GetKeyTests(unittest.TestCase): % (key.encode('hex'), SEKRIT_KEY.encode('hex'))) +class InitializeGnuPGTests(unittest.TestCase): + """Unittests for :func:`bridgedb.crypto.initializeGnupG`.""" + + def _moveGnuPGHomedir(self): + """Move the .gnupg/ directory from the top-level of this repo to the + current working directory. + + :rtype: str + :returns: The full path to the new gnupg home directory. + """ + here = os.getcwd() + topDir = here.rstrip('_trial_temp') + gnupghome = os.path.join(topDir, '.gnupg') + gnupghomeNew = os.path.join(here, '.gnupg') + + if os.path.isdir(gnupghomeNew): + shutil.rmtree(gnupghomeNew) + + shutil.copytree(gnupghome, gnupghomeNew) + + return gnupghomeNew + + def _writePassphraseToFile(self, passphrase, filename): + """Write **passphrase** to the file at **filename**. + + :param str passphrase: The GnuPG passphase. + :param str filename: The file to write the passphrase to. + """ + fh = open(filename, 'w') + fh.write(passphrase) + fh.flush() + fh.close() + + def setUp(self): + """Create a config object and setup our gnupg home directory.""" + self.config = _createConfig() + self.gnupghome = self._moveGnuPGHomedir() + self.config.EMAIL_GPG_HOMEDIR = self.gnupghome + + self.passphraseFile = 'gpg-passphrase-file' + self._writePassphraseToFile('sekrit', self.passphraseFile) + + def test_crypto_initializeGnuPG(self): + """crypto.initializeGnuPG() should return a 2-tuple with a gpg object + and a signing function. + """ + gpg, signfunc = crypto.initializeGnuPG(self.config) + self.assertIsNotNone(gpg) + self.assertIsNotNone(signfunc) + + def test_crypto_initializeGnuPG_disabled(self): + """When EMAIL_GPG_SIGNING_ENABLED=False, crypto.initializeGnuPG() + should return a 2-tuple of None. + """ + self.config.EMAIL_GPG_SIGNING_ENABLED = False + gpg, signfunc = crypto.initializeGnuPG(self.config) + + self.assertIsNone(gpg) + self.assertIsNone(signfunc) + + def test_crypto_initializeGnuPG_no_secrets(self): + """When the secring.gpg is missing, crypto.initializeGnuPG() should + return a 2-tuple of None. + """ + secring = os.path.join(self.gnupghome, 'secring.gpg') + if os.path.isfile(secring): + os.remove(secring) + + gpg, signfunc = crypto.initializeGnuPG(self.config) + self.assertIsNone(gpg) + self.assertIsNone(signfunc) + + def test_crypto_initializeGnuPG_no_publics(self): + """When the pubring.gpg is missing, crypto.initializeGnuPG() should + return a 2-tuple of None. + """ + pubring = os.path.join(self.gnupghome, 'pubring.gpg') + if os.path.isfile(pubring): + os.remove(pubring) + + gpg, signfunc = crypto.initializeGnuPG(self.config) + self.assertIsNone(gpg) + self.assertIsNone(signfunc) + + def test_crypto_initializeGnuPG_with_passphrase(self): + """crypto.initializeGnuPG() should initialize correctly when a + passphrase is given but no passphrase is needed. + """ + self.config.EMAIL_GPG_PASSPHRASE = 'password' + gpg, signfunc = crypto.initializeGnuPG(self.config) + self.assertIsNotNone(gpg) + self.assertIsNotNone(signfunc) + + def test_crypto_initializeGnuPG_with_passphrase_file(self): + """crypto.initializeGnuPG() should initialize correctly when a + passphrase file is given but no passphrase is needed. + """ + self.config.EMAIL_GPG_PASSPHRASE_FILE = self.passphraseFile + gpg, signfunc = crypto.initializeGnuPG(self.config) + self.assertIsNotNone(gpg) + self.assertIsNotNone(signfunc) + + def test_crypto_initializeGnuPG_missing_passphrase_file(self): + """crypto.initializeGnuPG() should initialize correctly if a passphrase + file is given but that file is missing (when no passphrase is actually + necessary). + """ + self.config.EMAIL_GPG_PASSPHRASE_FILE = self.passphraseFile + os.remove(self.passphraseFile) + gpg, signfunc = crypto.initializeGnuPG(self.config) + self.assertIsNotNone(gpg) + self.assertIsNotNone(signfunc) + + def test_crypto_initializeGnuPG_signingFunc(self): + """crypto.initializeGnuPG() should return a signing function which + produces OpenPGP signatures. + """ + gpg, signfunc = crypto.initializeGnuPG(self.config) + self.assertIsNotNone(gpg) + self.assertIsNotNone(signfunc) + + sig = signfunc("This is a test of the public broadcasting system.") + print(sig) + self.assertIsNotNone(sig) + self.assertTrue(sig.startswith('-----BEGIN PGP SIGNED MESSAGE-----')) + + def test_crypto_initializeGnuPG_nonexistent_default_key(self): + """When the key specified by EMAIL_GPG_PRIMARY_KEY_FINGERPRINT doesn't + exist in the keyrings, crypto.initializeGnuPG() should return a 2-tuple + of None. + """ + self.config.EMAIL_GPG_PRIMARY_KEY_FINGERPRINT = 'A' * 40 + gpg, signfunc = crypto.initializeGnuPG(self.config) + self.assertIsNone(gpg) + self.assertIsNone(signfunc) + + class RemovePKCS1PaddingTests(unittest.TestCase): """Unittests for :func:`bridgedb.crypto.removePKCS1Padding`."""

1 0

[bridgedb/develop] Change .travis.yml before_script to copy .gnupg/ directory into run/.
by isis＠torproject.org 24 Feb '15

24 Feb '15

commit 83772a99e8c067acfdd346001541ee9ea7b31b31 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 21:39:43 2015 +0000 Change .travis.yml before_script to copy .gnupg/ directory into run/. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 19d0196..75f8857 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ install: # Start a BridgeDB instance before running the tests: before_script: - mkdir run - - cp -R -t run bridgedb.conf captchas gnupghome + - cp -R -t run bridgedb.conf captchas .gnupg # Add '127.0.0.1' to EMAIL_DOMAINS in bridgedb.conf. This should ONLY be # done on testing servers, never on production servers. - sed -r -i -e "s/(EMAIL_DOMAINS)(.*)(])/\1\2\, '127.0.0.1']/" run/bridgedb.conf

1 0

[bridgedb/develop] Add crypto.initializeGnuPG() function.
by isis＠torproject.org 24 Feb '15

24 Feb '15

commit a4fc36eabb00bb47114b8379319d3897a63427ac Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 10:58:04 2015 +0000 Add crypto.initializeGnuPG() function. This switches BridgeDB to using python-gnupg rather than pygpgme. * FIXES #10385 https://bugs.torproject.org/10385 --- lib/bridgedb/crypto.py | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index a16e45a..6bb5c7d 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -41,6 +41,7 @@ Module Overview from __future__ import absolute_import from __future__ import unicode_literals +import gnupg import hashlib import hmac import io @@ -273,14 +274,92 @@ def removePKCS1Padding(message): return unpadded +def initializeGnuPG(config): + """Initialize a GnuPG interface and test our configured keys. + + .. note:: This function uses python-gnupg_. + + :type config: :class:`bridgedb.persistent.Conf` + :param config: The loaded config file. + :rtype: 2-tuple + :returns: If ``EMAIL_GPG_SIGNING_ENABLED`` isn't ``True``, or we couldn't + initialize GnuPG and make a successful test signature with the + specified key, then a 2-tuple of ``None`` is returned. Otherwise, the + first item in the tuple is a :class:`gnupg.GPG` interface_ with the + GnuPG homedir set to the ``EMAIL_GPG_HOMEDIR`` option and the signing + key specified by the ``EMAIL_GPG_SIGNING_KEY_FINGERPRINT`` option in + bridgedb.conf set as the default key. The second item in the tuple is + a signing function with the passphrase (as specified in either + ``EMAIL_GPG_PASSPHRASE`` or ``EMAIL_GPG_PASSPHRASE_FILE``) already + set. + + .. _python-gnupg: https://pypi.python.org/pypi/gnupg/ + .. _interface: https://python-gnupg.readthedocs.org/en/latest/gnupg.html#gnupg-module + """ + ret = (None, None) + if not config.EMAIL_GPG_SIGNING_ENABLED: + return ret + homedir = config.EMAIL_GPG_HOMEDIR + primary = config.EMAIL_GPG_PRIMARY_KEY_FINGERPRINT + passphrase = config.EMAIL_GPG_PASSPHRASE + passFile = config.EMAIL_GPG_PASSPHRASE_FILE + logging.info("Using %s as our GnuPG home directory..." % homedir) + gpg = gnupg.GPG(homedir=homedir) + logging.info("Initialized GnuPG interface using %s binary with version %s." + % (gpg.binary, gpg.binary_version)) + primarySK = None + primaryPK = None + secrets = gpg.list_keys(secret=True) + publics = gpg.list_keys() + if not secrets: + logging.warn("No secret keys found in %s!" % gpg.secring) + return ret + primarySK = filter(lambda key: key['fingerprint'] == primary, secrets) + primaryPK = filter(lambda key: key['fingerprint'] == primary, publics) + if primarySK and primaryPK: + logging.info("Found GnuPG primary key with fingerprint: %s" % primary) + for sub in primaryPK[0]['subkeys']: + logging.info(" Subkey: %s Usage: %s" % (sub[0], sub[1].upper())) + else: + logging.warn("GnuPG key %s could not be found in %s!" % (primary, gpg.secring)) + return ret + + if passphrase: + logging.info("Read GnuPG passphrase from config.") + elif passFile: + try: + with open(passFile) as fh: + passphrase = fh.read() + except (IOError, OSError): + logging.error("Could not open GnuPG passphrase file: %s!" % passFile) + else: + logging.info("Read GnuPG passphrase from file: %s" % passFile) + def gpgSignMessage(message): + """Sign **message** with the default key specified by + ``EMAIL_GPG_PRIMARY_KEY_FINGERPRINT``. + + :param str message: A message to sign. + :rtype: str or ``None``. + :returns: A string containing the clearsigned message, or ``None`` if + the signing failed. + """ + sig = gpg.sign(message, default_key=primary, passphrase=passphrase) + if sig and sig.data: + return sig.data + + logging.debug("Testing signature created with GnuPG key...") + sig = gpgSignMessage("Testing 1 2 3") + if sig: + logging.info("Test signature with GnuPG key %s okay:\n%s" % (primary, sig)) + return (gpg, gpgSignMessage) class SSLVerifyingContextFactory(ssl.CertificateOptions):

1 0

[bridgedb/develop] Use crypto.initializeGnuPG() in b.e.server and b.e.autoresponder.
by isis＠torproject.org 24 Feb '15

24 Feb '15

commit f7bb49f84eeab0b80096a88d060b4638c4e9ae52 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 11:00:52 2015 +0000 Use crypto.initializeGnuPG() in b.e.server and b.e.autoresponder. --- lib/bridgedb/email/autoresponder.py | 45 +++++++++++++++++------------------ lib/bridgedb/email/server.py | 12 ++++++---- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index 3f53e6e..e96ad91 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -46,7 +46,6 @@ from twisted.mail import smtp from twisted.python import failure from bridgedb import safelog -from bridgedb.crypto import gpgSignMessage from bridgedb.crypto import NEW_BUFFER_INTERFACE from bridgedb.Dist import EmailRequestedHelp from bridgedb.Dist import EmailRequestedKey @@ -129,7 +128,7 @@ def createResponseBody(lines, context, client, lang='en'): return templates.buildAnswerMessage(translator, client, answer) def generateResponse(fromAddress, client, body, subject=None, - messageID=None, gpgContext=None): + messageID=None, gpgSignFunc=None): """Create a :class:`EmailResponse`, which acts like an in-memory ``io.StringIO`` file, by creating and writing all headers and the email body into the file-like ``EmailResponse.mailfile``. @@ -140,21 +139,21 @@ def generateResponse(fromAddress, client, body, subject=None, :param client: The client's email address which should be in the ``'To:'`` header of the response email. :param str subject: The string to write to the ``Subject:'`` header. - :param str body: The body of the email. If a **gpgContext** is also given, - and that ``Context`` has email signing configured, then - :meth:`EmailResponse.writeBody` will generate and include any - ascii-armored OpenPGP signatures in the **body**. + :param str body: The body of the email. If a **gpgSignFunc** is also + given, then :meth:`EmailResponse.writeBody` will generate and include + an ascii-armored OpenPGP signature in the **body**. :type messageID: None or str :param messageID: The :rfc:`2822` specifier for the ``'Message-ID:'`` header, if including one is desirable. - :type gpgContext: None or ``gpgme.Context`` - :param gpgContext: A pre-configured GPGME context. See - :func:`~bridgedb.crypto.getGPGContext`. + :type gpgSignFunc: ``None`` or callable + :param gpgSignFunc: A function for signing messages. See + :func:`bridgedb.crypto.initializeGnuPG` for obtaining a pre-configured + **gpgSignFunc**. :returns: An :class:`EmailResponse` which contains the entire email. To obtain the contents of the email, including all headers, simply use :meth:`EmailResponse.readContents`. """ - response = EmailResponse(gpgContext) + response = EmailResponse(gpgSignFunc) response.to = client response.writeHeaders(fromAddress.encode('utf-8'), str(client), subject, inReplyTo=messageID) @@ -196,21 +195,18 @@ class EmailResponse(object): _buff = buffer if NEW_BUFFER_INTERFACE else unicode mailfile = io.BytesIO if NEW_BUFFER_INTERFACE else io.StringIO - def __init__(self, gpgContext=None): + def __init__(self, gpgSignFunc=None): """Create a response to an email we have recieved. This class deals with correctly formatting text for the response email headers and the response body into an instance of :data:`mailfile`. - :type gpgContext: None or ``gpgme.Context`` - :param gpgContext: A pre-configured GPGME context. See - :meth:`bridgedb.crypto.getGPGContext` for obtaining a - pre-configured **gpgContext**. If given, and the ``Context`` has - been configured to sign emails, then a response email body string - given to :meth:`writeBody` will be signed before being written - into the ``mailfile``. + :type gpgSignFunc: ``None`` or callable + :param gpgSignFunc: A function for signing messages. See + :func:`bridgedb.crypto.initializeGnuPG` for obtaining a + pre-configured **gpgSignFunc**. """ - self.gpgContext = gpgContext + self.gpgSign = gpgSignFunc self.mailfile = self.mailfile() self.delimiter = '\n' self.closed = False @@ -349,16 +345,19 @@ class EmailResponse(object): def writeBody(self, body): """Write the response body into the :cvar:`mailfile`. - If ``EmailResponse.gpgContext`` is set, and signing is configured, the + If ``EmailResponse.gpgSignFunc`` is set, and signing is configured, the **body** will be automatically signed before writing its contents into the ``mailfile``. :param str body: The body of the response email. """ logging.info("Writing email body...") - if self.gpgContext: + if self.gpgSign: logging.info("Attempting to sign email...") - body, _ = gpgSignMessage(self.gpgContext, body) + sig = self.gpgSign(body) + if sig: + body = sig + print("Signed email body:\n%s" % body) # XXX self.writelines(body) @@ -428,7 +427,7 @@ class SMTPAutoresponder(smtp.SMTPClient): subject = self.incoming.message.getheader("Subject", None) response = generateResponse(recipient, client, body, subject, messageID, - self.incoming.context.gpgContext) + self.incoming.context.gpgSignFunc) return response def getMailTo(self): diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 110c381..05cecb7 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -61,7 +61,7 @@ from zope.interface import implements from bridgedb import __version__ from bridgedb import safelog -from bridgedb.crypto import getGPGContext +from bridgedb.crypto import initializeGnuPG from bridgedb.email import autoresponder from bridgedb.email import templates from bridgedb.email import request @@ -90,9 +90,11 @@ class MailServerContext(object): :ivar int fuzzyMatch: An integer specifying the maximum Levenshtein Distance from an incoming email address to a blacklisted email address for the incoming email to be dropped. - :ivar gpgContext: A ``gpgme.GpgmeContext`` (as created by - :func:`bridgedb.crypto.getGPGContext`), or None if we couldn't create - a proper GPGME context for some reason. + :ivar gpg: A :class:`gnupg.GPG` interface_, as returned by + :func:`~bridgedb.crypto.initialiseGnuPG`, or ``None`` if we couldn't + initialize GnuPG for some reason. + :ivar gpgSignFunc: A callable which signs a message, e.g. the one returned + from :func:`~bridgedb.crypto.initialiseGnuPG`. """ def __init__(self, config, distributor, schedule): @@ -128,7 +130,7 @@ class MailServerContext(object): self.blacklist = config.EMAIL_BLACKLIST or [] self.fuzzyMatch = config.EMAIL_FUZZY_MATCH or 0 - self.gpgContext = getGPGContext(config) + self.gpg, self.gpgSignFunc = initializeGnuPG(config) def buildCanonicalDomainMap(self): """Build a map for all email provider domains from which we will accept

1 0

[bridgedb/develop] Merge branch 'fix/10385-python-gnupg_r1' into develop
by isis＠torproject.org 24 Feb '15

24 Feb '15

commit b8365ad36d78d279af4d19736991262b2f9c8268 Merge: 95ad0a6 f7bb49f Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Feb 23 23:31:26 2015 +0000 Merge branch 'fix/10385-python-gnupg_r1' into develop .gitignore | 3 - .gnupg/TESTING.pub | Bin 0 -> 4622 bytes .gnupg/TESTING.subkeys.sec | Bin 0 -> 7212 bytes .gnupg/bridgedb-offline-key.pub.asc | 113 ++++++++ .gnupg/bridgedb-online-key.pub.asc | 100 +++++++ .gnupg/gpg.conf | 96 ++++++ .gnupg/pubring.gpg | Bin 0 -> 4634 bytes .gnupg/secring.gpg | Bin 0 -> 7224 bytes .travis.requirements.txt | 2 +- .travis.yml | 4 +- README.rst | 6 +- bridgedb.conf | 55 +++- gnupghome/TESTING.subkeys.sec | Bin 7212 -> 0 bytes gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 | Bin 6505 -> 0 bytes gnupghome/bridgedb-offline-key.pub.asc | 113 -------- gnupghome/bridgedb-online-signing-key.pub.asc | 148 ---------- gnupghome/gpg.conf | 96 ------ lib/bridgedb/configure.py | 3 +- lib/bridgedb/crypto.py | 285 +++++------------- lib/bridgedb/email/autoresponder.py | 45 ++- lib/bridgedb/email/server.py | 12 +- lib/bridgedb/test/email_helpers.py | 15 +- lib/bridgedb/test/test_Main.py | 5 +- lib/bridgedb/test/test_crypto.py | 339 +++++++++------------- lib/bridgedb/test/test_email_autoresponder.py | 2 +- requirements.txt | 2 +- 26 files changed, 631 insertions(+), 813 deletions(-)

1 0

[bridgedb/develop] Remove unused GPGME variables in bridgedb.crypto.
by isis＠torproject.org 24 Feb '15

24 Feb '15

commit 9d7377bf8ef23da3b4e80d60a31b447de3af986b Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 24 01:43:47 2015 +0000 Remove unused GPGME variables in bridgedb.crypto. --- lib/bridgedb/crypto.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index 6bb5c7d..c17957b 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -80,12 +80,6 @@ except TypeError: # pragma: no cover else: NEW_BUFFER_INTERFACE = True -#: Settings for the GPGME Context and `Crypto Engine`_. -#: .. _`Crypto Engine`: -#: http://www.gnupg.org/documentation/manuals/gpgme/Crypto-Engine.html#Crypto-… -GPGME_CONTEXT_HOMEDIR = '.gnupg' -GPGME_CONTEXT_BINARY = which('gpg2') or which('gpg') # These will be lists - class PKCS1PaddingError(Exception): """Raised when there is a problem adding or removing PKCS#1 padding."""

1 0

[bridgedb/develop] Merge branch 'fix/10385-python-gnupg_r1' into develop
by isis＠torproject.org 24 Feb '15

24 Feb '15

commit f6e03ed98acf1e54130b3ccf9b2bb184849bec50 Merge: b8365ad 9d7377b Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 24 04:42:14 2015 +0000 Merge branch 'fix/10385-python-gnupg_r1' into develop lib/bridgedb/crypto.py | 6 ------ 1 file changed, 6 deletions(-)

1 0