diff options
author | Mario <mario@mariovavti.com> | 2024-03-24 09:58:21 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2024-03-24 09:58:21 +0000 |
commit | a0cfe22501dc9daa7dd8cff86803cf494a1f5ec3 (patch) | |
tree | e156db21df2251b8c67e61453c8f4af9f9460d2f /include/crypto.php | |
parent | ecdd9a4d6edd769a3e2c3b0604e4637d94fa1a51 (diff) | |
parent | 0dc959d9fe40bddce5e99b8162bb0e770fc28ed9 (diff) | |
download | volse-hubzilla-a0cfe22501dc9daa7dd8cff86803cf494a1f5ec3.tar.gz volse-hubzilla-a0cfe22501dc9daa7dd8cff86803cf494a1f5ec3.tar.bz2 volse-hubzilla-a0cfe22501dc9daa7dd8cff86803cf494a1f5ec3.zip |
Merge branch 'deprecate-include-config-in-core' into 'dev'
Deprecate *_config() functions in core.
See merge request hubzilla/core!2114
Diffstat (limited to 'include/crypto.php')
-rw-r--r-- | include/crypto.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/crypto.php b/include/crypto.php index 40e68a4e7..4d50310fb 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -1,5 +1,7 @@ <?php /** @file */ +use Zotlabs\Lib\Config; + require_once('library/ASNValue.class.php'); require_once('library/asn1.php'); @@ -282,7 +284,7 @@ function new_keypair($bits) { 'encrypt_key' => false ); - $conf = get_config('system','openssl_conf_file'); + $conf = Config::Get('system','openssl_conf_file'); if($conf) $openssl_options['config'] = $conf; @@ -460,12 +462,12 @@ function convert_salmon_key($key) { function z_obscure($s) { - return json_encode(crypto_encapsulate($s,get_config('system','pubkey'))); + return json_encode(crypto_encapsulate($s,Config::Get('system','pubkey'))); } function z_unobscure($s) { if(strpos($s,"{\"") !== 0) return $s; - return crypto_unencapsulate(json_decode($s,true),get_config('system','prvkey')); + return crypto_unencapsulate(json_decode($s,true),Config::Get('system','prvkey')); } |