From 9f94f114fa8587cb2e518df5074afe4ea387d0d8 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 20 Oct 2017 17:40:35 +0100
Subject: [PATCH] Make validator IDs explicit

These IDs are currently defaulted by the validators, but that behaviour will go away in a future MDA release.
---
 mdx/common-beans.xml | 4 ++--
 mdx/uk/beans.xml     | 4 ++--
 mdx/uk/verbs.xml     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index eb0832ab..0d8ff471 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -1033,10 +1033,10 @@
                     <property name="validators">
                         <list>
                             <!-- Error on RSA key length less than 2048 bits. -->
-                            <bean parent="mda.X509RSAKeyLengthValidator"
+                            <bean p:id="RSAKeyLength" parent="mda.X509RSAKeyLengthValidator"
                                 p:warningBoundary="0" p:errorBoundary="2048"/>
                             <!-- Error on small RSA public exponents. -->
-                            <bean parent="mda.X509RSAExponentValidator"/>
+                            <bean p:id="RSAExponent" parent="mda.X509RSAExponentValidator"/>
                             <!-- Error on keys vulnerable to ROCA. -->
                             <bean p:id="ROCA" parent="ukf.X509ROCAValidator"/>
 
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 5325f593..2e912136 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -302,10 +302,10 @@
                     <property name="validators">
                         <list>
                             <!-- Error on RSA key length less than 2048 bits. -->
-                            <bean parent="mda.X509RSAKeyLengthValidator"
+                            <bean p:id="RSAKeyLength" parent="mda.X509RSAKeyLengthValidator"
                                 p:warningBoundary="0" p:errorBoundary="2048"/>
                             <!-- Error on small RSA public exponents. -->
-                            <bean parent="mda.X509RSAExponentValidator"/>
+                            <bean p:id="RSAExponent" parent="mda.X509RSAExponentValidator"/>
                             <!-- Error on keys vulnerable to ROCA. -->
                             <bean p:id="ROCA" parent="ukf.X509ROCAValidator"/>
 
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 26e990cc..6d066051 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -310,10 +310,10 @@
                     <property name="validators">
                         <list>
                             <!-- Error on RSA key length less than 2048 bits. -->
-                            <bean parent="mda.X509RSAKeyLengthValidator"
+                            <bean p:id="RSAKeyLength" parent="mda.X509RSAKeyLengthValidator"
                                 p:warningBoundary="0" p:errorBoundary="2048"/>
                             <!-- Error on small RSA public exponents. -->
-                            <bean parent="mda.X509RSAExponentValidator"/>
+                            <bean p:id="RSAExponent" parent="mda.X509RSAExponentValidator"/>
                             <!-- Error on keys vulnerable to ROCA. -->
                             <bean p:id="ROCA" parent="ukf.X509ROCAValidator"/>