Read in base64 encoded keys

juliusknorr · juliusknorr · commit fabfa2641cae · 2022-10-21T15:10:43.000+02:00
Signed-off-by: Julius Härtl &lt;jus@bitgrid.net&gt;
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -243,10 +243,11 @@ protected function getSSECParameters(): array {
 			return [];
 		}
 
+		$rawKey = base64_decode($key);
 		return [
 			'SSECustomerAlgorithm' => 'AES256',
-			'SSECustomerKey' => $key,
-			'SSECustomerKeyMD5' => md5($key, true)
+			'SSECustomerKey' => $rawKey,
+			'SSECustomerKeyMD5' => md5($rawKey, true)
 		];
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -243,10 +243,11 @@ protected function getSSECParameters(): array {`
`243`	`243`	`return [];`
`244`	`244`	`}`
`245`	`245`
	`246`	`+ $rawKey = base64_decode($key);`
`246`	`247`	`return [`
`247`	`248`	`'SSECustomerAlgorithm' => 'AES256',`
`248`		`- 'SSECustomerKey' => $key,`
`249`		`- 'SSECustomerKeyMD5' => md5($key, true)`
	`249`	`+ 'SSECustomerKey' => $rawKey,`
	`250`	`+ 'SSECustomerKeyMD5' => md5($rawKey, true)`
`250`	`251`	`];`
`251`	`252`	`}`
`252`	`253`	`}`