Configurable encryption type

Author: tvdijen

src/XML/EncryptableElementTrait.php

@@ -48,10 +48,11 @@ trait EncryptableElementTrait
      * @param \SimpleSAML\XMLSecurity\Alg\Encryption\EncryptionAlgorithmInterface $encryptor The encryptor to use,
      * either to encrypt the object itself, or to encrypt a session key (if the encryptor implements a key transport
      * algorithm).
+     * @param \SimpleSAML\XMLSchema\Type\AnyURIValue|null $type
      *
      * @return \SimpleSAML\XMLSecurity\XML\xenc\EncryptedData
      */
-    public function encrypt(EncryptionAlgorithmInterface $encryptor): EncryptedData
+    public function encrypt(EncryptionAlgorithmInterface $encryptor, ?AnyURIValue $type = null): EncryptedData
     {
         $keyInfo = null;
         if (in_array($encryptor->getAlgorithmId(), C::$KEY_TRANSPORT_ALGORITHMS)) {
@@ -88,7 +89,7 @@ public function encrypt(EncryptionAlgorithmInterface $encryptor): EncryptedData
                 ),
             ),
             null,
-            AnyURIValue::fromString(C::XMLENC_ELEMENT),
+            $type,
             null,
             null,
             new EncryptionMethod(

tests/XML/EncryptedCustomTest.php

@@ -7,6 +7,7 @@
 use DOMElement;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XMLSchema\Type\AnyURIValue;
 use SimpleSAML\XMLSecurity\Alg\Encryption\EncryptionAlgorithmFactory;
 use SimpleSAML\XMLSecurity\Alg\KeyTransport\KeyTransportAlgorithmFactory;
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
@@ -60,7 +61,9 @@ public function testEncryptAndDecryptSharedSecret(): void
         // encrypt
         $factory = new EncryptionAlgorithmFactory();
         $encryptor = $factory->getAlgorithm(C::BLOCK_ENC_AES128, $sharedKey);
-        $encryptedCustom = new EncryptedCustom($customSigned->encrypt($encryptor));
+        $encryptedCustom = new EncryptedCustom(
+            $customSigned->encrypt($encryptor, AnyURIValue::fromString(C::XMLENC_ELEMENT)),
+        );
 
         // decrypt
         $decryptedCustom = $encryptedCustom->decrypt($encryptor);
@@ -80,7 +83,9 @@ public function testEncryptAndDecryptSessionKey(): void
         // encrypt
         $factory = new KeyTransportAlgorithmFactory();
         $encryptor = $factory->getAlgorithm(C::KEY_TRANSPORT_OAEP_MGF1P, $this->pubKey);
-        $encryptedCustom = new EncryptedCustom($customSigned->encrypt($encryptor));
+        $encryptedCustom = new EncryptedCustom(
+            $customSigned->encrypt($encryptor, AnyURIValue::fromString(C::XMLENC_ELEMENT)),
+        );
 
         // decrypt
         $decryptor = $factory->getAlgorithm(C::KEY_TRANSPORT_OAEP_MGF1P, $this->privKey);
@@ -110,7 +115,9 @@ public function testSignatureVerifiesAfterEncryptionAndDecryption(): void
         // encrypt
         $factory = new KeyTransportAlgorithmFactory();
         $encryptor = $factory->getAlgorithm(C::KEY_TRANSPORT_OAEP_MGF1P, $this->pubKey);
-        $encryptedCustom = new EncryptedCustom($customSigned->encrypt($encryptor));
+        $encryptedCustom = new EncryptedCustom(
+            $customSigned->encrypt($encryptor, AnyURIValue::fromString(C::XMLENC_ELEMENT)),
+        );
 
         // decrypt
         $decryptor = $factory->getAlgorithm(C::KEY_TRANSPORT_OAEP_MGF1P, $this->privKey);