Merge pull request #16500 from nextcloud/backport/16495/stable16

MorrisJobke · web-flow · commit 93c5176f1e5b · 2019-07-22T16:03:29.000+02:00
[stable16] Pass $configargs to openssl_pkey_export
diff --git a/lib/private/Authentication/Token/PublicKeyTokenProvider.php b/lib/private/Authentication/Token/PublicKeyTokenProvider.php
@@ -299,7 +299,9 @@ private function newToken(string $token,
 			$this->logOpensslError();
 		}
 
-		openssl_pkey_export($res, $privateKey);
+		if (openssl_pkey_export($res, $privateKey, null, $config) === false) {
+			$this->logOpensslError();
+		}
 
 		// Extract the public key from $res to $pubKey
 		$publicKey = openssl_pkey_get_details($res);

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,9 @@ private function newToken(string $token,`
`299`	`299`	`$this->logOpensslError();`
`300`	`300`	`}`
`301`	`301`
`302`		`- openssl_pkey_export($res, $privateKey);`
	`302`	`+ if (openssl_pkey_export($res, $privateKey, null, $config) === false) {`
	`303`	`+ $this->logOpensslError();`
	`304`	`+ }`
`303`	`305`
`304`	`306`	`// Extract the public key from $res to $pubKey`
`305`	`307`	`$publicKey = openssl_pkey_get_details($res);`