From 265dc4215e3157df1a267abc98ac5fbfeef789cb Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Sat, 2 Nov 2013 17:35:58 -0400 Subject: [PATCH] Correct issues with the attempted merge of crypto and configmanager --- confluent/config/configmanager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/confluent/config/configmanager.py b/confluent/config/configmanager.py index da8009cf..a62609d3 100644 --- a/confluent/config/configmanager.py +++ b/confluent/config/configmanager.py @@ -102,7 +102,7 @@ def _format_key(key, passphrase=None): def init_masterkey(passphrase=None): global _masterkey global _masterintegritykey - cfgn = configmanager.get_global('master_privacy_key') + cfgn = get_global('master_privacy_key') if cfgn: _masterkey = _get_protected_key(cfgn, passphrase=passphrase) @@ -111,7 +111,7 @@ def init_masterkey(passphrase=None): configmanager.set_global('master_privacy_key', _format_key( _masterkey, passphrase=passphrase)) - cfgn = configmanager.get_global('master_integrity_key') + cfgn = get_global('master_integrity_key') if cfgn: _masterintegritykey = _get_protected_key(cfgn, passphrase=passphrase) else: