Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 23:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Crypto to src

Browse source 
move Crypto to src and Friendica\Util namespace
This commit is contained in:
Adam Magness 2017-12-30 11:51:49 -05:00
parent 6d6d83012c
commit 9e6bf79380
15 changed files with 317 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Model/User.php
View file

@ -16,11 +16,11 @@ use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\Photo;
use Friendica\Object\Image;
use Friendica\Util\Crypto;
use dba;
use Exception;
require_once 'boot.php';
require_once 'include/crypto.php';
require_once 'include/dba.php';
require_once 'include/enotify.php';
require_once 'include/network.php';
@ -299,7 +299,7 @@ class User
$return['password'] = $new_password;
$keys = new_keypair(4096);
$keys = Crypto::newKeypair(4096);
if ($keys === false) {
throw new Exception(t('SERIOUS ERROR: Generation of security keys failed.'));
}
@ -308,7 +308,7 @@ class User
$pubkey = $keys['pubkey'];
// Create another keypair for signing/verifying salmon protocol messages.
$sres = new_keypair(512);
$sres = Crypto::newKeypair(512);
$sprvkey = $sres['prvkey'];
$spubkey = $sres['pubkey'];