summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-12 10:35:07 +0000
committerGerrit Code Review <review@openstack.org>2018-11-12 10:35:07 +0000
commit1f59d7e1e082bf45ff2d566a9e83c1f7bc001d6f (patch)
treea6d3a2edbb8a72e07b86b1d73cab4249eaaa3716
parent03634de6c8121b34c7c17c1bdbf2f4e71db310a7 (diff)
parenta0be40846c00a03275db3583b5a0ace7d977e265 (diff)
Merge "Remove the duplicated "and"."
-rw-r--r--pegleg/engine/util/encryption.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pegleg/engine/util/encryption.py b/pegleg/engine/util/encryption.py
index a434702..c84f61d 100644
--- a/pegleg/engine/util/encryption.py
+++ b/pegleg/engine/util/encryption.py
@@ -101,7 +101,7 @@ def decrypt(encrypted_data,
101def _generate_key(passphrase, salt, key_length, iterations): 101def _generate_key(passphrase, salt, key_length, iterations):
102 """ 102 """
103 Use the passphrase and salt and PBKDF2HMAC key derivation algorithm, 103 Use the passphrase and salt and PBKDF2HMAC key derivation algorithm,
104 to generate and and return a Fernet key to be used for encryption and 104 to generate and return a Fernet key to be used for encryption and
105 decryption of secret data. 105 decryption of secret data.
106 106
107 :param passphrase: Passphrase to use to generate decryption key. Must be 107 :param passphrase: Passphrase to use to generate decryption key. Must be