fixup! feat(push): Optionally use OAEP padding

nickvergessen · nickvergessen · commit f2d07c2d71f3 · 2026-04-30T11:38:26.000+02:00
diff --git a/lib/Push.php b/lib/Push.php
@@ -1007,7 +1007,8 @@ protected function encryptAndSignDelete(Key $userKey, array $device, ?array $ids
 		$remainingIds = $ret['remaining'];
 		$data = $ret['data'];
 
-		if (!openssl_public_encrypt(json_encode($data), $encryptedSubject, $device['devicepublickey'], OPENSSL_PKCS1_PADDING)) {
+		$padding = $this->appConfig->getAppValueString('push_encryption_padding', 'PKCS1') === 'OAEP' ? OPENSSL_PKCS1_OAEP_PADDING : OPENSSL_PKCS1_PADDING;
+		if (!openssl_public_encrypt(json_encode($data), $encryptedSubject, $device['devicepublickey'], $padding)) {
 			$this->log->error(openssl_error_string(), ['app' => 'notifications']);
 			throw new \InvalidArgumentException('Failed to encrypt message for device');
 		}

Original file line number	Diff line number	Diff line change
`@@ -1007,7 +1007,8 @@ protected function encryptAndSignDelete(Key $userKey, array $device, ?array $ids`
`1007`	`1007`	`$remainingIds = $ret['remaining'];`
`1008`	`1008`	`$data = $ret['data'];`
`1009`	`1009`
`1010`		`- if (!openssl_public_encrypt(json_encode($data), $encryptedSubject, $device['devicepublickey'], OPENSSL_PKCS1_PADDING)) {`
	`1010`	`+ $padding = $this->appConfig->getAppValueString('push_encryption_padding', 'PKCS1') === 'OAEP' ? OPENSSL_PKCS1_OAEP_PADDING : OPENSSL_PKCS1_PADDING;`
	`1011`	`+ if (!openssl_public_encrypt(json_encode($data), $encryptedSubject, $device['devicepublickey'], $padding)) {`
`1011`	`1012`	`$this->log->error(openssl_error_string(), ['app' => 'notifications']);`
`1012`	`1013`	`throw new \InvalidArgumentException('Failed to encrypt message for device');`
`1013`	`1014`	`}`