GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

converted sign, verify and fromString to new crypt lib

Browse Source
This commit is contained in:
James Walker 2010-03-12 19:34:45 -05:00
parent 41d2ff662c
commit 23d44c7d59
1 changed files with 31 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
plugins/OStatus/classes/Magicsig.php
View File

@ -40,8 +40,9 @@ class Magicsig extends Memcached_DataObject
public $keypair; public $keypair;
public $alg; public $alg;
private $_rsa; private $publicKey;
private $privateKey;
public function __construct($alg = 'RSA-SHA256') public function __construct($alg = 'RSA-SHA256')
{ {
$this->alg = $alg; $this->alg = $alg;
@ -101,15 +102,7 @@ class Magicsig extends Memcached_DataObject
public function generate($user_id, $key_length = 512) public function generate($user_id, $key_length = 512)
{ {
PEAR::pushErrorHandling(PEAR_ERROR_RETURN); // @fixme new key generation
$keypair = new Crypt_RSA_KeyPair($key_length);
$params['public_key'] = $keypair->getPublicKey();
$params['private_key'] = $keypair->getPrivateKey();
$this->_rsa = new Crypt_RSA($params);
PEAR::popErrorHandling();
$this->user_id = $user_id; $this->user_id = $user_id;
$this->insert(); $this->insert();
} }
@ -132,8 +125,6 @@ class Magicsig extends Memcached_DataObject
public static function fromString($text) public static function fromString($text)
{ {
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
$magic_sig = new Magicsig(); $magic_sig = new Magicsig();
// remove whitespace // remove whitespace
@ -144,35 +135,40 @@ class Magicsig extends Memcached_DataObject
return false; return false;
} }
$mod = base64_url_decode($matches[1]); $mod = $matches[1];
$exp = base64_url_decode($matches[2]); $exp = $matches[2];
if (!empty($matches[4])) { if (!empty($matches[4])) {
$private_exp = base64_url_decode($matches[4]); $private_exp = $matches[4];
} else { } else {
$private_exp = false; $private_exp = false;
} }
$params['public_key'] = new Crypt_RSA_KEY($mod, $exp, 'public'); $magic_sig->loadKey($mod, $exp, 'public');
if ($params['public_key']->isError()) {
$error = $params['public_key']->getLastError();
common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
return false;
}
if ($private_exp) { if ($private_exp) {
$params['private_key'] = new Crypt_RSA_KEY($mod, $private_exp, 'private'); $magic_sig->loadKey($mod, $private_exp, 'private');
if ($params['private_key']->isError()) {
$error = $params['private_key']->getLastError();
common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
return false;
}
} }
$magic_sig->_rsa = new Crypt_RSA($params);
PEAR::popErrorHandling();
return $magic_sig; return $magic_sig;
} }
public function loadKey($mod, $exp, $type = 'public')
{
common_log(LOG_DEBUG, "Adding ".$type." key: (".$mod .', '. $exp .")");
$rsa = new Crypt_RSA();
$rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
$rsa->setHash('sha256');
$rsa->modulus = new Math_BigInteger(base64_url_decode($mod), 256);
$rsa->k = strlen($rsa->modulus->toBytes());
$rsa->exponent = new Math_BigInteger(base64_url_decode($exp), 256);
if ($type == 'private') {
$this->privateKey = $rsa;
} else {
$this->publicKey = $rsa;
}
}
public function getName() public function getName()
{ {
return $this->alg; return $this->alg;
@ -190,38 +186,18 @@ class Magicsig extends Memcached_DataObject
public function sign($bytes) public function sign($bytes)
{ {
$hash = $this->getHash(); $sig = $this->privateKey->sign($bytes);
$sig = $this->_rsa->createSign($bytes, null, $hash); return base64_url_encode($sig);
if ($this->_rsa->isError()) {
$error = $this->_rsa->getLastError();
common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
return false;
}
return $sig;
} }
public function verify($signed_bytes, $signature) public function verify($signed_bytes, $signature)
{ {
$hash = $this->getHash(); $signature = base64_url_decode($signature);
$result = $this->_rsa->validateSign($signed_bytes, $signature, null, $hash); return $this->publicKey->verify($signed_bytes, $signature);
if ($this->_rsa->isError()) {
$error = $this->keypair->getLastError();
common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
return false;
}
return $result;
} }
} }
// Define a sha256 function for hashing
// (Crypt_RSA should really be updated to use hash() )
function magicsig_sha256($bytes)
{
return hash('sha256', $bytes);
}
function base64_url_encode($input) function base64_url_encode($input)
{ {
return strtr(base64_encode($input), '+/', '-_'); return strtr(base64_encode($input), '+/', '-_');