diff options
author | Mario Vavti <mario@mariovavti.com> | 2016-03-26 18:46:07 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2016-03-26 18:46:07 +0100 |
commit | f714e97d63e61dfda77f4d4ab4eb2b5b5fb06737 (patch) | |
tree | f1c439e3ca9d01f82a29629222e1afc603d194b8 /include/crypto.php | |
parent | a50706317435d09cacb95cad0a6ccaf8ae5b5f6c (diff) | |
parent | 3caf51b0754741dac2450a492de5aaebfa1b2fe9 (diff) | |
download | volse-hubzilla-f714e97d63e61dfda77f4d4ab4eb2b5b5fb06737.tar.gz volse-hubzilla-f714e97d63e61dfda77f4d4ab4eb2b5b5fb06737.tar.bz2 volse-hubzilla-f714e97d63e61dfda77f4d4ab4eb2b5b5fb06737.zip |
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'include/crypto.php')
-rw-r--r-- | include/crypto.php | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/include/crypto.php b/include/crypto.php index 3cddc7581..d82ee5114 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -308,11 +308,33 @@ function metorsa($m,$e) { return $key; } + + function salmon_key($pubkey) { pemtome($pubkey,$m,$e); return 'RSA' . '.' . base64url_encode($m,true) . '.' . base64url_encode($e,true) ; } + +function convert_salmon_key($key) { + + if(strstr($key,',')) + $rawkey = substr($key,strpos($key,',')+1); + else + $rawkey = substr($key,5); + + $key_info = explode('.',$rawkey); + + $m = base64url_decode($key_info[1]); + $e = base64url_decode($key_info[2]); + + logger('key details: ' . print_r($key_info,true), LOGGER_DATA); + $salmon_key = metopem($m,$e); + return $salmon_key; + +} + + function z_obscure($s) { return json_encode(crypto_encapsulate($s,get_config('system','pubkey'))); } @@ -322,3 +344,4 @@ function z_unobscure($s) { return $s; return crypto_unencapsulate(json_decode($s,true),get_config('system','prvkey')); } + |