diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-24 15:44:06 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-25 10:45:14 -0400 |
| commit | 044213c789c4f1ee214da3d70f02352b1aaa8673 (patch) | |
| tree | feb62ab035d27773f20be1e052a177c0c61299aa /src/lib/Bcfg2/Server/Plugins/Cfg | |
| parent | 0ff6b2788de683dd89203c7ae1393ea922a62c32 (diff) | |
| download | bcfg2-044213c789c4f1ee214da3d70f02352b1aaa8673.tar.gz bcfg2-044213c789c4f1ee214da3d70f02352b1aaa8673.tar.bz2 bcfg2-044213c789c4f1ee214da3d70f02352b1aaa8673.zip | |
Fixing unit tests
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py index 735f23a1c..862726788 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py @@ -51,7 +51,7 @@ class CfgPrivateKeyCreator(CfgCreator, StructFile): if (HAS_CRYPTO and self.setup.cfp.has_section("sshkeys") and self.setup.cfp.has_option("sshkeys", "passphrase")): - return Bcfg2.Encrypption.get_passphrases()[ + return Bcfg2.Server.Encryption.get_passphrases()[ self.setup.cfp.get("sshkeys", "passphrase")] return None @@ -196,7 +196,8 @@ class CfgPrivateKeyCreator(CfgCreator, StructFile): privkey = open(filename).read() if HAS_CRYPTO and self.passphrase: self.debug_log("Cfg: Encrypting key data at %s" % filename) - privkey = ssl_encrypt(privkey, self.passphrase) + privkey = Bcfg2.Server.Encryption.ssl_encrypt(privkey, + self.passphrase) specificity['ext'] = '.crypt' self.write_data(privkey, **specificity) |