projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
49a6b09
)
don't look up encryption config every record, RT#28526
author
Ivan Kohler
<ivan@freeside.biz>
Sun, 17 May 2015 23:25:19 +0000
(16:25 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Sun, 17 May 2015 23:25:19 +0000
(16:25 -0700)
FS/FS/Record.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Record.pm
b/FS/FS/Record.pm
index
b2ab713
..
70d4f67
100644
(file)
--- 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 = 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;
$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 '') {
}
# 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 '') {
}
# 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);
}
}
}
}