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

Magicsig gets toFingerprint function.

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-06-06 14:33:43 +02:00
parent e212f2ae77
commit c5f79fd2f3
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,18 +178,30 @@ class Magicsig extends Managed_DataObject
* @param boolean $full_pair set to true to include the private key. * @param boolean $full_pair set to true to include the private key.
* @return string * @return string
*/ */
public function toString($full_pair=false) public function toString($full_pair=false, $base64url=true)
{ {
$mod = Magicsig::base64_url_encode($this->publicKey->modulus->toBytes()); $base64_func = $base64url ? 'Magicsig::base64_url_encode' : 'base64_encode';
$exp = Magicsig::base64_url_encode($this->publicKey->exponent->toBytes()); $mod = call_user_func($base64_func, $this->publicKey->modulus->toBytes());
$exp = call_user_func($base64_func, $this->publicKey->exponent->toBytes());
$private_exp = ''; $private_exp = '';
if ($full_pair && $this->privateKey instanceof Crypt_RSA && $this->privateKey->exponent->toBytes()) { if ($full_pair && $this->privateKey instanceof Crypt_RSA && $this->privateKey->exponent->toBytes()) {
$private_exp = '.' . Magicsig::base64_url_encode($this->privateKey->exponent->toBytes()); $private_exp = '.' . call_user_func($base64_func, $this->privateKey->exponent->toBytes());
} }
return 'RSA.' . $mod . '.' . $exp . $private_exp; return 'RSA.' . $mod . '.' . $exp . $private_exp;
} }
public function toFingerprint()
{
// This assumes a specific behaviour from toString, to format as such:
// "RSA." + base64(pubkey.modulus_as_bytes) + "." + base64(pubkey.exponent_as_bytes)
// We don't want the base64 string to be the "url encoding" version because it is not
// as common in programming libraries. And we want it to be base64 encoded since ASCII
// representation avoids any problems with NULL etc. in less forgiving languages.
return strtolower(hash('sha256', $this->toString(false, false)));
}
public function exportPublicKey($format=CRYPT_RSA_PUBLIC_FORMAT_PKCS1) public function exportPublicKey($format=CRYPT_RSA_PUBLIC_FORMAT_PKCS1)
{ {
$this->publicKey->setPublicKey(); $this->publicKey->setPublicKey();