From 90d3440a1e8db9527280a5ea559319cc4816a71a Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Mon, 8 Jul 2013 16:58:04 -0500
Subject: bcfg2-crypt: Fix path to Encryption module

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 src/sbin/bcfg2-crypt | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'src/sbin')

diff --git a/src/sbin/bcfg2-crypt b/src/sbin/bcfg2-crypt
index 24fcc69fb..6a92a0260 100755
--- a/src/sbin/bcfg2-crypt
+++ b/src/sbin/bcfg2-crypt
@@ -28,7 +28,7 @@ class CryptoTool(object):
     def __init__(self, filename, setup):
         self.setup = setup
         self.logger = logging.getLogger(self.__class__.__name__)
-        self.passphrases = Bcfg2.Encryption.get_passphrases(self.setup)
+        self.passphrases = Bcfg2.Server.Encryption.get_passphrases(self.setup)
 
         self.filename = filename
         try:
@@ -43,8 +43,9 @@ class CryptoTool(object):
 
     def _get_passphrase(self):
         """ get the passphrase for the current file """
-        if (not self.setup.cfp.has_section(Bcfg2.Encryption.CFG_SECTION) or
-            len(Bcfg2.Encryption.get_passphrases(self.setup)) == 0):
+        if (not self.setup.cfp.has_section(
+            Bcfg2.Server.Encryption.CFG_SECTION) or
+                len(Bcfg2.Server.Encryption.get_passphrases(self.setup)) == 0):
             raise PassphraseError("No passphrases available in %s" %
                                   self.setup['configfile'])
 
@@ -53,10 +54,10 @@ class CryptoTool(object):
             pname = self.setup['passphrase']
 
         if pname:
-            if self.setup.cfp.has_option(Bcfg2.Encryption.CFG_SECTION,
+            if self.setup.cfp.has_option(Bcfg2.Server.Encryption.CFG_SECTION,
                                          pname):
-                passphrase = self.setup.cfp.get(Bcfg2.Encryption.CFG_SECTION,
-                                                pname)
+                passphrase = self.setup.cfp.get(
+                    Bcfg2.Server.Encryption.CFG_SECTION, pname)
                 self.logger.debug("Using passphrase %s specified on command "
                                   "line" % pname)
                 return (pname, passphrase)
@@ -123,9 +124,9 @@ class CfgEncryptor(Encryptor):
                                   self.setup['configfile'])
 
     def encrypt(self):
-        return Bcfg2.Encryption.ssl_encrypt(
+        return Bcfg2.Server.Encryption.ssl_encrypt(
             self.data, self.passphrase,
-            Bcfg2.Encryption.get_algorithm(self.setup))
+            Bcfg2.Server.Encryption.get_algorithm(self.setup))
 
     def get_destination_filename(self, original_filename):
         return original_filename + ".crypt"
@@ -138,10 +139,10 @@ class CfgDecryptor(Decryptor):
         """ decrypt the given file, returning the plaintext data """
         if self.passphrase:
             try:
-                return Bcfg2.Encryption.ssl_decrypt(
+                return Bcfg2.Server.Encryption.ssl_decrypt(
                     self.data, self.passphrase,
-                    Bcfg2.Encryption.get_algorithm(self.setup))
-            except Bcfg2.Encryption.EVPError:
+                    Bcfg2.Server.Encryption.get_algorithm(self.setup))
+            except Bcfg2.Server.Encryption.EVPError:
                 self.logger.info("Could not decrypt %s with the "
                                  "specified passphrase" % self.filename)
                 return False
@@ -152,10 +153,11 @@ class CfgDecryptor(Decryptor):
                 return False
         else:  # no passphrase given, brute force
             try:
-                return Bcfg2.Encryption.bruteforce_decrypt(
+                return Bcfg2.Server.Encryption.bruteforce_decrypt(
                     self.data, passphrases=self.passphrases.values(),
-                    algorithm=Bcfg2.Encryption.get_algorithm(self.setup))
-            except Bcfg2.Encryption.EVPError:
+                    algorithm=Bcfg2.Server.Encryption.get_algorithm(
+                        self.setup))
+            except Bcfg2.Server.Encryption.EVPError:
                 self.logger.info("Could not decrypt %s with any passphrase" %
                                  self.filename)
 
@@ -244,9 +246,9 @@ class PropertiesEncryptor(Encryptor, PropertiesCryptoMixin):
             except PassphraseError:
                 self.logger.error(str(sys.exc_info()[1]))
                 return False
-            elt.text = Bcfg2.Encryption.ssl_encrypt(
+            elt.text = Bcfg2.Server.Encryption.ssl_encrypt(
                 elt.text, passphrase,
-                Bcfg2.Encryption.get_algorithm(self.setup)).strip()
+                Bcfg2.Server.Encryption.get_algorithm(self.setup)).strip()
             elt.set("encrypted", pname)
         return xdata
 
@@ -266,9 +268,9 @@ class PropertiesDecryptor(Decryptor, PropertiesCryptoMixin):
             except PassphraseError:
                 self.logger.error(str(sys.exc_info()[1]))
                 return False
-            decrypted = Bcfg2.Encryption.ssl_decrypt(
+            decrypted = Bcfg2.Server.Encryption.ssl_decrypt(
                 elt.text, passphrase,
-                Bcfg2.Encryption.get_algorithm(self.setup)).strip()
+                Bcfg2.Server.Encryption.get_algorithm(self.setup)).strip()
             try:
                 elt.text = decrypted.encode('ascii', 'xmlcharrefreplace')
                 elt.set("encrypted", pname)
@@ -430,7 +432,7 @@ def main():  # pylint: disable=R0912,R0915
             tool.write(data)
 
         if (setup['remove'] and
-            tool.get_destination_filename(fname) != fname):
+                tool.get_destination_filename(fname) != fname):
             try:
                 os.unlink(fname)
             except IOError:
-- 
cgit v1.2.3-1-g7c22