X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcrypto.php;h=dfc44c1792dfc4f056e7cc05cbe935a374a42f61;hb=343f22e02fc9540f41c61c318c554505d730e699;hp=4600e7291b7c3ec27622bbb4af64c02f5dfcb22c;hpb=7cd795d795286c99f52c7fdc689912cdf52fd5c2;p=friendica.git

diff --git a/include/crypto.php b/include/crypto.php
index 4600e7291b..dfc44c1792 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -1,5 +1,7 @@
 <?php
 
+use Friendica\Core\Config;
+
 require_once 'library/ASNValue.class.php';
 require_once 'library/asn1.php';
 
@@ -89,9 +91,9 @@ function metopem($m, $e) {
 	return $key;
 }
 
-function pubrsatome($key,&$m,&$e) {
-	require_once('library/asn1.php');
-	require_once('include/salmon.php');
+function pubrsatome($key, &$m, &$e)
+{
+	require_once 'library/asn1.php';
 
 	$lines = explode("\n", $key);
 	unset($lines[0]);
@@ -115,8 +117,8 @@ function pemtorsa($key) {
 	return metorsa($m, $e);
 }
 
-function pemtome($key, &$m, &$e) {
-	require_once('include/salmon.php');
+function pemtome($key, &$m, &$e)
+{
 	$lines = explode("\n", $key);
 	unset($lines[0]);
 	unset($lines[count($lines)]);
@@ -146,7 +148,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;
 	}