11 files changed, 175 insertions, 4 deletions

diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp112r1.xml b/src/cz/crcs/ectester/data/invalid/secg/secp112r1.xml
index ae8da15..316f0f6 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp112r1.xml
+++ b/src/cz/crcs/ectester/data/invalid/secg/secp112r1.xml
@@ -245,3 +245,22 @@
     <curve>secg/secp112r1</curve>
     <desc>invalid order = 179</desc>
 </pubkey>
+<!-- Additional points of larger order. -->
+<pubkey>
+    <id>secp112r1/41</id>
+    <inline>0x8eac00cf476993c428eaf07c80f1,0x27977f0c5acb323667408f21d143</inline>
+    <curve>secg/secp112r1</curve>
+    <desc>invalid order = 353</desc>
+</pubkey>
+<pubkey>
+    <id>secp112r1/42</id>
+    <inline>0x8c5a6233e53b2c6b6fcf33af2726,0x5a04f74d8b5e220e8c23d1f21bb6</inline>
+    <curve>secg/secp112r1</curve>
+    <desc>invalid order = 631</desc>
+</pubkey>
+<pubkey>
+    <id>secp112r1/43</id>
+    <inline>0x5a4479a257ed4b9a519f29184712,0x58c11aa81217d4ce67d8f05da930</inline>
+    <curve>secg/secp112r1</curve>
+    <desc>invalid order = 1231</desc>
+</pubkey>
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp112r2.xml b/src/cz/crcs/ectester/data/invalid/secg/secp112r2.xml
index 9dc187e..536cb56 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp112r2.xml
+++ b/src/cz/crcs/ectester/data/invalid/secg/secp112r2.xml
@@ -245,3 +245,22 @@
     <curve>secg/secp112r2</curve>
     <desc>invalid order = 179</desc>
 </pubkey>
+<!-- Additional points of larger order. -->
+<pubkey>
+    <id>secp112r2/41</id>
+    <inline>0x6fffe4ca3cbda6828ddd63e9ab11,0xcf5e055aa2a94c0d7214d998c3a0</inline>
+    <curve>secg/secp112r2</curve>
+    <desc>invalid order = 353</desc>
+</pubkey>
+<pubkey>
+    <id>secp112r2/42</id>
+    <inline>0x3813064a869de8884025d85736c0,0xd71ae54681ffc105144c8f7ba5bb</inline>
+    <curve>secg/secp112r2</curve>
+    <desc>invalid order = 631</desc>
+</pubkey>
+<pubkey>
+    <id>secp112r2/43</id>
+    <inline>0x6906e5609f3d9e47c7cd961dc08e,0x7fccd8384db6b6fcc842a4f397fd</inline>
+    <curve>secg/secp112r2</curve>
+    <desc>invalid order = 1231</desc>
+</pubkey>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp128r1.xml b/src/cz/crcs/ectester/data/invalid/secg/secp128r1.xml
index f038656..76f0aff 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp128r1.xml
+++ b/src/cz/crcs/ectester/data/invalid/secg/secp128r1.xml
@@ -269,3 +269,21 @@
     <curve>secg/secp128r1</curve>
     <desc>invalid order = 197</desc>
 </pubkey>
+<pubkey>
+    <id>secp128r1/45</id>
+    <inline>0xea08890b70e94ac5d53514b583580faf,0x6cc66b4eedab2a8f01a0b41195271853</inline>
+    <curve>secg/secp128r1</curve>
+    <desc>invalid order = 359</desc>
+</pubkey>
+<pubkey>
+    <id>secp128r1/46</id>
+    <inline>0x0ae9c73132e5ef2fd82d06b0f50bfe64,0x9b78c29bdf53038463fa4bf2edb4297a</inline>
+    <curve>secg/secp128r1</curve>
+    <desc>invalid order = 601</desc>
+</pubkey>
+<pubkey>
+    <id>secp128r1/47</id>
+    <inline>0xd3522b2fb7fd15b8fbaf10a9abc60ca9,0x21236ba59e5a40eb9881a0218a2c2359</inline>
+    <curve>secg/secp128r1</curve>
+    <desc>invalid order = 1103</desc>
+</pubkey>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp128r2.xml b/src/cz/crcs/ectester/data/invalid/secg/secp128r2.xml
index ecb62bf..11fc0d8 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp128r2.xml
+++ b/src/cz/crcs/ectester/data/invalid/secg/secp128r2.xml
@@ -269,3 +269,22 @@
     <curve>secg/secp128r2</curve>
     <desc>invalid order = 197</desc>
 </pubkey>
+<!-- Additional points of larger order. -->
+<pubkey>
+    <id>secp128r2/45</id>
+    <inline>0x33c5f2e6190f7a3c23dbc5a1020e0f32,0x40afb310a8c5537ecc07c59d971c5fe6</inline>
+    <curve>secg/secp128r2</curve>
+    <desc>invalid order = 359</desc>
+</pubkey>
+<pubkey>
+    <id>secp128r2/46</id>
+    <inline>0xd5392aed70323f8a02ec104dbd3dd3f2,0x0733de2e9d20bb117a632a9b5ff3c1a3</inline>
+    <curve>secg/secp128r2</curve>
+    <desc>invalid order = 631</desc>
+</pubkey>
+<pubkey>
+    <id>secp128r2/47</id>
+    <inline>0x005a0ea68afd5793063d4537045e5cba,0x6ec5978352c81a646fc1b29491a62a59</inline>
+    <curve>secg/secp128r2</curve>
+    <desc>invalid order = 1103</desc>
+</pubkey>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp160r1.xml b/src/cz/crcs/ectester/data/invalid/secg/secp160r1.xml
index 10fc5a0..c9ae8da 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp160r1.xml
+++ b/src/cz/crcs/ectester/data/invalid/secg/secp160r1.xml
@@ -323,3 +323,22 @@
     <curve>secg/secp160r1</curve>
     <desc>invalid order = 251</desc>
 </pubkey>
+<!-- Additional points of larger order. -->
+<pubkey>
+    <id>secp160r1/54</id>
+    <inline>0x8932e643678c5a324d7a2cf47528676d08f135d5,0x3a6a976e51623bf13d8d339312e2e65c9b29ea04</inline>
+    <curve>secg/secp160r1</curve>
+    <desc>invalid order = 353</desc>
+</pubkey>
+<pubkey>
+    <id>secp160r1/55</id>
+    <inline>0xaee7bf31f3d12332e5e529eb0a7732ac913d0211,0xaa88ae4645cac4e7970a764e486774b2398e9fd0</inline>
+    <curve>secg/secp160r1</curve>
+    <desc>invalid order = 613</desc>
+</pubkey>
+<pubkey>
+    <id>secp160r1/56</id>
+    <inline>0xc0a7736e7eec336eb3b7f853a832d4eec1d6f33f,0x2d7c536a1ee9cca9bb504755225c678f64ed5275</inline>
+    <curve>secg/secp160r1</curve>
+    <desc>invalid order = 1123</desc>
+</pubkey>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp160r2.xml b/src/cz/crcs/ectester/data/invalid/secg/secp160r2.xml
index 596fc6c..b1658c5 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp160r2.xml
+++ b/src/cz/crcs/ectester/data/invalid/secg/secp160r2.xml
@@ -323,3 +323,22 @@
     <curve>secg/secp160r2</curve>
     <desc>invalid order = 251</desc>
 </pubkey>
+<!-- Additional points of larger order. -->
+<pubkey>
+    <id>secp160r2/54</id>
+    <inline>0x15567f6e8e2d4a71ed809adbd53c620b3d674ca4,0xb418ff9fdc1eb410dd53064090099e76473d3f61</inline>
+    <curve>secg/secp160r2</curve>
+    <desc>invalid order = 353</desc>
+</pubkey>
+<pubkey>
+    <id>secp160r2/55</id>
+    <inline>0x490905f64c868304641864ca9ad90fa48475f765,0xb52e302f7fe9c63a9bf6124daff99e7e3c7f9fda</inline>
+    <curve>secg/secp160r2</curve>
+    <desc>invalid order = 613</desc>
+</pubkey>
+<pubkey>
+    <id>secp160r2/56</id>
+    <inline>0x1de73470d9a5ed4c6bb7a4c162956d20c1c2a38a,0x8037b163763d4dfd2d218f7d85d17c06bfa07ecc</inline>
+    <curve>secg/secp160r2</curve>
+    <desc>invalid order = 1123</desc>
+</pubkey>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp192r1.xml b/src/cz/crcs/ectester/data/invalid/secg/secp192r1.xml
index 151189e..e823fed 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp192r1.xml
+++ b/src/cz/crcs/ectester/data/invalid/secg/secp192r1.xml
@@ -371,3 +371,22 @@
     <curve>secg/secp192r1</curve>
     <desc>invalid order = 293</desc>
 </pubkey>
+<!-- Additional points of larger order. -->
+<pubkey>
+    <id>secp192r1/62</id>
+    <inline>0x64f88f2014026439717b443fd0e9656bae76bc12e04846a6,0xed20d8d4ee021c98be74fdfd4e545fb8b8e529f269f6059e</inline>
+    <curve>secg/secp192r1</curve>
+    <desc>invalid order = 353</desc>
+</pubkey>
+<pubkey>
+    <id>secp192r1/63</id>
+    <inline>0xeed3216e47d486fc7d1717e5732e1ef5409b84a0777df50a,0x20b7bcc21f15418b75ef425fcb0c7caf87c9ccad70e06142</inline>
+    <curve>secg/secp192r1</curve>
+    <desc>invalid order = 631</desc>
+</pubkey>
+<pubkey>
+    <id>secp192r1/64</id>
+    <inline>0xc26950fdd51d386cf3c9d8e3e78c33e10e1046bfd5c41d8a,0x8bea331f38d09138dd75f414466db8c13948f8c6ddcc5def</inline>
+    <curve>secg/secp192r1</curve>
+    <desc>invalid order = 1231</desc>
+</pubkey>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp224r1.xml b/src/cz/crcs/ectester/data/invalid/secg/secp224r1.xml
index aea9831..3f8c8fc 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp224r1.xml
+++ b/src/cz/crcs/ectester/data/invalid/secg/secp224r1.xml
@@ -413,3 +413,22 @@
     <curve>secg/secp224r1</curve>
     <desc>invalid order = 347</desc>
 </pubkey>
+<!-- Additional points of larger order. -->
+<pubkey>
+    <id>secp224r1/69</id>
+    <inline>0x21224a2e74c519b044cb0885bb4d39c93d459cb810a486e2bd257380,0xfcf0f5c414e98767bdd0a95887aa065634102f61afcbe13b7f1918c9</inline>
+    <curve>secg/secp224r1</curve>
+    <desc>invalid order = 353</desc>
+</pubkey>
+<pubkey>
+    <id>secp224r1/70</id>
+    <inline>0xc81155743c1ce0d22f9bbc7acf64666e1e82973866c63e7e10a295c3,0x83ddf0ad6ed67e8863f3830e0ef6e76857b2d21d6de3ce9bc60153a0</inline>
+    <curve>secg/secp224r1</curve>
+    <desc>invalid order = 631</desc>
+</pubkey>
+<pubkey>
+    <id>secp224r1/71</id>
+    <inline>0x74c39d25aaff45aea0a1e2a1f76ce58fc56bfff0b92f21ecea29b582,0x9a1f6fee02efe3a3013501fb4b77f9f6e6ca633463809207319a0787</inline>
+    <curve>secg/secp224r1</curve>
+    <desc>invalid order = 1231</desc>
+</pubkey>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/invalid/secg/secp256r1.xml b/src/cz/crcs/ectester/data/invalid/secg/secp256r1.xml
index 6f93370..2c23ea7 100644
--- a/src/cz/crcs/ectester/data/invalid/secg/secp256r1.xml
+++ b/src/cz/crcs/ectester/data/invalid/secg/secp256r1.xml
@@ -461,3 +461,22 @@
     <curve>secg/secp256r1</curve>
     <desc>invalid order = 389</desc>
 </pubkey>
+<!-- Additional points of larger order. -->
+<pubkey>
+    <id>secp256r1/77</id>
+    <inline>0xb1b630092fa728b962bda086704dd16628d8ba65a5836f0e5ab6b268b1874346,0x6741a8de59e27d93c2afe35d02a62a0d6ca1d410f02fa272c916457c3d64024e</inline>
+    <curve>secg/secp256r1</curve>
+    <desc>invalid order = 353</desc>
+</pubkey>
+<pubkey>
+    <id>secp256r1/78</id>
+    <inline>0x8ccf453921033e2a0e2d612103f9d6037bede19bce172bc7e4cfab350dba5c1b,0x4f381c96db7205602819de572b088b81cd8aad51dec5367b2572d07ec174b13b</inline>
+    <curve>secg/secp256r1</curve>
+    <desc>invalid order = 631</desc>
+</pubkey>
+<pubkey>
+    <id>secp256r1/79</id>
+    <inline>0xed9c0943430dbb23b735c527f5376eb1f159ce7ed42d725f89b03d2b4004dd93,0xc8e98a510b4d1988d8291c4f59b99894285b0a18801ec46e1d732c37fbbe6027</inline>
+    <curve>secg/secp256r1</curve>
+    <desc>invalid order = 1231</desc>
+</pubkey>
\ No newline at end of file
diff --git a/util/plot_dh.py b/util/plot_dh.py
index 33fc3eb..468e73a 100755
--- a/util/plot_dh.py
+++ b/util/plot_dh.py
@@ -104,4 +104,4 @@ if __name__ == "__main__":
     else:
         fig.set_size_inches(12, 10)
         ext = opts.output.name.split(".")[-1]
-        plt.savefig(opts.output, format=ext, dpi=400)
+        plt.savefig(opts.output, format=ext, dpi=400, bbox_inches='tight')
diff --git a/util/plot_gen.py b/util/plot_gen.py
index c37d7c2..98d8261 100755
--- a/util/plot_gen.py
+++ b/util/plot_gen.py
@@ -123,12 +123,13 @@ if __name__ == "__main__":
         axe_priv_hist.set_xlabel("private key Hamming weight")
         axe_priv_hist.set_ylabel("time ({})".format(unit))
         fig.colorbar(im, ax=axe_priv_hist)
-        
-    fig.text(0.01, 0.02, "Data size: {}".format(len(time_data)), size="small")
+
+    if plot_i > 2:
+        fig.text(0.01, 0.02, "Data size: {}".format(len(time_data)), size="small")
 
     if opts.output is None:
         plt.show()
     else:
         fig.set_size_inches(12, 10)
         ext = opts.output.name.split(".")[-1]
-        plt.savefig(opts.output, format=ext, dpi=400)
+        plt.savefig(opts.output, format=ext, dpi=400, bbox_inches='tight')