summaryrefslogtreecommitdiffstats
path: root/base/common/python/pki/crypto.py
diff options
context:
space:
mode:
authorChristian Heimes <cheimes@redhat.com>2015-08-11 20:55:48 +0200
committerChristian Heimes <cheimes@redhat.com>2015-08-14 13:03:18 +0200
commit12badcabc1cd345256a4902f7b0583cf667ecd8d (patch)
treed0a45d096fab9c0b14d5221557a616824ecfd24a /base/common/python/pki/crypto.py
parentd63ade55f5cc2a9ecf21ea2b43cfac80149c4c29 (diff)
downloadpki-12badcabc1cd345256a4902f7b0583cf667ecd8d.tar.gz
pki-12badcabc1cd345256a4902f7b0583cf667ecd8d.tar.xz
pki-12badcabc1cd345256a4902f7b0583cf667ecd8d.zip
Make pki PEP 8 compatible
Large portions of the patch was automatically created with autopep8: find base/ -name '*.py' | xargs autopep8 --in-place --ignore E309 \ --aggressive find base/common/upgrade base/server/upgrade -type f -and \ -not -name .gitignore | autopep8 --in-place --ignore E309 --aggressive autopep8 --in-place --ignore E309 --aggressive \ base/common/sbin/pki-upgrade \ base/server/sbin/pkispawn \ base/server/sbin/pkidestroy \ base/server/sbin/pki-server \ base/server/sbin/pki-server-upgrade About two dozent violations were fixed manually. https://fedorahosted.org/pki/ticket/708
Diffstat (limited to 'base/common/python/pki/crypto.py')
-rw-r--r--base/common/python/pki/crypto.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/base/common/python/pki/crypto.py b/base/common/python/pki/crypto.py
index 6a99c13fe..2a33f0638 100644
--- a/base/common/python/pki/crypto.py
+++ b/base/common/python/pki/crypto.py
@@ -62,7 +62,8 @@ class CryptoProvider(object):
pass
@abc.abstractmethod
- def symmetric_wrap(self, data, wrapping_key, mechanism=None, nonce_iv=None):
+ def symmetric_wrap(self, data, wrapping_key, mechanism=None,
+ nonce_iv=None):
""" encrypt data using a symmetric key (wrapping key)"""
pass
@@ -86,7 +87,7 @@ class CryptoProvider(object):
"""
pass
- #abc.abstractmethod
+ # abc.abstractmethod
def get_cert(self, cert_nick):
""" Get the certificate for the specified cert_nick. """
pass
@@ -101,7 +102,8 @@ class NSSCryptoProvider(CryptoProvider):
"""
@staticmethod
- def setup_database(db_dir, password=None, over_write=False, password_file=None):
+ def setup_database(
+ db_dir, password=None, over_write=False, password_file=None):
""" Create an NSS database """
if os.path.exists(db_dir):
if not over_write:
@@ -188,7 +190,8 @@ class NSSCryptoProvider(CryptoProvider):
None,
slot.get_best_key_length(mechanism))
- # If initialization vector was supplied use it, otherwise set it to None
+ # If initialization vector was supplied use it, otherwise set it to
+ # None
if nonce_iv:
iv_si = nss.SecItem(nonce_iv)
iv_param = nss.param_from_iv(mechanism, iv_si)