updates

komrade/backend/crypt.py

@@ -60,9 +60,8 @@ class Crypt(Logger):
         self.log('k_b2',type(k_b2),k_b2)
         # k_b = self.cell.encrypt(k_b)
         # prefix_b = self.force_binary(prefix)
-        k_b = self.hash(k_b2)
-        self.log(type(k_b),k_b)
-        return k_b
+        
+        return k_b2
 
     def package_val(self,k):
         k_b = self.force_binary(k)
@@ -82,6 +81,8 @@ class Crypt(Logger):
         self.log('set() k -->',prefix,k)
         k_b=self.package_key(k,prefix=prefix)
         self.log('set() k_b -->',k_b)
+        k_b_hash = self.hash(k_b)
+        self.log('k_b_hash',type(k_b_hash),k_b_hash)
 
         self.log('set() v -->',v)
         v_b=self.package_val(v)

komrade/backend/keymaker.py

@@ -414,11 +414,11 @@ class Keymaker(Logger):
         self.log('keys_to_save')
         
         if 'pubkey_encr' in keys_to_save:
-            self.crypt_keys.set(name,keychain['pubkey_encr'],prefix=b'/pubkey_encr/')
+            self.crypt_keys.set(name,keychain['pubkey_encr'],prefix='/pubkey_encr/')
         if 'privkey_encr' in keys_to_save:
-            self.crypt_keys.set(keychain['pubkey'],keychain['privkey_encr'],prefix=b'/privkey_encr/')
+            self.crypt_keys.set(keychain['pubkey'],keychain['privkey_encr'],prefix='/privkey_encr/')
         if 'adminkey_encr' in keys_to_save:
-            self.crypt_keys.set(keychain['privkey'],keychain['adminkey_encr'],prefix=b'/adminkey_encr/')
+            self.crypt_keys.set(keychain['privkey'],keychain['adminkey_encr'],prefix='/adminkey_encr/')
         stop
 
         # save decrypted keys?