diff --git a/composer.json b/composer.json
index 34d55cfd..77345ad0 100644
--- a/composer.json
+++ b/composer.json
@@ -14,14 +14,14 @@
         "ext-dom": "*",
         "ext-spl": "*",
 
-        "simplesamlphp/assert": "~1.7.0",
-        "simplesamlphp/composer-xmlprovider-installer": "~1.0.0",
+        "simplesamlphp/assert": "~1.8.1",
+        "simplesamlphp/composer-xmlprovider-installer": "~1.0.1",
         "simplesamlphp/saml2": "^5@dev",
-        "simplesamlphp/xml-security": "~1.12.0",
-        "simplesamlphp/xml-common": "~1.23.2"
+        "simplesamlphp/xml-security": "~1.13.0",
+        "simplesamlphp/xml-common": "~1.24.0"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.8"
+        "simplesamlphp/simplesamlphp-test-framework": "~1.8.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Assert/Assert.php b/src/Assert/Assert.php
new file mode 100644
index 00000000..eafe62fb
--- /dev/null
+++ b/src/Assert/Assert.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\WSSecurity\Assert;
+
+use SimpleSAML\XMLSecurity\Assert\Assert as BaseAssert;
+
+/**
+ * @package simplesamlphp/ws-security
+ */
+class Assert extends BaseAssert
+{
+}
diff --git a/src/XML/fed/AbstractSignOutType.php b/src/XML/fed/AbstractSignOutType.php
index d32ca350..6d43496c 100644
--- a/src/XML/fed/AbstractSignOutType.php
+++ b/src/XML/fed/AbstractSignOutType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
diff --git a/src/XML/fed/SecurityTokenServiceType.php b/src/XML/fed/SecurityTokenServiceType.php
index 17afe127..b6f9693d 100644
--- a/src/XML/fed/SecurityTokenServiceType.php
+++ b/src/XML/fed/SecurityTokenServiceType.php
@@ -6,9 +6,9 @@
 
 use DateTimeImmutable;
 use DOMElement;
-use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\SAML2\XML\md\{ContactPerson, Extensions, KeyDescriptor, Organization};
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/sp_200507/AbstractHeaderType.php b/src/XML/sp_200507/AbstractHeaderType.php
index 937544df..2bea742b 100644
--- a/src/XML/sp_200507/AbstractHeaderType.php
+++ b/src/XML/sp_200507/AbstractHeaderType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\XsNamespace as NS;
diff --git a/src/XML/sp_200702/AbstractHeaderType.php b/src/XML/sp_200702/AbstractHeaderType.php
index b5a5413e..e5c5543c 100644
--- a/src/XML/sp_200702/AbstractHeaderType.php
+++ b/src/XML/sp_200702/AbstractHeaderType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\XsNamespace as NS;
diff --git a/src/XML/wsa_200408/AbstractRelationshipType.php b/src/XML/wsa_200408/AbstractRelationshipType.php
index 0a24d08d..fd3fecf8 100644
--- a/src/XML/wsa_200408/AbstractRelationshipType.php
+++ b/src/XML/wsa_200408/AbstractRelationshipType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200408;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\URIElementTrait;
diff --git a/src/XML/wsa_200408/AbstractServiceNameType.php b/src/XML/wsa_200408/AbstractServiceNameType.php
index 069c5c22..7cb04d56 100644
--- a/src/XML/wsa_200408/AbstractServiceNameType.php
+++ b/src/XML/wsa_200408/AbstractServiceNameType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200408;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wsaw/AbstractServiceNameType.php b/src/XML/wsaw/AbstractServiceNameType.php
index 811b7281..9790c6a9 100644
--- a/src/XML/wsaw/AbstractServiceNameType.php
+++ b/src/XML/wsaw/AbstractServiceNameType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsaw;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\QNameElementTrait;
diff --git a/src/XML/wsp/Policy.php b/src/XML/wsp/Policy.php
index 08ce4c4b..64efeb78 100644
--- a/src/XML/wsp/Policy.php
+++ b/src/XML/wsp/Policy.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsp;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
diff --git a/src/XML/wsp/PolicyReference.php b/src/XML/wsp/PolicyReference.php
index 1d9c7ddd..a2e737c8 100644
--- a/src/XML/wsp/PolicyReference.php
+++ b/src/XML/wsp/PolicyReference.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsp;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
@@ -43,7 +43,7 @@ public function __construct(
         array $namespacedAttributes = [],
     ) {
         Assert::validURI($URI, SchemaViolationException::class);
-        Assert::nullOrStringPlausibleBase64($Digest, SchemaViolationException::class);
+        Assert::nullOrValidBase64($Digest, SchemaViolationException::class);
         Assert::nullOrValidURI($DigestAlgorithm, SchemaViolationException::class);
 
         $this->setAttributesNS($namespacedAttributes);
diff --git a/src/XML/wsse/AbstractAttributedString.php b/src/XML/wsse/AbstractAttributedString.php
index eb2b85f2..80505d28 100644
--- a/src/XML/wsse/AbstractAttributedString.php
+++ b/src/XML/wsse/AbstractAttributedString.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
diff --git a/src/XML/wsse/AbstractSecurityTokenReferenceType.php b/src/XML/wsse/AbstractSecurityTokenReferenceType.php
index 75d943f9..971f6eb4 100644
--- a/src/XML/wsse/AbstractSecurityTokenReferenceType.php
+++ b/src/XML/wsse/AbstractSecurityTokenReferenceType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
diff --git a/src/XML/wsse/AbstractUsernameTokenType.php b/src/XML/wsse/AbstractUsernameTokenType.php
index 3a7e8535..1eb48081 100644
--- a/src/XML/wsse/AbstractUsernameTokenType.php
+++ b/src/XML/wsse/AbstractUsernameTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
diff --git a/src/XML/wst_200502/AbstractBinarySecretType.php b/src/XML/wst_200502/AbstractBinarySecretType.php
index bd87e4db..7c4c2c13 100644
--- a/src/XML/wst_200502/AbstractBinarySecretType.php
+++ b/src/XML/wst_200502/AbstractBinarySecretType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Base64ElementTrait;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/wst_200502/AbstractComputedKeyOpenEnum.php b/src/XML/wst_200502/AbstractComputedKeyOpenEnum.php
index 3f8c46c5..37ba2933 100644
--- a/src/XML/wst_200502/AbstractComputedKeyOpenEnum.php
+++ b/src/XML/wst_200502/AbstractComputedKeyOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200502/AbstractKeyTypeOpenEnum.php b/src/XML/wst_200502/AbstractKeyTypeOpenEnum.php
index 500eda7c..70092454 100644
--- a/src/XML/wst_200502/AbstractKeyTypeOpenEnum.php
+++ b/src/XML/wst_200502/AbstractKeyTypeOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200502/AbstractRequestTypeOpenEnum.php b/src/XML/wst_200502/AbstractRequestTypeOpenEnum.php
index f9c776df..a5c5611b 100644
--- a/src/XML/wst_200502/AbstractRequestTypeOpenEnum.php
+++ b/src/XML/wst_200502/AbstractRequestTypeOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200502/AbstractStatusCodeOpenEnum.php b/src/XML/wst_200502/AbstractStatusCodeOpenEnum.php
index 5d416bed..d84e5c40 100644
--- a/src/XML/wst_200502/AbstractStatusCodeOpenEnum.php
+++ b/src/XML/wst_200502/AbstractStatusCodeOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200512/AbstractBinarySecretType.php b/src/XML/wst_200512/AbstractBinarySecretType.php
index 85a64591..f12f5705 100644
--- a/src/XML/wst_200512/AbstractBinarySecretType.php
+++ b/src/XML/wst_200512/AbstractBinarySecretType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Base64ElementTrait;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/wst_200512/AbstractComputedKeyOpenEnum.php b/src/XML/wst_200512/AbstractComputedKeyOpenEnum.php
index 2955b55a..ae1a9264 100644
--- a/src/XML/wst_200512/AbstractComputedKeyOpenEnum.php
+++ b/src/XML/wst_200512/AbstractComputedKeyOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200512/AbstractKeyTypeOpenEnum.php b/src/XML/wst_200512/AbstractKeyTypeOpenEnum.php
index a26f3985..508d5f9a 100644
--- a/src/XML/wst_200512/AbstractKeyTypeOpenEnum.php
+++ b/src/XML/wst_200512/AbstractKeyTypeOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200512/AbstractRequestTypeOpenEnum.php b/src/XML/wst_200512/AbstractRequestTypeOpenEnum.php
index 5d233bdc..2da55a86 100644
--- a/src/XML/wst_200512/AbstractRequestTypeOpenEnum.php
+++ b/src/XML/wst_200512/AbstractRequestTypeOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200512/AbstractStatusCodeOpenEnum.php b/src/XML/wst_200512/AbstractStatusCodeOpenEnum.php
index 2369a104..1c8fad8a 100644
--- a/src/XML/wst_200512/AbstractStatusCodeOpenEnum.php
+++ b/src/XML/wst_200512/AbstractStatusCodeOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wsu/AbstractAttributedDateTime.php b/src/XML/wsu/AbstractAttributedDateTime.php
index fe344d32..0f3efc29 100644
--- a/src/XML/wsu/AbstractAttributedDateTime.php
+++ b/src/XML/wsu/AbstractAttributedDateTime.php
@@ -6,7 +6,7 @@
 
 use DateTimeImmutable;
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Exception\ProtocolViolationException;
 use SimpleSAML\XML\Attribute as XMLAttribute;
diff --git a/src/XML/wsu/AbstractAttributedURI.php b/src/XML/wsu/AbstractAttributedURI.php
index 212e6a11..de47428d 100644
--- a/src/XML/wsu/AbstractAttributedURI.php
+++ b/src/XML/wsu/AbstractAttributedURI.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsu;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wsu/AbstractTimestamp.php b/src/XML/wsu/AbstractTimestamp.php
index e9277aeb..37aeefb8 100644
--- a/src/XML/wsu/AbstractTimestamp.php
+++ b/src/XML/wsu/AbstractTimestamp.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsu;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;