aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-02-20 11:56:51 -0800
committerzotlabs <mike@macgirvin.com>2018-02-20 11:56:51 -0800
commitdbeee4707b73c87684146fefa15c2caaf323f921 (patch)
tree65c687995d2573ac1227bdcb0ad37bc797937b1a
parentae8623e3afb5fe6f6693f0b5b520735a7afce12f (diff)
downloadvolse-hubzilla-dbeee4707b73c87684146fefa15c2caaf323f921.tar.gz
volse-hubzilla-dbeee4707b73c87684146fefa15c2caaf323f921.tar.bz2
volse-hubzilla-dbeee4707b73c87684146fefa15c2caaf323f921.zip
don't try to handle OAEP for plugin crypto methods; let them do it if desired
-rw-r--r--include/crypto.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/crypto.php b/include/crypto.php
index 11654564e..ab33ba096 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -163,7 +163,7 @@ function other_encapsulate($data,$pubkey,$alg) {
return $result;
}
else {
- $x = [ 'data' => $data, 'pubkey' => $pubkey, 'alg' => $subalg, 'result' => $data ];
+ $x = [ 'data' => $data, 'pubkey' => $pubkey, 'alg' => $alg, 'result' => $data ];
call_hooks('other_encapsulate', $x);
return $x['result'];
}
@@ -246,7 +246,7 @@ function other_unencapsulate($data,$prvkey,$alg) {
return $fn(base64url_decode($data['data']),$k,$i);
}
else {
- $x = [ 'data' => $data, 'prvkey' => $prvkey, 'alg' => $subalg, 'result' => $data ];
+ $x = [ 'data' => $data, 'prvkey' => $prvkey, 'alg' => $alg, 'result' => $data ];
call_hooks('other_unencapsulate',$x);
return $x['result'];
}