<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
namespace Friendica\Util;
+use Exception;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\System;
$result = openssl_pkey_new($openssl_options);
if (empty($result)) {
- Logger::log('new_keypair: failed');
+ Logger::notice('new_keypair: failed');
return false;
}
/**
* Create a new elliptic curve key pair
*
- * @return array with the elements "prvkey", "vapid" and "pubkey"
+ * @return array with the elements "prvkey", "pubkey", "vapid-public" and "vapid-private"
*/
public static function newECKeypair()
{
$result = openssl_pkey_new($openssl_options);
if (empty($result)) {
- Logger::notice('new_keypair: failed');
- return [];
+ throw new Exception('Key creation failed');
}
- $response = ['prvkey' => '', 'pubkey' => '', 'vapid' => ''];
+ $response = ['prvkey' => '', 'pubkey' => ''];
// Get private key
openssl_pkey_export($result, $response['prvkey']);
$pkey = openssl_pkey_get_details($result);
$response['pubkey'] = $pkey['key'];
- // Create VAPID key
+ // Create VAPID keys
// @see https://github.com/web-push-libs/web-push-php/blob/256a18b2a2411469c94943725fb6eccb9681bd75/src/Utils.php#L60-L62
$hexString = '04';
$hexString .= str_pad(bin2hex($pkey['ec']['x']), 64, '0', STR_PAD_LEFT);
$hexString .= str_pad(bin2hex($pkey['ec']['y']), 64, '0', STR_PAD_LEFT);
- $response['vapid'] = Base64UrlSafe::encode(hex2bin($hexString));
+ $response['vapid-public'] = Base64UrlSafe::encode(hex2bin($hexString));
+
+ // @see https://github.com/web-push-libs/web-push-php/blob/256a18b2a2411469c94943725fb6eccb9681bd75/src/VAPID.php
+ $response['vapid-private'] = Base64UrlSafe::encode(hex2bin(str_pad(bin2hex($pkey['ec']['d']), 64, '0', STR_PAD_LEFT)));
return $response;
}
private static function encapsulateOther($data, $pubkey, $alg)
{
if (!$pubkey) {
- Logger::log('no key. data: '.$data);
+ Logger::notice('no key. data: '.$data);
}
$fn = 'encrypt' . strtoupper($alg);
if (method_exists(__CLASS__, $fn)) {
private static function encapsulateAes($data, $pubkey)
{
if (!$pubkey) {
- Logger::log('aes_encapsulate: no key. data: ' . $data);
+ Logger::notice('aes_encapsulate: no key. data: ' . $data);
}
$key = random_bytes(32);
// log the offending call so we can track it down
if (!openssl_public_encrypt($key, $k, $pubkey)) {
$x = debug_backtrace();
- Logger::log('aes_encapsulate: RSA failed. ' . print_r($x[0], true));
+ Logger::notice('aes_encapsulate: RSA failed.', ['data' => $x[0]]);
}
$result['alg'] = 'aes256cbc';