Version 4.7.23

system/Text/Encrypt.php

@@ -159,20 +159,23 @@ class _Encrypt
 	}
 	
 	/**
-	 * Decript
+	 * Decrypt
 	 *
+	 * @param   string|null     $encryptionKey        Custom decryption key
 	 * @return	string
 	 */
-	public function decrypt()
+	public function decrypt( ?string $encryptionKey=NULL ): string
 	{
+		$keyToUse = $encryptionKey ?? static::key();
+
 		if ( $this->tag )
 		{
-			return openssl_decrypt( $this->cipher, 'aes-128-gcm', static::key(), 0, $this->iv, $this->tag );
+			return openssl_decrypt( $this->cipher, 'aes-128-gcm', $keyToUse, 0, $this->iv, $this->tag );
 		}
 		elseif ( $this->hmac )
 		{
-			$decrypted = openssl_decrypt( $this->cipher, 'aes-128-cbc', static::key(), OPENSSL_RAW_DATA, $this->iv );
-			if ( hash_equals( $this->hmac, hash_hmac( 'sha256', $this->cipher, static::key(), TRUE ) ) )
+			$decrypted = openssl_decrypt( $this->cipher, 'aes-128-cbc', $keyToUse, OPENSSL_RAW_DATA, $this->iv );
+			if ( hash_equals( $this->hmac, hash_hmac( 'sha256', $this->cipher, $keyToUse, TRUE ) ) )
 			{
 				return $decrypted;
 			}
@@ -181,7 +184,7 @@ class _Encrypt
 		else
 		{
 			require_once \IPS\ROOT_PATH . '/system/3rd_party/AES/AES.php';
-			return \AesCtr::decrypt( $this->cipher, static::key(), 256 );
+			return \AesCtr::decrypt( $this->cipher, $keyToUse, 256 );
 		}
 	}
 }