Add more ecdsa tests.

2 files changed, 66 insertions, 17 deletions

diff --git a/src/cz/crcs/ectester/data/wrong/keys.xml b/src/cz/crcs/ectester/data/wrong/keys.xml
index a122bc1..4be8b4d 100644
--- a/src/cz/crcs/ectester/data/wrong/keys.xml
+++ b/src/cz/crcs/ectester/data/wrong/keys.xml
@@ -13,4 +13,16 @@
         <curve>secg/secp256r1</curve>
         <desc>A random private key for default_pub.</desc>
     </privkey>
+    <pubkey>
+        <id>negated_pub</id>
+        <inline>0x116d77bea845d4bd0204cb8b954c957431c23a7111a0eda94d41a3c774260e37,0x6a766ad133dfcb42634c9bee3a61768703bf581531a23d6927396c5da49c8696</inline>
+        <curve>secg/secp256r1</curve>
+        <desc>A negation of default_pub(public key for negated_priv).</desc>
+    </pubkey>
+    <privkey>
+        <id>negated_priv</id>
+        <inline>0x6d2c8a50443dcc44649fedb00852069c2b6c4331aaf25a6c63aa4f1ddfdd5948</inline>
+        <curve>secg/secp256r1</curve>
+        <desc>A negation of default_priv(private key for negated_pub).</desc>
+    </privkey>
 </keys>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/wrong/results.xml b/src/cz/crcs/ectester/data/wrong/results.xml
index a1ac470..385bc38 100644
--- a/src/cz/crcs/ectester/data/wrong/results.xml
+++ b/src/cz/crcs/ectester/data/wrong/results.xml
@@ -2,139 +2,176 @@
 <results xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../schema.xsd">
     <sigResult>
-        <id>random</id>
+        <id>ok/random</id>
+        <sig>SHA1</sig>
+        <inline>0x304402203988322ab9f52c7f11d5d1aa92a2ac0b00275bcad8e934682257323fda672482022052231597382268e8f3b82b99e386ebb7c7db1a8b4a8bdacd496190314e4c5bad</inline>
+        <raw>0xABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB</raw>
+        <curve>secg/secp256r1</curve>
+        <signkey>wrong/default_priv</signkey>
+        <verifykey>wrong/default_pub</verifykey>
+        <desc>A correct signature by the default key.</desc>
+    </sigResult>
+    <sigResult>
+        <id>nok/random_negated</id>
+        <sig>SHA1</sig>
+        <inline>0x304402203988322ab9f52c7f11d5d1aa92a2ac0b00275bcad8e934682257323fda672482022052231597382268e8f3b82b99e386ebb7c7db1a8b4a8bdacd496190314e4c5bad</inline>
+        <raw>0xABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABABAB</raw>
+        <curve>secg/secp256r1</curve>
+        <signkey>wrong/negated_priv</signkey>
+        <verifykey>wrong/negated_pub</verifykey>
+        <desc>A signature made by the default key, to be verified by the negated one.</desc>
+    </sigResult>
+    <sigResult>
+        <id>nok/random</id>
         <sig>SHA1</sig>
         <inline>0x30440220e641671e6415629dc8398e35ae1362cb647f293a92553b1594d57fff58df302c02206baafface035e3758eea0dd9ef734976c70b6dd06f4d81d33f5e28bfb8730624</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>A random, well-formed but invalid signature.</desc>
     </sigResult>
     <sigResult>
-        <id>r0</id>
+        <id>nok/r0</id>
         <sig>SHA1</sig>
         <inline>0x3044022000000000000000000000000000000000000000000000000000000000000000000220d0837b07fe63d225733391e6808a081fd8aeb1359511feba7ca4f266727f968e</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Well-formed invalid signature with r = 0.</desc>
     </sigResult>
     <sigResult>
-        <id>s0</id>
+        <id>nok/s0</id>
         <sig>SHA1</sig>
         <inline>0x304402206bea66d439da6b0b4a0e45b51e76d53336f27f7aa8e35f2008b77a8e021eff0a02200000000000000000000000000000000000000000000000000000000000000000</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Well-formed invalid signature with s = 0.</desc>
     </sigResult>
     <sigResult>
-        <id>r1</id>
+        <id>nok/r1</id>
         <sig>SHA1</sig>
         <inline>0x3044022000000000000000000000000000000000000000000000000000000000000000010220e660f19ddc20a30adda6ca175577b492e238ef8734b904a31045d453825974d4</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Well-formed invalid signature with r = 1.</desc>
     </sigResult>
     <sigResult>
-        <id>s1</id>
+        <id>nok/s1</id>
         <sig>SHA1</sig>
         <inline>0x30440220d30ab3301d7132edbead77c0d622bbb7be8626c9ac5ee6c536281e6c18e79ab002200000000000000000000000000000000000000000000000000000000000000001</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Well-formed invalid signature with s = 1.</desc>
     </sigResult>
     <sigResult>
-        <id>r0s0</id>
+        <id>nok/r0s0</id>
         <sig>SHA1</sig>
         <inline>0x30440220000000000000000000000000000000000000000000000000000000000000000002200000000000000000000000000000000000000000000000000000000000000000</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Well-formed invalid signature with r = 0 and s = 0.</desc>
     </sigResult>
     <sigResult>
-        <id>r0s1</id>
+        <id>nok/r0s1</id>
         <sig>SHA1</sig>
         <inline>0x30440220000000000000000000000000000000000000000000000000000000000000000002200000000000000000000000000000000000000000000000000000000000000001</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Well-formed invalid signature with r = 0 and s = 1.</desc>
     </sigResult>
     <sigResult>
-        <id>r1s0</id>
+        <id>nok/r1s0</id>
         <sig>SHA1</sig>
         <inline>0x30440220000000000000000000000000000000000000000000000000000000000000000102200000000000000000000000000000000000000000000000000000000000000000</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Well-formed invalid signature with r = 1 and s = 0.</desc>
     </sigResult>
     <sigResult>
-        <id>r1s1</id>
+        <id>nok/r1s1</id>
         <sig>SHA1</sig>
         <inline>0x30440220000000000000000000000000000000000000000000000000000000000000000102200000000000000000000000000000000000000000000000000000000000000001</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Well-formed invalid signature with r = 1 and s = 1.</desc>
     </sigResult>
     <sigResult>
-        <id>sp</id>
+        <id>nok/sp</id>
         <sig>SHA1</sig>
         <inline>0x30440220fc48281b60b73752f3e20c25e8a06b335122d5890db28d2969d3145fcd384e7b0220ffffffff00000001000000000000000000000000ffffffffffffffffffffffff</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Well-formed invalid signature s = p.</desc>
     </sigResult>
     <sigResult>
-        <id>s2p</id>
+        <id>nok/s2p</id>
         <sig>SHA1</sig>
         <inline>0x30450220feba982489753a51a69fd582673d2e62b6b07cc6374237c1424f1e469cb00a98022101fffffffe00000002000000000000000000000001fffffffffffffffffffffffe</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Well-formed invalid signature with s = 2 * p.</desc>
     </sigResult>
     <sigResult>
-        <id>long</id>
+        <id>nok/long</id>
         <sig>SHA1</sig>
         <inline>0x30420220e641671e6415629dc8398e35ae1362cb647f293a92553b1594d57fff58df302c02206baafface035e3758eea0dd9ef734976c70b6dd06f4d81d33f5e28bfb8730624</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Invalid signature, that is longer than specified in its ASN.1 SEQUENCE length header.</desc>
     </sigResult>
     <sigResult>
-        <id>short</id>
+        <id>nok/short</id>
         <sig>SHA1</sig>
         <inline>0x30460220e641671e6415629dc8398e35ae1362cb647f293a92553b1594d57fff58df302c02206baafface035e3758eea0dd9ef734976c70b6dd06f4d81d33f5e28bfb8730624</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Invalid signature, that is shorter than specified in its ASN.1 SEQUENCE length header.</desc>
     </sigResult>
     <sigResult>
-        <id>long_r</id>
+        <id>nok/long_r</id>
         <sig>SHA1</sig>
         <inline>0x3044021ee641671e6415629dc8398e35ae1362cb647f293a92553b1594d57fff58df302c02206baafface035e3758eea0dd9ef734976c70b6dd06f4d81d33f5e28bfb8730624</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Invalid signature, where r is longer than specified in its ASN.1 length header.</desc>
     </sigResult>
     <sigResult>
-        <id>long_s</id>
+        <id>nok/long_s</id>
         <sig>SHA1</sig>
         <inline>0x30440220e641671e6415629dc8398e35ae1362cb647f293a92553b1594d57fff58df302c021e6baafface035e3758eea0dd9ef734976c70b6dd06f4d81d33f5e28bfb8730624</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Invalid signature, where s is longer than specified in its ASN.1 length header.</desc>
     </sigResult>
     <sigResult>
-        <id>short_r</id>
+        <id>nok/short_r</id>
         <sig>SHA1</sig>
         <inline>0x30440222e641671e6415629dc8398e35ae1362cb647f293a92553b1594d57fff58df302c02206baafface035e3758eea0dd9ef734976c70b6dd06f4d81d33f5e28bfb8730624</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Invalid signature, where r is shorter than specified in its ASN.1 length header.</desc>
     </sigResult>
     <sigResult>
-        <id>short_s</id>
+        <id>nok/short_s</id>
         <sig>SHA1</sig>
         <inline>0x30440220e641671e6415629dc8398e35ae1362cb647f293a92553b1594d57fff58df302c02226baafface035e3758eea0dd9ef734976c70b6dd06f4d81d33f5e28bfb8730624</inline>
         <curve>secg/secp256r1</curve>
         <signkey>wrong/default_priv</signkey>
         <verifykey>wrong/default_pub</verifykey>
+        <desc>Invalid signature, where s is shorter than specified in its ASN.1 length header.</desc>
     </sigResult>
 </results>
\ No newline at end of file