aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-02-20 21:00:22 +0100
committerMario Vavti <mario@mariovavti.com>2018-02-20 21:00:22 +0100
commit6d0b88e242a8b960fb5294d3923e30a6637c619d (patch)
treeb99763970a9822ed078ff3a38dd0d34e3bfcc80e /include
parent41da5af721824a952abaf67187d81a8ca7154f9f (diff)
parentae8623e3afb5fe6f6693f0b5b520735a7afce12f (diff)
downloadvolse-hubzilla-6d0b88e242a8b960fb5294d3923e30a6637c619d.tar.gz
volse-hubzilla-6d0b88e242a8b960fb5294d3923e30a6637c619d.tar.bz2
volse-hubzilla-6d0b88e242a8b960fb5294d3923e30a6637c619d.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
-rw-r--r--include/crypto.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/crypto.php b/include/crypto.php
index f9cf20deb..11654564e 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -128,6 +128,9 @@ function other_encapsulate($data,$pubkey,$alg) {
$oaep = true;
$subalg = substr($alg,0,-5);
}
+ else {
+ $subalg = $alg;
+ }
$fn = strtoupper($subalg) . '_encrypt';
@@ -232,7 +235,9 @@ function other_unencapsulate($data,$prvkey,$alg) {
$oaep = true;
$subalg = substr($alg,0,-5);
}
-
+ else {
+ $subalg = $alg;
+ }
$fn = strtoupper($subalg) . '_decrypt';
if(function_exists($fn)) {