<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
namespace Friendica\Util;
-use ASNValue;
+use Exception;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\DI;
+use ParagonIE\ConstantTime\Base64UrlSafe;
use phpseclib\Crypt\RSA;
+use phpseclib\Math\BigInteger;
/**
* Crypto class
}
/**
- * @param string $Der der formatted string
- * @param bool $Private key type optional, default false
- * @return string
- */
- private static function DerToPem($Der, $Private = false)
- {
- //Encode:
- $Der = base64_encode($Der);
- //Split lines:
- $lines = str_split($Der, 65);
- $body = implode("\n", $lines);
- //Get title:
- $title = $Private ? 'RSA PRIVATE KEY' : 'PUBLIC KEY';
- //Add wrapping:
- $result = "-----BEGIN {$title}-----\n";
- $result .= $body . "\n";
- $result .= "-----END {$title}-----\n";
-
- return $result;
- }
-
- /**
- * @param string $Modulus modulo
- * @param string $PublicExponent exponent
- * @return string
- */
- private static function pkcs8Encode($Modulus, $PublicExponent)
- {
- //Encode key sequence
- $modulus = new ASNValue(ASNValue::TAG_INTEGER);
- $modulus->SetIntBuffer($Modulus);
- $publicExponent = new ASNValue(ASNValue::TAG_INTEGER);
- $publicExponent->SetIntBuffer($PublicExponent);
- $keySequenceItems = [$modulus, $publicExponent];
- $keySequence = new ASNValue(ASNValue::TAG_SEQUENCE);
- $keySequence->SetSequence($keySequenceItems);
- //Encode bit string
- $bitStringValue = $keySequence->Encode();
- $bitStringValue = chr(0x00) . $bitStringValue; //Add unused bits byte
- $bitString = new ASNValue(ASNValue::TAG_BITSTRING);
- $bitString->Value = $bitStringValue;
- //Encode body
- $bodyValue = "\x30\x0d\x06\x09\x2a\x86\x48\x86\xf7\x0d\x01\x01\x01\x05\x00" . $bitString->Encode();
- $body = new ASNValue(ASNValue::TAG_SEQUENCE);
- $body->Value = $bodyValue;
- //Get DER encoded public key:
- $PublicDER = $body->Encode();
- return $PublicDER;
- }
-
/**
* @param string $m modulo
* @param string $e exponent
*/
public static function meToPem($m, $e)
{
- $der = self::pkcs8Encode($m, $e);
- $key = self::DerToPem($der, false);
- return $key;
+ $rsa = new RSA();
+ $rsa->loadKey([
+ 'e' => new BigInteger($e, 256),
+ 'n' => new BigInteger($m, 256)
+ ]);
+ return $rsa->getPublicKey();
}
/**
*/
public static function rsaToPem(string $key)
{
- $publicKey = new RSA();
- $publicKey->setPublicKey($key);
+ $rsa = new RSA();
+ $rsa->setPublicKey($key);
- return $publicKey->getPublicKey(RSA::PUBLIC_FORMAT_PKCS8);
+ return $rsa->getPublicKey(RSA::PUBLIC_FORMAT_PKCS8);
}
/**
*
* @return void
*/
- public static function pemToMe(string $key, string &$modulus, string &$exponent)
+ public static function pemToMe(string $key, &$modulus, &$exponent)
{
- $publicKey = new RSA();
- $publicKey->loadKey($key);
- $publicKey->setPublicKey();
+ $rsa = new RSA();
+ $rsa->loadKey($key);
+ $rsa->setPublicKey();
- $modulus = $publicKey->modulus->toBytes();
- $exponent = $publicKey->exponent->toBytes();
+ $modulus = $rsa->modulus->toBytes();
+ $exponent = $rsa->exponent->toBytes();
}
/**
$result = openssl_pkey_new($openssl_options);
if (empty($result)) {
- Logger::log('new_keypair: failed');
+ Logger::notice('new_keypair: failed');
return false;
}
return $response;
}
+ /**
+ * Create a new elliptic curve key pair
+ *
+ * @return array with the elements "prvkey", "pubkey", "vapid-public" and "vapid-private"
+ */
+ public static function newECKeypair()
+ {
+ $openssl_options = [
+ 'curve_name' => 'prime256v1',
+ 'private_key_type' => OPENSSL_KEYTYPE_EC
+ ];
+
+ $conf = DI::config()->get('system', 'openssl_conf_file');
+ if ($conf) {
+ $openssl_options['config'] = $conf;
+ }
+ $result = openssl_pkey_new($openssl_options);
+
+ if (empty($result)) {
+ throw new Exception('Key creation failed');
+ }
+
+ $response = ['prvkey' => '', 'pubkey' => ''];
+
+ // Get private key
+ openssl_pkey_export($result, $response['prvkey']);
+
+ // Get public key
+ $pkey = openssl_pkey_get_details($result);
+ $response['pubkey'] = $pkey['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-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;
+ }
+
/**
* Encrypt a string with 'aes-256-cbc' cipher method.
- *
+ *
* Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
- *
+ *
* @param string $data
* @param string $key The key used for encryption.
* @param string $iv A non-NULL Initialization Vector.
- *
+ *
* @return string|boolean Encrypted string or false on failure.
*/
private static function encryptAES256CBC($data, $key, $iv)
/**
* Decrypt a string with 'aes-256-cbc' cipher method.
- *
+ *
* Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
- *
+ *
* @param string $data
* @param string $key The key used for decryption.
* @param string $iv A non-NULL Initialization Vector.
- *
+ *
* @return string|boolean Decrypted string or false on failure.
*/
private static function decryptAES256CBC($data, $key, $iv)
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';
projects / friendica.git / blobdiff