Remove unneeded Config namespace usages

[friendica.git] / src / Util / Crypto.php

diff --git a/src/Util/Crypto.php b/src/Util/Crypto.php
index 54c3049ca74faa679ea624b9bcc23f72c36f813e..3ac1c3b231640e82d024c51d0c60047c14db0097 100644 (file)
--- a/src/Util/Crypto.php
+++ b/src/Util/Crypto.php
@@ -4,14 +4,15 @@
  */
 namespace Friendica\Util;
 
-use Friendica\Core\Config;
-use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use ASN_BASE;
 use ASNValue;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Core\System;
+use Friendica\DI;
 
 /**
- * @brief Crypto class
+ * Crypto class
  */
 class Crypto
 {
@@ -25,7 +26,7 @@ class Crypto
        public static function rsaSign($data, $key, $alg = 'sha256')
        {
                if (empty($key)) {
-                       logger::warning('Empty key parameter', ['callstack' => System::callstack()]);
+                       Logger::warning('Empty key parameter', ['callstack' => System::callstack()]);
                }
                openssl_sign($data, $sig, $key, (($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg));
                return $sig;
@@ -41,7 +42,7 @@ class Crypto
        public static function rsaVerify($data, $sig, $key, $alg = 'sha256')
        {
                if (empty($key)) {
-                       logger::warning('Empty key parameter', ['callstack' => System::callstack()]);
+                       Logger::warning('Empty key parameter', ['callstack' => System::callstack()]);
                }
                return openssl_verify($data, $sig, $key, (($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg));
        }
@@ -208,8 +209,10 @@ class Crypto
 
                $r = ASN_BASE::parseASNString($x);
 
-               $m = Strings::base64UrlDecode($r[0]->asnData[1]->asnData[0]->asnData[0]->asnData);
-               $e = Strings::base64UrlDecode($r[0]->asnData[1]->asnData[0]->asnData[1]->asnData);
+               if (isset($r[0])) {
+                       $m = Strings::base64UrlDecode($r[0]->asnData[1]->asnData[0]->asnData[0]->asnData);
+                       $e = Strings::base64UrlDecode($r[0]->asnData[1]->asnData[0]->asnData[1]->asnData);
+               }
        }
 
        /**
@@ -237,7 +240,7 @@ class Crypto
                        'encrypt_key'      => false
                ];
 
-               $conf = Config::get('system', 'openssl_conf_file');
+               $conf = DI::config()->get('system', 'openssl_conf_file');
                if ($conf) {
                        $openssl_options['config'] = $conf;
                }