harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OAEP padding mismatch on some newer encryption methods

Browse Source
This commit is contained in:
zotlabs 2018-02-19 15:44:18 -08:00
parent a310cb2fbb
commit b6b4827680
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/crypto.php
View File

@ -126,11 +126,11 @@ function other_encapsulate($data,$pubkey,$alg) {
if(strpos($alg,'.oaep')) {
$oaep = true;
$alg = substr($alg,0,-5);
$subalg = substr($alg,0,-5);
}
$fn = strtoupper($alg) . '_encrypt';
$fn = strtoupper($subalg) . '_encrypt';
if(function_exists($fn)) {
// A bit hesitant to use openssl_random_pseudo_bytes() as we know
@ -160,7 +160,7 @@ function other_encapsulate($data,$pubkey,$alg) {
return $result;
}
else {
$x = [ 'data' => $data, 'pubkey' => $pubkey, 'alg' => $alg, 'result' => $data ];
$x = [ 'data' => $data, 'pubkey' => $pubkey, 'alg' => $subalg, 'result' => $data ];
call_hooks('other_encapsulate', $x);
return $x['result'];
}
@ -215,6 +215,7 @@ function aes_encapsulate($data,$pubkey) {
function crypto_unencapsulate($data,$prvkey) {
if(! $data)
return;
$alg = ((array_key_exists('alg',$data)) ? $data['alg'] : 'aes256cbc');
if($alg === 'aes256cbc')
return aes_unencapsulate($data,$prvkey);
@ -229,18 +230,18 @@ function other_unencapsulate($data,$prvkey,$alg) {
if(strpos($alg,'.oaep')) {
$oaep = true;
$alg = substr($alg,0,-5);
$subalg = substr($alg,0,-5);
}
$fn = strtoupper($alg) . '_decrypt';
$fn = strtoupper($subalg) . '_decrypt';
if(function_exists($fn)) {
openssl_private_decrypt(base64url_decode($data['key']),$k,$prvkey,(($oaep) ? OPENSSL_PKCS1_OAEP_PADDING : OPENSSL_PKCS1_PADDING));
openssl_private_decrypt(base64url_decode($data['iv']),$i,$prvkey,(($oaep) ? OPENSSL_PKCS1_OAEP_PADDING : OPENSSL_PKCS1_PADDING));
return $fn(base64url_decode($data['data']),$k,$i);
}
else {
$x = [ 'data' => $data, 'prvkey' => $prvkey, 'alg' => $alg, 'result' => $data ];
$x = [ 'data' => $data, 'prvkey' => $prvkey, 'alg' => $subalg, 'result' => $data ];
call_hooks('other_unencapsulate',$x);
return $x['result'];
}

3
include/zot.php
View File

@ -1235,8 +1235,6 @@ function zot_fetch($arr) {
*/
function zot_import($arr, $sender_url) {
logger('arr: ' . print_r($arr,true));
$data = json_decode($arr['body'], true);
if(! $data) {
@ -5080,7 +5078,6 @@ function zot6_check_sig() {
if($r) {
foreach($r as $hubloc) {
$verified = \Zotlabs\Web\HTTPSig::verify('',$hubloc['xchan_pubkey']);
logger('verified: ' . print_r($verified,true));
if($verified && $verified['header_signed'] && $verified['header_valid'] && $verified['content_signed'] && $verified['content_valid']) {
$ret['hubloc'] = $hubloc;
$ret['success'] = true;