X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FCrypto.php;h=1b84a92f64a3f9e6ae7bcaa0815fc7a271b77432;hb=e52e505a481ed6f7e3766725d709b5f0653b036b;hp=54c3049ca74faa679ea624b9bcc23f72c36f813e;hpb=3237dab1a419c08ebcbe3948c33247b91308eae8;p=friendica.git

diff --git a/src/Util/Crypto.php b/src/Util/Crypto.php
index 54c3049ca7..1b84a92f64 100644
--- a/src/Util/Crypto.php
+++ b/src/Util/Crypto.php
@@ -1,17 +1,35 @@
 <?php
 /**
- * @file src/Util/Crypto.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 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 +43,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 +59,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 +226,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 +257,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;
 		}