use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Logger;
+use Friendica\Util\Strings;
use ASN_BASE;
use ASNValue;
$r = ASN_BASE::parseASNString($x);
- $m = base64url_decode($r[0]->asnData[0]->asnData);
- $e = base64url_decode($r[0]->asnData[1]->asnData);
+ $m = Strings::base64UrlDecode($r[0]->asnData[0]->asnData);
+ $e = Strings::base64UrlDecode($r[0]->asnData[1]->asnData);
}
/**
$r = ASN_BASE::parseASNString($x);
- $m = base64url_decode($r[0]->asnData[1]->asnData[0]->asnData[0]->asnData);
- $e = base64url_decode($r[0]->asnData[1]->asnData[0]->asnData[1]->asnData);
+ $m = Strings::base64UrlDecode($r[0]->asnData[1]->asnData[0]->asnData[0]->asnData);
+ $e = Strings::base64UrlDecode($r[0]->asnData[1]->asnData[0]->asnData[1]->asnData);
}
/**
$result = ['encrypted' => true];
$key = random_bytes(256);
$iv = random_bytes(256);
- $result['data'] = base64url_encode(self::$fn($data, $key, $iv), true);
+ $result['data'] = Strings::base64UrlEncode(self::$fn($data, $key, $iv), true);
// log the offending call so we can track it down
if (!openssl_public_encrypt($key, $k, $pubkey)) {
}
$result['alg'] = $alg;
- $result['key'] = base64url_encode($k, true);
+ $result['key'] = Strings::base64UrlEncode($k, true);
openssl_public_encrypt($iv, $i, $pubkey);
- $result['iv'] = base64url_encode($i, true);
+ $result['iv'] = Strings::base64UrlEncode($i, true);
return $result;
} else {
$key = random_bytes(32);
$iv = random_bytes(16);
$result = ['encrypted' => true];
- $result['data'] = base64url_encode(self::encryptAES256CBC($data, $key, $iv), true);
+ $result['data'] = Strings::base64UrlEncode(self::encryptAES256CBC($data, $key, $iv), true);
// log the offending call so we can track it down
if (!openssl_public_encrypt($key, $k, $pubkey)) {
}
$result['alg'] = 'aes256cbc';
- $result['key'] = base64url_encode($k, true);
+ $result['key'] = Strings::base64UrlEncode($k, true);
openssl_public_encrypt($iv, $i, $pubkey);
- $result['iv'] = base64url_encode($i, true);
+ $result['iv'] = Strings::base64UrlEncode($i, true);
return $result;
}
$fn = 'decrypt' . strtoupper($alg);
if (method_exists(__CLASS__, $fn)) {
- openssl_private_decrypt(base64url_decode($data['key']), $k, $prvkey);
- openssl_private_decrypt(base64url_decode($data['iv']), $i, $prvkey);
+ openssl_private_decrypt(Strings::base64UrlDecode($data['key']), $k, $prvkey);
+ openssl_private_decrypt(Strings::base64UrlDecode($data['iv']), $i, $prvkey);
- return self::$fn(base64url_decode($data['data']), $k, $i);
+ return self::$fn(Strings::base64UrlDecode($data['data']), $k, $i);
} else {
$x = ['data' => $data, 'prvkey' => $prvkey, 'alg' => $alg, 'result' => $data];
Addon::callHooks('other_unencapsulate', $x);
*/
private static function unencapsulateAes($data, $prvkey)
{
- openssl_private_decrypt(base64url_decode($data['key']), $k, $prvkey);
- openssl_private_decrypt(base64url_decode($data['iv']), $i, $prvkey);
+ openssl_private_decrypt(Strings::base64UrlDecode($data['key']), $k, $prvkey);
+ openssl_private_decrypt(Strings::base64UrlDecode($data['iv']), $i, $prvkey);
- return self::decryptAES256CBC(base64url_decode($data['data']), $k, $i);
+ return self::decryptAES256CBC(Strings::base64UrlDecode($data['data']), $k, $i);
}
*
* @param string $digits The count of digits
* @return int The random Digits
+ *
+ * @throws \Exception In case 'random_int' isn't usable
*/
public static function randomDigits($digits)
{
$rn = '';
- if (!function_exists('random_int')) {
- // using rand() function for PHP 5.x compatibility
- for ($i = 0; $i < $digits; $i++) {
- $rn .= rand(0, 9);
- }
- } else {
- // generating cryptographically secure pseudo-random integers
- for ($i = 0; $i < $digits; $i++) {
- $rn .= random_int(0, 9);
- }
+ // generating cryptographically secure pseudo-random integers
+ for ($i = 0; $i < $digits; $i++) {
+ $rn .= random_int(0, 9);
}
return $rn;