diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-12 15:47:19 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-12 15:47:19 -0500 |
| commit | 05929147dde2239ee0078359bd62b1ea5a884d86 (patch) | |
| tree | beba880dfd02b64c61a58ae196cfdc2cbe4dfa46 /src/lib/Bcfg2/Server/Encryption.py | |
| parent | 2b6824857c4ab80e3e791edf82aee3e75e037316 (diff) | |
| parent | 30882ba70ad627f89ab89af6ffc77cda08de8773 (diff) | |
| download | bcfg2-05929147dde2239ee0078359bd62b1ea5a884d86.tar.gz bcfg2-05929147dde2239ee0078359bd62b1ea5a884d86.tar.bz2 bcfg2-05929147dde2239ee0078359bd62b1ea5a884d86.zip | |
Merge branch 'maint'
Conflicts:
src/lib/Bcfg2/Server/Admin/Reports.py
src/lib/Bcfg2/Server/Hostbase/hostbase/urls.py
src/lib/Bcfg2/Server/Hostbase/urls.py
src/sbin/bcfg2-crypt
tools/upgrade/1.3/migrate_dbstats.py
Diffstat (limited to 'src/lib/Bcfg2/Server/Encryption.py')
| -rwxr-xr-x | src/lib/Bcfg2/Server/Encryption.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Encryption.py b/src/lib/Bcfg2/Server/Encryption.py index f30144d13..f8b602d90 100755 --- a/src/lib/Bcfg2/Server/Encryption.py +++ b/src/lib/Bcfg2/Server/Encryption.py @@ -444,7 +444,7 @@ class PropertiesDecryptor(Decryptor, PropertiesCryptoMixin): default_xpath = '//*[@encrypted]' def decrypt(self): - decrypted = False + decrypted_any = False xdata = lxml.etree.XML(self.data, parser=XMLParser) for elt in self._get_elements(xdata): try: @@ -456,7 +456,7 @@ class PropertiesDecryptor(Decryptor, PropertiesCryptoMixin): decrypted = ssl_decrypt(elt.text, passphrase).strip() elt.text = decrypted.encode('ascii', 'xmlcharrefreplace') elt.set("encrypted", pname) - decrypted = True + decrypted_any = True except (EVPError, TypeError): self.logger.error("Could not decrypt %s, skipping" % print_xml(elt)) @@ -468,7 +468,7 @@ class PropertiesDecryptor(Decryptor, PropertiesCryptoMixin): # a different key, and wound up with gibberish. self.logger.warning("Decrypted %s to gibberish, skipping" % elt.tag) - if decrypted: + if decrypted_any: return xdata else: raise DecryptError("Failed to decrypt any data in %s" % |