X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FRecord.pm;h=72745fe1364d71f12a2a161fcfa211a334a0bfd6;hb=0a72c5a56914d96452a823f7419bd3caf392e3b5;hp=ec0ba142febd43e03247eeee38a12180365b0766;hpb=004a6337cff05d08db7abc400e1c09430f000ac0;p=freeside.git

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index ec0ba142f..72745fe13 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -72,9 +72,9 @@ FS::UID->install_callback( sub {
   die $@ if $@;
   $conf = FS::Conf->new; 
   $conf_encryption           = $conf->exists('encryption');
-  $conf_encryptionmodule     = $conf->exists('encryptionmodule');
-  $conf_encryptionpublickey  = $conf->exists('encryptionpublickey');
-  $conf_encryptionprivatekey = $conf->exists('encryptionprivatekey');
+  $conf_encryptionmodule     = $conf->config('encryptionmodule');
+  $conf_encryptionpublickey  = join("\n",$conf->config('encryptionpublickey'));
+  $conf_encryptionprivatekey = join("\n",$conf->config('encryptionprivatekey'));
   $money_char = $conf->config('money_char') || '$';
   my $nw_coords = $conf->exists('geocode-require_nw_coordinates');
   $lat_lower = $nw_coords ? 1 : -90;
@@ -3137,14 +3137,12 @@ sub loadRSA {
     }
     # Initialize Encryption
     if ($conf_encryptionpublickey && $conf_encryptionpublickey ne '') {
-      my $public_key = join("\n",$conf_encryptionpublickey);
-      $rsa_encrypt = $rsa_module->new_public_key($public_key);
+      $rsa_encrypt = $rsa_module->new_public_key($conf_encryptionpublickey);
     }
     
     # Intitalize Decryption
     if ($conf_encryptionprivatekey && $conf_encryptionprivatekey ne '') {
-      my $private_key = join("\n",$conf_encryptionprivatekey);
-      $rsa_decrypt = $rsa_module->new_private_key($private_key);
+      $rsa_decrypt = $rsa_module->new_private_key($conf_encryptionprivatekey);
     }
 }