[freeside-commits] branch master updated. 5a91330e742c446db18ce801ed48245100796f95

[Ivan]

The branch, master has been updated
       via  5a91330e742c446db18ce801ed48245100796f95 (commit)
      from  49a6b0927001edb259a858841dd529e42fa58880 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5a91330e742c446db18ce801ed48245100796f95
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun May 17 16:25:19 2015 -0700

    don't look up encryption config every record, RT#28526

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index b2ab713..70d4f67 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -66,8 +66,8 @@ FS::UID->install_callback( sub {
   $conf = FS::Conf->new; 
   $conf_encryption           = $conf->exists('encryption');
   $conf_encryptionmodule     = $conf->config('encryptionmodule');
-  $conf_encryptionpublickey  = $conf->config('encryptionpublickey');
-  $conf_encryptionprivatekey = $conf->config('encryptionprivatekey');
+  $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;
@@ -3293,14 +3293,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);
     }
 }
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Record.pm |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)