[cpp-xmltooling] branch master updated: CPPXT-136 Test cases for malformed/missing DSA keyinfo <Seed><PgenCounter>
Rod Widdowson
rdw at steadingsoftware.com
Mon Oct 8 11:37:38 EDT 2018
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository cpp-xmltooling.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=90c2293948773d0dc4c9ed29839ab804520453cf
The following commit(s) were added to refs/heads/master by this push:
new 90c2293 CPPXT-136 Test cases for malformed/missing DSA keyinfo <Seed><PgenCounter>
90c2293 is described below
commit 90c2293948773d0dc4c9ed29839ab804520453cf
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Oct 8 16:36:23 2018 +0100
CPPXT-136 Test cases for malformed/missing DSA keyinfo <Seed><PgenCounter>
https://issues.shibboleth.net/jira/browse/CPPXT-136
TL;DR nobody cares, except that XMLtooling doesn't like null or
empty elements (except for the allowed neither)
---
xmltoolingtest/BadKeyInfoTest.h | 54 +++++++++++++++++++++++++++++
xmltoolingtest/data/DSABadCounter.xml | 19 ++++++++++
xmltoolingtest/data/DSABadSeed.xml | 19 ++++++++++
xmltoolingtest/data/DSABadSeedCounter.xml | 19 ++++++++++
xmltoolingtest/data/DSABadSeedCounter64.xml | 19 ++++++++++
xmltoolingtest/data/DSANoCounter.xml | 18 ++++++++++
xmltoolingtest/data/DSANoSeed.xml | 18 ++++++++++
xmltoolingtest/data/DSANullCounter.xml | 19 ++++++++++
xmltoolingtest/data/DSANullSeed.xml | 19 ++++++++++
xmltoolingtest/data/DSASeedCounter.xml | 19 ++++++++++
10 files changed, 223 insertions(+)
diff --git a/xmltoolingtest/BadKeyInfoTest.h b/xmltoolingtest/BadKeyInfoTest.h
index 8fb05e1..018ebc0 100644
--- a/xmltoolingtest/BadKeyInfoTest.h
+++ b/xmltoolingtest/BadKeyInfoTest.h
@@ -419,5 +419,59 @@ public:
// Round trip works (xsec), XmlTooling returns NO public key, Santuario returns a public key, verifyBase64Signature doesn't throw (xsec)
DSATest("DSANullJ.xml", false, true, false, false);
}
+
+ // Seed: counter
+ void testDSASeedCounter()
+ {
+ // Works
+ DSATest("DSASeedCounter.xml", false , false, false, false);
+ }
+ void testDSABadSeedCounter()
+ {
+ // Works
+ DSATest("DSABadSeedCounter.xml", false, false, false, false);
+ }
+
+ void testDSABadSeedCounter64()
+ {
+ // Works
+ DSATest("DSABadSeedCounter64.xml", false, false, false, false);
+ }
+
+ void testDSABadSeed()
+ {
+ // Works
+ DSATest("DSABadSeed.xml", false, false, false, false);
+ }
+
+ void testDSANoSeed()
+ {
+ // Works
+ DSATest("DSANoSeed.xml", false, true, false, false);
+ }
+
+ void testDSANullSeed()
+ {
+ // Works
+ DSATest("DSANullSeed.xml", false, true, false, false);
+ }
+
+ void testDSABadCounter()
+ {
+ // Works
+ DSATest("DSABadCounter.xml", false, false, false, false);
+ }
+
+ void testDSANoCounter()
+ {
+ // Works xsec, No XMLTooling Key
+ DSATest("DSANoCounter.xml", false, true, false, false);
+ }
+
+ void testDSANullCounter()
+ {
+ // Works xsec, No XMLTooling Key
+ DSATest("DSANullCounter.xml", false, true, false, false);
+ }
};
\ No newline at end of file
diff --git a/xmltoolingtest/data/DSABadCounter.xml b/xmltoolingtest/data/DSABadCounter.xml
new file mode 100644
index 0000000..12befe2
--- /dev/null
+++ b/xmltoolingtest/data/DSABadCounter.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>Foo</ds:KeyName>
+ <ds:KeyName>Bar</ds:KeyName>
+ <ds:KeyValue>
+ <ds:DSAKeyValue>
+ <ds:P>ANVGAtN1Mxr3ZkxKcQqZaMxw2Qbre4jG8G+KFhcPYJQNjhpYH2O+DVWx02vV4H9ypCnPaANktCitKuQSiDA9l1U=
+</ds:P>
+ <ds:Q>AK/apfGsK5pA4iia1j9qAR0Tdaw1
+</ds:Q>
+ <ds:G>DmEQoo+YAVNTUGokcy1ki01WgMfTBsvPqYjRDzcmF7p4oJ8neVCn0B990jv9W8v8gpvxr+w5ZpQkJybngJFAjw==
+</ds:G>
+ <ds:Y>AMJPFxCB9Kp6ekdM90H23zv4JNEhkm1qXNix44Xdl6IABgE896kpNzGQDCKf6iecO7oX+eTJl3KwT3oNE+8EQxk=
+</ds:Y>
+ <ds:Seed>AK/apfGsK5pA4iia1j9qAR0Tdaw1</ds:Seed>
+ <ds:PgenCounter>Elephants!</ds:PgenCounter>
+ </ds:DSAKeyValue>
+ </ds:KeyValue>
+</ds:KeyInfo>
diff --git a/xmltoolingtest/data/DSABadSeed.xml b/xmltoolingtest/data/DSABadSeed.xml
new file mode 100644
index 0000000..e7122f6
--- /dev/null
+++ b/xmltoolingtest/data/DSABadSeed.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>Foo</ds:KeyName>
+ <ds:KeyName>Bar</ds:KeyName>
+ <ds:KeyValue>
+ <ds:DSAKeyValue>
+ <ds:P>ANVGAtN1Mxr3ZkxKcQqZaMxw2Qbre4jG8G+KFhcPYJQNjhpYH2O+DVWx02vV4H9ypCnPaANktCitKuQSiDA9l1U=
+</ds:P>
+ <ds:Q>AK/apfGsK5pA4iia1j9qAR0Tdaw1
+</ds:Q>
+ <ds:G>DmEQoo+YAVNTUGokcy1ki01WgMfTBsvPqYjRDzcmF7p4oJ8neVCn0B990jv9W8v8gpvxr+w5ZpQkJybngJFAjw==
+</ds:G>
+ <ds:Y>AMJPFxCB9Kp6ekdM90H23zv4JNEhkm1qXNix44Xdl6IABgE896kpNzGQDCKf6iecO7oX+eTJl3KwT3oNE+8EQxk=
+</ds:Y>
+ <ds:Seed>Zombies</ds:Seed>
+ <ds:PgenCounter>AMJPFxCB9Kp6ekdM90H23zv4JNEhkm1qXNix44Xdl6IABgE896kpNzGQDCKf6iecO7oX+eTJl3KwT3oNE+8EQxk=</ds:PgenCounter>
+ </ds:DSAKeyValue>
+ </ds:KeyValue>
+</ds:KeyInfo>
diff --git a/xmltoolingtest/data/DSABadSeedCounter.xml b/xmltoolingtest/data/DSABadSeedCounter.xml
new file mode 100644
index 0000000..a838812
--- /dev/null
+++ b/xmltoolingtest/data/DSABadSeedCounter.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>Foo</ds:KeyName>
+ <ds:KeyName>Bar</ds:KeyName>
+ <ds:KeyValue>
+ <ds:DSAKeyValue>
+ <ds:P>ANVGAtN1Mxr3ZkxKcQqZaMxw2Qbre4jG8G+KFhcPYJQNjhpYH2O+DVWx02vV4H9ypCnPaANktCitKuQSiDA9l1U=
+</ds:P>
+ <ds:Q>AK/apfGsK5pA4iia1j9qAR0Tdaw1
+</ds:Q>
+ <ds:G>DmEQoo+YAVNTUGokcy1ki01WgMfTBsvPqYjRDzcmF7p4oJ8neVCn0B990jv9W8v8gpvxr+w5ZpQkJybngJFAjw==
+</ds:G>
+ <ds:Y>AMJPFxCB9Kp6ekdM90H23zv4JNEhkm1qXNix44Xdl6IABgE896kpNzGQDCKf6iecO7oX+eTJl3KwT3oNE+8EQxk=
+</ds:Y>
+ <ds:Seed>Elephants!</ds:Seed>
+ <ds:PgenCounter>Zombies!</ds:PgenCounter>
+ </ds:DSAKeyValue>
+ </ds:KeyValue>
+</ds:KeyInfo>
diff --git a/xmltoolingtest/data/DSABadSeedCounter64.xml b/xmltoolingtest/data/DSABadSeedCounter64.xml
new file mode 100644
index 0000000..fdf172f
--- /dev/null
+++ b/xmltoolingtest/data/DSABadSeedCounter64.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>Foo</ds:KeyName>
+ <ds:KeyName>Bar</ds:KeyName>
+ <ds:KeyValue>
+ <ds:DSAKeyValue>
+ <ds:P>ANVGAtN1Mxr3ZkxKcQqZaMxw2Qbre4jG8G+KFhcPYJQNjhpYH2O+DVWx02vV4H9ypCnPaANktCitKuQSiDA9l1U=
+</ds:P>
+ <ds:Q>AK/apfGsK5pA4iia1j9qAR0Tdaw1
+</ds:Q>
+ <ds:G>DmEQoo+YAVNTUGokcy1ki01WgMfTBsvPqYjRDzcmF7p4oJ8neVCn0B990jv9W8v8gpvxr+w5ZpQkJybngJFAjw==
+</ds:G>
+ <ds:Y>AMJPFxCB9Kp6ekdM90H23zv4JNEhkm1qXNix44Xdl6IABgE896kpNzGQDCKf6iecO7oX+eTJl3KwT3oNE+8EQxk=
+</ds:Y>
+ <ds:Seed>RG1FUW9vK1lBVk5UVUdva2N5MWtpMDFXZ01mVEJzdlBxWWpSRHpjbUY3cDRvSjhuZVZDbjBCOTkwanY5Vzh2OGdwdnhyK3c1WnBRa0p5Ym5nSkZBanc9PQ==</ds:Seed>
+ <ds:PgenCounter>RG1FUW9vK1lBVk5UVUdva2N5MWtpMDFXZ01mVEJzdlBxWWpSRHpjbUY3cDRvSjhuZVZDbjBCOTkwanY5Vzh2OGdwdnhyK3c1WnBRa0p5Ym5nSkZBanc9PQ==</ds:PgenCounter>
+ </ds:DSAKeyValue>
+ </ds:KeyValue>
+</ds:KeyInfo>
diff --git a/xmltoolingtest/data/DSANoCounter.xml b/xmltoolingtest/data/DSANoCounter.xml
new file mode 100644
index 0000000..9b9cd2d
--- /dev/null
+++ b/xmltoolingtest/data/DSANoCounter.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>Foo</ds:KeyName>
+ <ds:KeyName>Bar</ds:KeyName>
+ <ds:KeyValue>
+ <ds:DSAKeyValue>
+ <ds:P>ANVGAtN1Mxr3ZkxKcQqZaMxw2Qbre4jG8G+KFhcPYJQNjhpYH2O+DVWx02vV4H9ypCnPaANktCitKuQSiDA9l1U=
+</ds:P>
+ <ds:Q>AK/apfGsK5pA4iia1j9qAR0Tdaw1
+</ds:Q>
+ <ds:G>DmEQoo+YAVNTUGokcy1ki01WgMfTBsvPqYjRDzcmF7p4oJ8neVCn0B990jv9W8v8gpvxr+w5ZpQkJybngJFAjw==
+</ds:G>
+ <ds:Y>AMJPFxCB9Kp6ekdM90H23zv4JNEhkm1qXNix44Xdl6IABgE896kpNzGQDCKf6iecO7oX+eTJl3KwT3oNE+8EQxk=
+</ds:Y>
+ <ds:Seed>AK/apfGsK5pA4iia1j9qAR0Tdaw1</ds:Seed>
+ </ds:DSAKeyValue>
+ </ds:KeyValue>
+</ds:KeyInfo>
diff --git a/xmltoolingtest/data/DSANoSeed.xml b/xmltoolingtest/data/DSANoSeed.xml
new file mode 100644
index 0000000..92b42b4
--- /dev/null
+++ b/xmltoolingtest/data/DSANoSeed.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>Foo</ds:KeyName>
+ <ds:KeyName>Bar</ds:KeyName>
+ <ds:KeyValue>
+ <ds:DSAKeyValue>
+ <ds:P>ANVGAtN1Mxr3ZkxKcQqZaMxw2Qbre4jG8G+KFhcPYJQNjhpYH2O+DVWx02vV4H9ypCnPaANktCitKuQSiDA9l1U=
+</ds:P>
+ <ds:Q>AK/apfGsK5pA4iia1j9qAR0Tdaw1
+</ds:Q>
+ <ds:G>DmEQoo+YAVNTUGokcy1ki01WgMfTBsvPqYjRDzcmF7p4oJ8neVCn0B990jv9W8v8gpvxr+w5ZpQkJybngJFAjw==
+</ds:G>
+ <ds:Y>AMJPFxCB9Kp6ekdM90H23zv4JNEhkm1qXNix44Xdl6IABgE896kpNzGQDCKf6iecO7oX+eTJl3KwT3oNE+8EQxk=
+</ds:Y>
+ <ds:PgenCounter>AMJPFxCB9Kp6ekdM90H23zv4JNEhkm1qXNix44Xdl6IABgE896kpNzGQDCKf6iecO7oX+eTJl3KwT3oNE+8EQxk=</ds:PgenCounter>
+ </ds:DSAKeyValue>
+ </ds:KeyValue>
+</ds:KeyInfo>
diff --git a/xmltoolingtest/data/DSANullCounter.xml b/xmltoolingtest/data/DSANullCounter.xml
new file mode 100644
index 0000000..776c5cb
--- /dev/null
+++ b/xmltoolingtest/data/DSANullCounter.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>Foo</ds:KeyName>
+ <ds:KeyName>Bar</ds:KeyName>
+ <ds:KeyValue>
+ <ds:DSAKeyValue>
+ <ds:P>ANVGAtN1Mxr3ZkxKcQqZaMxw2Qbre4jG8G+KFhcPYJQNjhpYH2O+DVWx02vV4H9ypCnPaANktCitKuQSiDA9l1U=
+</ds:P>
+ <ds:Q>AK/apfGsK5pA4iia1j9qAR0Tdaw1
+</ds:Q>
+ <ds:G>DmEQoo+YAVNTUGokcy1ki01WgMfTBsvPqYjRDzcmF7p4oJ8neVCn0B990jv9W8v8gpvxr+w5ZpQkJybngJFAjw==
+</ds:G>
+ <ds:Y>AMJPFxCB9Kp6ekdM90H23zv4JNEhkm1qXNix44Xdl6IABgE896kpNzGQDCKf6iecO7oX+eTJl3KwT3oNE+8EQxk=
+</ds:Y>
+ <ds:Seed>AK/apfGsK5pA4iia1j9qAR0Tdaw1</ds:Seed>
+ <ds:PgenCounter/>
+ </ds:DSAKeyValue>
+ </ds:KeyValue>
+</ds:KeyInfo>
diff --git a/xmltoolingtest/data/DSANullSeed.xml b/xmltoolingtest/data/DSANullSeed.xml
new file mode 100644
index 0000000..25531df
--- /dev/null
+++ b/xmltoolingtest/data/DSANullSeed.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>Foo</ds:KeyName>
+ <ds:KeyName>Bar</ds:KeyName>
+ <ds:KeyValue>
+ <ds:DSAKeyValue>
+ <ds:P>ANVGAtN1Mxr3ZkxKcQqZaMxw2Qbre4jG8G+KFhcPYJQNjhpYH2O+DVWx02vV4H9ypCnPaANktCitKuQSiDA9l1U=
+</ds:P>
+ <ds:Q>AK/apfGsK5pA4iia1j9qAR0Tdaw1
+</ds:Q>
+ <ds:G>DmEQoo+YAVNTUGokcy1ki01WgMfTBsvPqYjRDzcmF7p4oJ8neVCn0B990jv9W8v8gpvxr+w5ZpQkJybngJFAjw==
+</ds:G>
+ <ds:Y>AMJPFxCB9Kp6ekdM90H23zv4JNEhkm1qXNix44Xdl6IABgE896kpNzGQDCKf6iecO7oX+eTJl3KwT3oNE+8EQxk=
+</ds:Y>
+ <ds:Seed/>
+ <ds:PgenCounter>AMJPFxCB9Kp6ekdM90H23zv4JNEhkm1qXNix44Xdl6IABgE896kpNzGQDCKf6iecO7oX+eTJl3KwT3oNE+8EQxk=</ds:PgenCounter>
+ </ds:DSAKeyValue>
+ </ds:KeyValue>
+</ds:KeyInfo>
diff --git a/xmltoolingtest/data/DSASeedCounter.xml b/xmltoolingtest/data/DSASeedCounter.xml
new file mode 100644
index 0000000..b48962e
--- /dev/null
+++ b/xmltoolingtest/data/DSASeedCounter.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>Foo</ds:KeyName>
+ <ds:KeyName>Bar</ds:KeyName>
+ <ds:KeyValue>
+ <ds:DSAKeyValue>
+ <ds:P>ANVGAtN1Mxr3ZkxKcQqZaMxw2Qbre4jG8G+KFhcPYJQNjhpYH2O+DVWx02vV4H9ypCnPaANktCitKuQSiDA9l1U=
+</ds:P>
+ <ds:Q>AK/apfGsK5pA4iia1j9qAR0Tdaw1
+</ds:Q>
+ <ds:G>DmEQoo+YAVNTUGokcy1ki01WgMfTBsvPqYjRDzcmF7p4oJ8neVCn0B990jv9W8v8gpvxr+w5ZpQkJybngJFAjw==
+</ds:G>
+ <ds:Y>AMJPFxCB9Kp6ekdM90H23zv4JNEhkm1qXNix44Xdl6IABgE896kpNzGQDCKf6iecO7oX+eTJl3KwT3oNE+8EQxk=
+</ds:Y>
+ <ds:Seed>AK/apfGsK5pA4iia1j9qAR0Tdaw1</ds:Seed>
+ <ds:PgenCounter>AMJPFxCB9Kp6ekdM90H23zv4JNEhkm1qXNix44Xdl6IABgE896kpNzGQDCKf6iecO7oX+eTJl3KwT3oNE+8EQxk=</ds:PgenCounter>
+ </ds:DSAKeyValue>
+ </ds:KeyValue>
+</ds:KeyInfo>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list