From 057285ad64f261d27df9fd1b465e7bccdfc645d5 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Tue, 3 Jul 2018 14:02:31 +0200
Subject: Fix cofactor/pq/cofactor192/1 key.

---
 src/cz/crcs/ectester/data/EC_Store.java                  | 4 ++--
 src/cz/crcs/ectester/data/cofactor/keys.xml              | 4 ++--
 src/cz/crcs/ectester/data/composite/composite192_pq2.csv | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/cz/crcs/ectester/data/EC_Store.java b/src/cz/crcs/ectester/data/EC_Store.java
index db8371c..b962f23 100644
--- a/src/cz/crcs/ectester/data/EC_Store.java
+++ b/src/cz/crcs/ectester/data/EC_Store.java
@@ -332,8 +332,8 @@ public class EC_Store {
         }
         List<Map.Entry<EC_Curve, List<T>>> curveList = new LinkedList<>();
         curveList.addAll(curves.entrySet());
-        Comparator<Map.Entry<EC_Curve, List<T>>> c = Comparator.comparing(o -> o.getKey().getBits());
-        curveList.sort(c.thenComparing(b -> b.getKey().getId()));
+        Comparator<Map.Entry<EC_Curve, List<T>>> c = Comparator.comparing(o -> o.getKey().getId());
+        curveList.sort(c.thenComparing(b -> b.getKey().getBits()));
         return curveList;
     }
 
diff --git a/src/cz/crcs/ectester/data/cofactor/keys.xml b/src/cz/crcs/ectester/data/cofactor/keys.xml
index 6d5f89c..100142b 100644
--- a/src/cz/crcs/ectester/data/cofactor/keys.xml
+++ b/src/cz/crcs/ectester/data/cofactor/keys.xml
@@ -190,9 +190,9 @@
     </pubkey>
     <pubkey>
         <id>pq/cofactor192/1</id>
-        <inline>0x6366613b66339fa580f390d630ccf9b535437229aa8b61cd,0x2abab8c0e803a3612c7a7fbcb47e06fd8ef42a7a7d8c380f</inline>
+        <inline>0x6366613b66339fa580f390d630ccf9b535437229aa8b61cd,0x1b975fa3848bd68f34f6a08b7cf190bcaeaf9782270e2413</inline>
         <curve>composite/pq/composite192/1</curve>
-        <desc>cofactor order = 0x00000000000000000000000000302b72431ff070e7e06799</desc>
+        <desc>cofactor order = 0x00000000000000000000035efd8bad55038e6bd22db8b805</desc>
     </pubkey>
     <pubkey>
         <id>pq/cofactor224/1</id>
diff --git a/src/cz/crcs/ectester/data/composite/composite192_pq2.csv b/src/cz/crcs/ectester/data/composite/composite192_pq2.csv
index 41f4610..33fe0f3 100644
--- a/src/cz/crcs/ectester/data/composite/composite192_pq2.csv
+++ b/src/cz/crcs/ectester/data/composite/composite192_pq2.csv
@@ -1 +1 @@
-0xa261fff62647eebf810a404f0c80a971dd7c7838fdc52b5b,0x87502ebb62d26e1eca06c434f8ef069dfb2c287d6183750c,0x4ad6ce1f16e1bfc3d40f0027d787aeadb53846d69099a883,0x6366613b66339fa580f390d630ccf9b535437229aa8b61cd,0x1b975fa3848bd68f34f6a08b7cf190bcaeaf9782270e2413,0x00000000000000000000035efd8bad55038e6bd22db8b805,0x1
\ No newline at end of file
+0xa261fff62647eebf810a404f0c80a971dd7c7838fdc52b5b,0x87502ebb62d26e1eca06c434f8ef069dfb2c287d6183750c,0x4ad6ce1f16e1bfc3d40f0027d787aeadb53846d69099a883,0x6366613b66339fa580f390d630ccf9b535437229aa8b61cd,0x1b975fa3848bd68f34f6a08b7cf190bcaeaf9782270e2413,0x00000000000000000000035efd8bad55038e6bd22db8b805,0x01
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2