From 19f14e6bd219e7761202269491f062a600a9866f Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 24 Jan 2013 13:10:00 -0500 Subject: don't treat "encrypt" setting as an encryption passphrase --- src/lib/Bcfg2/Encryption.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Encryption.py') diff --git a/src/lib/Bcfg2/Encryption.py b/src/lib/Bcfg2/Encryption.py index 1eb5aaeb2..2b4ba6237 100755 --- a/src/lib/Bcfg2/Encryption.py +++ b/src/lib/Bcfg2/Encryption.py @@ -36,6 +36,9 @@ CFG_SECTION = "encryption" #: The config option used to store the algorithm CFG_ALGORITHM = "algorithm" +#: The config option used to store the decryption strictness +CFG_DECRYPT = "decrypt" + Rand.rand_seed(os.urandom(1024)) @@ -177,7 +180,7 @@ def get_passphrases(setup): if setup.cfp.has_section(section): return dict([(o, setup.cfp.get(section, o)) for o in setup.cfp.options(section) - if o != CFG_ALGORITHM]) + if o not in [CFG_ALGORITHM, CFG_DECRYPT]]) else: return dict() -- cgit v1.2.3-1-g7c22