summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangzs <zhangzhaoshan@inspur.com>2018-11-12 17:12:06 +0800
committerzhangzs <zhangzhaoshan@inspur.com>2018-11-12 17:15:51 +0800
commita0be40846c00a03275db3583b5a0ace7d977e265 (patch)
tree2fa9866783f2691071217310bb872e6778f49de2
parentd7740b0f405c6f90e186f5dc6f943a18cf870299 (diff)
Remove the duplicated "and".
Notes
Notes (review): Code-Review+2: Matt McEuen <matt.mceuen@att.com> Code-Review+2: Roman Gorshunov <roman.gorshunov@att.com> Workflow+1: Roman Gorshunov <roman.gorshunov@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 12 Nov 2018 10:35:07 +0000 Reviewed-on: https://review.openstack.org/617257 Project: openstack/airship-pegleg Branch: refs/heads/master
-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