diff options
author | Morris Jobke <hey@morrisjobke.de> | 2019-07-22 13:22:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-22 13:22:53 +0200 |
commit | 9563c78674b76d177cdbddafb1a8cf1394f59d9f (patch) | |
tree | 6c0fb1435d6770dfb1248bfafc3ecbc5334f1621 /lib | |
parent | b6376b7bd601607d76d8e73ab44fd9b04afd5db5 (diff) | |
parent | 608f4d3ee9aded5e6b2b9784a1575ffedbd5002f (diff) | |
download | nextcloud-server-9563c78674b76d177cdbddafb1a8cf1394f59d9f.tar.gz nextcloud-server-9563c78674b76d177cdbddafb1a8cf1394f59d9f.zip |
Merge pull request #16495 from nextcloud/fix/16378-cannot-get-key-from-parameter
Pass $configargs to openssl_pkey_export
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/Authentication/Token/PublicKeyTokenProvider.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/Authentication/Token/PublicKeyTokenProvider.php b/lib/private/Authentication/Token/PublicKeyTokenProvider.php index adc4b4bed38..318d4468ddc 100644 --- a/lib/private/Authentication/Token/PublicKeyTokenProvider.php +++ b/lib/private/Authentication/Token/PublicKeyTokenProvider.php @@ -316,7 +316,10 @@ class PublicKeyTokenProvider implements IProvider { throw new \RuntimeException('OpenSSL reported a problem'); } - openssl_pkey_export($res, $privateKey); + if (openssl_pkey_export($res, $privateKey, null, $config) === false) { + $this->logOpensslError(); + throw new \RuntimeException('OpenSSL reported a problem'); + } // Extract the public key from $res to $pubKey $publicKey = openssl_pkey_get_details($res); |