34 files changed, 255 insertions, 5 deletions

diff --git a/docs/LIBS.md b/docs/LIBS.md
index 512dee2..903aef4 100644
--- a/docs/LIBS.md
+++ b/docs/LIBS.md
@@ -66,4 +66,8 @@ Popular libraries with at least some ECC support:
     - Uses Jacobian coordinates.
     - Sliding window scalar multiplication algorithm.
  - [Crypto++](https://cryptopp.com/)
-    - C++
\ No newline at end of file
+    - C++
+    - For prime field curves:
+      - Uses projective coordinates and sliding window scalar multiplication algorithm.
+    - For binary field curves:
+      - Uses affine coordinates and sliding window scalar multiplication algorithm.
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
index ea28489..ee55069 100644
--- a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
@@ -58,6 +58,7 @@ public abstract class BaseTextTestWriter implements TestWriter {
 		if (prefix.equals("")) {
 			char charLine[] = new char[BASE_WIDTH + 24];
 			new String(new char[BASE_WIDTH + 24]).replace("\0", "━").getChars(0, charLine.length - 1, charLine, 0);
+			charLine[0] = '■';
 			charLine[4] = '┳';
 			charLine[BASE_WIDTH + 1] = '┳';
 			charLine[BASE_WIDTH + 13] = '┳';
diff --git a/src/cz/crcs/ectester/data/composite/curves.xml b/src/cz/crcs/ectester/data/composite/curves.xml
index c0d61c2..f1af987 100644
--- a/src/cz/crcs/ectester/data/composite/curves.xml
+++ b/src/cz/crcs/ectester/data/composite/curves.xml
@@ -300,4 +300,215 @@
         <file>carmichael_521.csv</file>
         <desc>r = Carmichael pseudoprime = 0x170ac4fd154250e674f9ac6e0c29a214c6d6553e4f11 * 0x2e1589fa2a84a1cce9f358dc185344298dacaa7c9e21 * 0x45204ef73fc6f2b35eed054a247ce63e5482ffbaed31</desc>
     </curve>
+
+    <curve>
+        <id>varying/160/2</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/2.csv</file>
+        <desc>r = 2 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/3</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/3.csv</file>
+        <desc>r = 3 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/4</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/4.csv</file>
+        <desc>r = 4 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/5</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/5.csv</file>
+        <desc>r = 5 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/6</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/6.csv</file>
+        <desc>r = 6 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/7</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/7.csv</file>
+        <desc>r = 7 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/8</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/8.csv</file>
+        <desc>r = 8 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/10</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/10.csv</file>
+        <desc>r = 10 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/12</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/12.csv</file>
+        <desc>r = 12 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/14</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/14.csv</file>
+        <desc>r = 14 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/16</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/16.csv</file>
+        <desc>r = 16 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/20</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/20.csv</file>
+        <desc>r = 20 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/25</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/25.csv</file>
+        <desc>r = 25 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/32</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/32.csv</file>
+        <desc>r = 32 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/48</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/48.csv</file>
+        <desc>r = 48 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/64</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/64.csv</file>
+        <desc>r = 64 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/70</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/70.csv</file>
+        <desc>r = 70 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/80</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/80.csv</file>
+        <desc>r = 80 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/90</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/90.csv</file>
+        <desc>r = 90 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/96</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/96.csv</file>
+        <desc>r = 96 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/112</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/112.csv</file>
+        <desc>r = 112 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/128</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/128.csv</file>
+        <desc>r = 128 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/135</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/135.csv</file>
+        <desc>r = 135 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/140</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/140.csv</file>
+        <desc>r = 140 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/144</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/144.csv</file>
+        <desc>r = 144 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/146</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/146.csv</file>
+        <desc>r = 146 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/148</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/148.csv</file>
+        <desc>r = 148 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/150</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/150.csv</file>
+        <desc>r = 150 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/152</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/152.csv</file>
+        <desc>r = 152 bit prime</desc>
+    </curve>
+    <curve>
+        <id>varying/160/152cofactor</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>varying/160/152_cofactor.csv</file>
+        <desc>r = 152 bit prime, with correct cofactor</desc>
+    </curve>
 </curves>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/10.csv b/src/cz/crcs/ectester/data/composite/varying/160/10.csv
new file mode 100644
index 0000000..5fa842a
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/10.csv
@@ -0,0 +1 @@
+0xb1c8eb4d314d22f1bdb2294eaed063e64f580611,0x6a1a4b89dc64200e98c46af58e8d7d0a52aba862,0xa0c9a0d9070ceefcaa3f2324668d6e3e9a3bf8f7,0x4b517e44056658e1f778d6c1075eefc644eaae5e,0x15ca498bd6ab9519c5be6f29882cbc68e47479cd,0x0000000000000000000000000000000000000337,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/112.csv b/src/cz/crcs/ectester/data/composite/varying/160/112.csv
new file mode 100644
index 0000000..633ccd5
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/112.csv
@@ -0,0 +1 @@
+0x9f3386530aa0a8009acbbe9caa919f72c8d5730f,0x33f8b03510268eb1ca33c2996ddacec1b314c5a6,0x4d9b3a2737345fe43069f306eabdc123e8e847b2,0x803f5afafe7ccb0433355eaf7a1aa1e93d1161b0,0x702c66bf3f3235fbcf3e2a7bf3bf56a69169d1c1,0x000000000000c978cb903a08ddcef1daa40de1f5,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/12.csv b/src/cz/crcs/ectester/data/composite/varying/160/12.csv
new file mode 100644
index 0000000..62bb1a0
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/12.csv
@@ -0,0 +1 @@
+0xa7d15a5258f4f3855cb22ce8d00571133e8ad0f3,0x61f9830a932a4cdd257061624f3b820e9b91db6e,0x758ee90aa5d7fe797c4817d0c2011f062a263429,0x4f448e668102ec49a2042cf2c15f9879d2d14068,0x05043866b8c4d47377f25942b075e835b121ceeb,0x0000000000000000000000000000000000000c25,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/128.csv b/src/cz/crcs/ectester/data/composite/varying/160/128.csv
new file mode 100644
index 0000000..5f8c532
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/128.csv
@@ -0,0 +1 @@
+0xb13f0d997960752db0a77c95ade4843941645c87,0x7acba0516ea114053bc3e8fa026857990e610d4b,0x7f9755351f5279758bde2b9739c5f907d159ff26,0x08010035ebd4107beb815893817f2b00f7911d96,0x932569a7385306a3b33e4669100feda47db97168,0x00000000c85d322721a790e50860fee459f6292f,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/135.csv b/src/cz/crcs/ectester/data/composite/varying/160/135.csv
new file mode 100644
index 0000000..232abff
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/135.csv
@@ -0,0 +1 @@
+0xd3f3289b14ab182f38b78fab5dbaf3674c02597d,0xb8880d01c2b44c8a27805524913e438e6458411d,0x89482f3814165014cc30b134849ead387c7ad048,0xc44043b00f6f65000cb63a22fbbb0785985d0699,0x6097e0e529330900f844ccd27a69a96b16509c16,0x0000006c7fcc23ea5ce765d52954b58745d67e81,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/14.csv b/src/cz/crcs/ectester/data/composite/varying/160/14.csv
new file mode 100644
index 0000000..c8df53e
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/14.csv
@@ -0,0 +1 @@
+0xbdf7ada7a57600f5d5b371b51218a619536cebc7,0x799707863618aaaffb5d46ca3427d6cfecdc6476,0x590f7e7193a997a2b60ab8e31107f1832473290b,0x795684e5a9816c14dff9c8b509c8c87afa3bbbc3,0xaabbea132ba2097d8025a5387aed8482147c530a,0x0000000000000000000000000000000000003437,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/140.csv b/src/cz/crcs/ectester/data/composite/varying/160/140.csv
new file mode 100644
index 0000000..4d59858
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/140.csv
@@ -0,0 +1 @@
+0xcf8ecac9bc992d2df7ba9015b5bdcbdf2d1c2aa9,0xa067f72ab472977a150f4684df8e9ccee909489f,0x080cac1702258fce0fbafbdb4f861ad4554a05c6,0xa4601066e4fcb7308022ac922a3a1475197e723e,0x0a210871677b6b921846b4ff0c055cd93f2aa275,0x00000fe55175f2c1fc9827ef4997357705b40a5d,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/144.csv b/src/cz/crcs/ectester/data/composite/varying/160/144.csv
new file mode 100644
index 0000000..e8c6492
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/144.csv
@@ -0,0 +1 @@
+0xc4bfe673203f80fd04c89a5942c18074bcc2a719,0x9d4a0edafeb576559fe95f1dfde0e006a9e0f6fb,0x2c075927ef142a14c84de72b208e8b5ee1d762b0,0x5a808971a0093ceadb15cf76068c5e7c3c4269b1,0x27a0f2741a55767ef3175461120c5f42a5b54f4f,0x0000d9935a273b9b1402519925d6a6a8b4f9342b,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/146.csv b/src/cz/crcs/ectester/data/composite/varying/160/146.csv
new file mode 100644
index 0000000..f656c72
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/146.csv
@@ -0,0 +1 @@
+0xbdf7ada7a57600f5d5b371b51218a619536cebc7,0x799707863618aaaffb5d46ca3427d6cfecdc6476,0x590f7e7193a997a2b60ab8e31107f1832473290b,0x4ccf365eda5a0e85438b6df2bf57d668cf5d8192,0x702b5f386587f0d85e6cf56b511de035b62c4379,0x0003a3606233edce56cac59bd01e622561e99e77,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/148.csv b/src/cz/crcs/ectester/data/composite/varying/160/148.csv
new file mode 100644
index 0000000..b292889
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/148.csv
@@ -0,0 +1 @@
+0xa7d15a5258f4f3855cb22ce8d00571133e8ad0f3,0x61f9830a932a4cdd257061624f3b820e9b91db6e,0x758ee90aa5d7fe797c4817d0c2011f062a263429,0x356da5d90cef81adb97a8cc3e95861fc156ab6c3,0x63ea1cb827821f6d3599e303594a4e21911971a3,0x000dd1818cc0197085816a97b6056c3917bb32d9,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/150.csv b/src/cz/crcs/ectester/data/composite/varying/160/150.csv
new file mode 100644
index 0000000..c1bf12e
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/150.csv
@@ -0,0 +1 @@
+0xb1c8eb4d314d22f1bdb2294eaed063e64f580611,0x6a1a4b89dc64200e98c46af58e8d7d0a52aba862,0xa0c9a0d9070ceefcaa3f2324668d6e3e9a3bf8f7,0x39ce0be4410100e1349fae8ec18fabb91f1816dd,0x3a44dee9ecb21038fb8c3e987e285f09b456bdc7,0x00374d1df48d00aa21837b6f9717173eb656c659,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/152.csv b/src/cz/crcs/ectester/data/composite/varying/160/152.csv
new file mode 100644
index 0000000..24a03ba
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/152.csv
@@ -0,0 +1 @@
+0xc9d72249375ff1884a80e426e79315f02fb6904f,0x003ce7e6420986df1c87895fe1b83ed86f93cf10,0x7ed71b8a343a6d4da4220123d2b3405d9e4f813f,0x3f30626d74214324e1ee6c97341abe2a9b2bdd07,0x17fb8a3dc06dc7680485871fc3ed4f8e8e662778,0x00e7b588f02d33982511ca6ab8485259bf119a2f,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/152_cofactor.csv b/src/cz/crcs/ectester/data/composite/varying/160/152_cofactor.csv
new file mode 100644
index 0000000..7861bbd
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/152_cofactor.csv
@@ -0,0 +1 @@
+0xc9d72249375ff1884a80e426e79315f02fb6904f,0x003ce7e6420986df1c87895fe1b83ed86f93cf10,0x7ed71b8a343a6d4da4220123d2b3405d9e4f813f,0x3f30626d74214324e1ee6c97341abe2a9b2bdd07,0x17fb8a3dc06dc7680485871fc3ed4f8e8e662778,0x00e7b588f02d33982511ca6ab8485259bf119a2f,0xdf
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/16.csv b/src/cz/crcs/ectester/data/composite/varying/160/16.csv
new file mode 100644
index 0000000..fd76ff7
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/16.csv
@@ -0,0 +1 @@
+0xc4bfe673203f80fd04c89a5942c18074bcc2a719,0x9d4a0edafeb576559fe95f1dfde0e006a9e0f6fb,0x2c075927ef142a14c84de72b208e8b5ee1d762b0,0x364591432aca4ab7e451866819263e32f57fa052,0x634d15df260f3bb8e92cd0d4940d176e2d97bddc,0x000000000000000000000000000000000000e77f,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/2.csv b/src/cz/crcs/ectester/data/composite/varying/160/2.csv
new file mode 100644
index 0000000..670f4bc
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/2.csv
@@ -0,0 +1 @@
+0x7b6d7f82beae015788a67ad391bb68ad720ba991,0x6f222dd4f5ec04fdb0202f461d10c3fa1cec6d45,0x2792a26122d154d68bdb523330a06cc252894165,0x50fa49d7061feaeec4f4f4592744d26decd6243a,0x0000000000000000000000000000000000000000,0x0000000000000000000000000000000000000002,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/20.csv b/src/cz/crcs/ectester/data/composite/varying/160/20.csv
new file mode 100644
index 0000000..940d10c
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/20.csv
@@ -0,0 +1 @@
+0xcf8ecac9bc992d2df7ba9015b5bdcbdf2d1c2aa9,0xa067f72ab472977a150f4684df8e9ccee909489f,0x080cac1702258fce0fbafbdb4f861ad4554a05c6,0x4c4356d56316d6556e7b427a3e1aacd1c1805a8a,0x3d55e3b1904c5e66c75b00710068ffaec4a60ddb,0x00000000000000000000000000000000000d0eb3,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/25.csv b/src/cz/crcs/ectester/data/composite/varying/160/25.csv
new file mode 100644
index 0000000..318099b
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/25.csv
@@ -0,0 +1 @@
+0xd3f3289b14ab182f38b78fab5dbaf3674c02597d,0xb8880d01c2b44c8a27805524913e438e6458411d,0x89482f3814165014cc30b134849ead387c7ad048,0x593ddf0087b88e469110d12067c86b00bb6f219d,0x968f74b30717f0ca56749382ba5aece4182b35d6,0x0000000000000000000000000000000001f4168b,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/3.csv b/src/cz/crcs/ectester/data/composite/varying/160/3.csv
new file mode 100644
index 0000000..18ec491
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/3.csv
@@ -0,0 +1 @@
+0xd41869824871ccc03ff87bd99c9a6d2eb7c557bd,0x80b0b37638bd5678af01089dbc13a8674ad96422,0x4c2d8f41681795f138af380c86c98e1d6ee2f3a4,0x6597db8eade96de1d5a546172358d578985e4802,0xa8f85050990cbd2d365b4ef44ead757bfb9af8b5,0x0000000000000000000000000000000000000007,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/32.csv b/src/cz/crcs/ectester/data/composite/varying/160/32.csv
new file mode 100644
index 0000000..fddfeee
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/32.csv
@@ -0,0 +1 @@
+0xb13f0d997960752db0a77c95ade4843941645c87,0x7acba0516ea114053bc3e8fa026857990e610d4b,0x7f9755351f5279758bde2b9739c5f907d159ff26,0x4ce786a838268215724f1edae0ddec658ef20e6a,0xaeaa4f03aefbbf5fbaeb393ca859d8f27ca56a32,0x00000000000000000000000000000000e2768a75,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/4.csv b/src/cz/crcs/ectester/data/composite/varying/160/4.csv
new file mode 100644
index 0000000..a5b9e09
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/4.csv
@@ -0,0 +1 @@
+0xb12cff876adc5a923ed34fcd10143de02f8e0369,0x6cb241142b8fb14f45608aec44a325ad195044b5,0xa7cb4cbde8d7792bee9d4856d80df54cdc925b1f,0x07527e2751335207ab0ddb4d5692c7d9219990f5,0x1d1cd5f91fce22653562dd0534ddb861e7005cb6,0x000000000000000000000000000000000000000d,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/48.csv b/src/cz/crcs/ectester/data/composite/varying/160/48.csv
new file mode 100644
index 0000000..202a15b
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/48.csv
@@ -0,0 +1 @@
+0x9f3386530aa0a8009acbbe9caa919f72c8d5730f,0x33f8b03510268eb1ca33c2996ddacec1b314c5a6,0x4d9b3a2737345fe43069f306eabdc123e8e847b2,0x0f1ca7149bc1933e1e7efdc55c325df7ad4ba562,0x3b689e90dec0b6c85d679d970278d0f9fa30f013,0x0000000000000000000000000000ca49f6d457c1,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/5.csv b/src/cz/crcs/ectester/data/composite/varying/160/5.csv
new file mode 100644
index 0000000..5f0597c
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/5.csv
@@ -0,0 +1 @@
+0xe13cc8432dad5ed8a4d2893803957c1e109e0c8f,0x7102ce05e08a10ffe665313cece127f5ff590473,0x2dcb47653c268fc7b0f767ae66fcefc98055399c,0x2c4b06f7428dda4532fbea727c7b1f84782e9762,0x4406bb147b080724d2be46eb15327dd350d7307a,0x000000000000000000000000000000000000001f,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/6.csv b/src/cz/crcs/ectester/data/composite/varying/160/6.csv
new file mode 100644
index 0000000..9c1528f
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/6.csv
@@ -0,0 +1 @@
+0xe9e74933088156a9f60b0f23253fe21ce259d783,0x6a01bdfb7c22fa778456edc767d0f61895561f27,0x27591495bbaf4845cf807f59d3091b0ec830b080,0xb956503ece30bccd9dc08bc76da995e390b2d0ea,0x30ca629aa64506f2b5e6c71fe7dea2c4284d1a2a,0x000000000000000000000000000000000000003d,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/64.csv b/src/cz/crcs/ectester/data/composite/varying/160/64.csv
new file mode 100644
index 0000000..94a2709
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/64.csv
@@ -0,0 +1 @@
+0xba824697c3ac48fbf53bdc6997a10f2e9e9d24fd,0x00878d8c00cc5b137d7ee7f3defe3ee2d614112e,0x439154313b1e0b63a3cf445a67af1f2f9442238c,0x33e0dfbcd3bdbd0a3d98254c8c706852ac9160ec,0xb0895e2997ef93d8b9500068855afeff515284c3,0x000000000000000000000000ee49fe4c5b77e201,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/7.csv b/src/cz/crcs/ectester/data/composite/varying/160/7.csv
new file mode 100644
index 0000000..170b180
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/7.csv
@@ -0,0 +1 @@
+0xb7a0a5730514d83583a708acd53a492d970022bd,0x6ee6d2a43a4daf1c0190aaf2384644b59b1c7f11,0x1835fc673409a0265da795eb4d0ad15358b3369a,0x0fee93a779b05c49623527d2a0af78315efbded6,0xb75b77ea3261bf5713cdec1cdd7251dff38232d6,0x0000000000000000000000000000000000000065,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/70.csv b/src/cz/crcs/ectester/data/composite/varying/160/70.csv
new file mode 100644
index 0000000..1dbf9c0
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/70.csv
@@ -0,0 +1 @@
+0xcc0786de97196a16f433bd40cd1932999867b103,0x7a58470e1615f4676bfc6fc57d71c99285a56919,0xa047dff6287d28be79b09ce6a398b57e8c2a97e9,0x570bda529a23c0a651113cdb5083439d3a6fd30c,0x9d71ecbe74fb180d08a7bdbb77e6aad40d2146b7,0x00000000000000000000003ba788abd620e775e7,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/8.csv b/src/cz/crcs/ectester/data/composite/varying/160/8.csv
new file mode 100644
index 0000000..232df05
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/8.csv
@@ -0,0 +1 @@
+0xc9d72249375ff1884a80e426e79315f02fb6904f,0x003ce7e6420986df1c87895fe1b83ed86f93cf10,0x7ed71b8a343a6d4da4220123d2b3405d9e4f813f,0x083e1d65a5ebcf6f98f2202ea5bfe021db0ce40e,0x16947d2cf97c654222c015b6ff56b9471f9518a9,0x00000000000000000000000000000000000000df,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/80.csv b/src/cz/crcs/ectester/data/composite/varying/160/80.csv
new file mode 100644
index 0000000..da082ef
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/80.csv
@@ -0,0 +1 @@
+0xd84ff9bc6df5a2f01d087f4c5e35ae905eb55e13,0xa50dbf4c40d4455f045c249b655b146d5d07a8a3,0xd6aed5bd031f7c3af319cdf03d45ee1b2e5c72ae,0x3a2b110757656c93362455ad480d38207b826d38,0x9cf1881da1e1f10777900f8c18996e8fbd3e470f,0x00000000000000000000e74bbc29baa61aca49d1,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/90.csv b/src/cz/crcs/ectester/data/composite/varying/160/90.csv
new file mode 100644
index 0000000..d67e673
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/90.csv
@@ -0,0 +1 @@
+0xcc0786de97196a16f433bd40cd1932999867b103,0x7a58470e1615f4676bfc6fc57d71c99285a56919,0xa047dff6287d28be79b09ce6a398b57e8c2a97e9,0x353f1f34902fb9c28b62c145369afa64b301e48c,0x0fd9c5d52882c2af8b99b5209bd80e44839c2e2e,0x0000000000000000036b917bc29fe57e7df01d13,0x01
diff --git a/src/cz/crcs/ectester/data/composite/varying/160/96.csv b/src/cz/crcs/ectester/data/composite/varying/160/96.csv
new file mode 100644
index 0000000..5dd2d5c
--- /dev/null
+++ b/src/cz/crcs/ectester/data/composite/varying/160/96.csv
@@ -0,0 +1 @@
+0xba824697c3ac48fbf53bdc6997a10f2e9e9d24fd,0x00878d8c00cc5b137d7ee7f3defe3ee2d614112e,0x439154313b1e0b63a3cf445a67af1f2f9442238c,0x5fb9809c2f608e2fb788c735d0233b2dd1cbc243,0x4e71dd0a87b3d4ff1689a77829ba527781f21cbd,0x0000000000000000c85f0b3dd7355b3a516de59b,0x01
diff --git a/src/cz/crcs/ectester/reader/test/CardCompositeSuite.java b/src/cz/crcs/ectester/reader/test/CardCompositeSuite.java
index c4b3775..5de8608 100644
--- a/src/cz/crcs/ectester/reader/test/CardCompositeSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardCompositeSuite.java
@@ -47,13 +47,12 @@ public class CardCompositeSuite extends CardTestSuite {
                 continue;
             }
             tests.add(allocate);
+            tests.add(CommandTest.expect(new Command.Set(this.card, ECTesterApplet.KEYPAIR_LOCAL, EC_Consts.CURVE_external, curve.getParams(), curve.flatten()), ExpectedValue.ANY));
+            tests.add(CommandTest.expect(new Command.Generate(this.card, ECTesterApplet.KEYPAIR_LOCAL), ExpectedValue.ANY));
             for (EC_Key key : curveKeys.getValue()) {
-                Test set = CommandTest.expect(new Command.Set(this.card, ECTesterApplet.KEYPAIR_LOCAL, EC_Consts.CURVE_external, curve.getParams(), curve.flatten()), ExpectedValue.ANY);
-                Test generate = CommandTest.expect(new Command.Generate(this.card, ECTesterApplet.KEYPAIR_LOCAL), ExpectedValue.ANY);
                 Command ecdhCommand = new Command.ECDH_direct(this.card, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.EXPORT_FALSE, EC_Consts.TRANSFORMATION_NONE, EC_Consts.KeyAgreement_ALG_EC_SVDP_DH, key.flatten());
                 Test ecdh = CommandTest.expect(ecdhCommand, ExpectedValue.FAILURE, "Card correctly rejected to do ECDH over a composite order curve.", "Card incorrectly does ECDH over a composite order curve, leaks bits of private key.");
-
-                tests.add(CompoundTest.greedyAllTry(ExpectedValue.SUCCESS, "Composite test of " + curve.getId() + ", " + key.getDesc(), set, generate, ecdh));
+                tests.add(CompoundTest.greedyAllTry(ExpectedValue.SUCCESS, "Composite test of " + curve.getId() + ", " + key.getDesc(), ecdh));
             }
             doTest(CompoundTest.all(ExpectedValue.SUCCESS, "Composite test of " + curve.getId() + ".", tests.toArray(new Test[0])));
             new Command.Cleanup(this.card).send();
@@ -72,6 +71,11 @@ public class CardCompositeSuite extends CardTestSuite {
         List<EC_Curve> smallRCurves = groupList.stream().filter((e) -> e.getKey().equals("small")).findFirst().get().getValue();
         testGroup(smallRCurves, "Small generator order", ExpectedValue.FAILURE, "Card correctly rejected to do ECDH over a small order generator.", "Card incorrectly does ECDH over a small order generator.");
 
+        /* Test increasingly larger prime R, to determine where/if card behavior changes.
+         */
+        List<EC_Curve> varyingCurves = groupList.stream().filter((e) -> e.getKey().equals("varying")).findFirst().get().getValue();
+        testGroup(varyingCurves, null, ExpectedValue.ANY, "", "");
+
         /* Also test having a G of large but composite order, R = p * q,
          */
         List<EC_Curve> pqCurves = groupList.stream().filter((e) -> e.getKey().equals("pq")).findFirst().get().getValue();