Skip to content

Commit 9e0f352

Browse files
dghgitdghgit
committed
cleanup/compatibility changes
1 parent 7292275 commit 9e0f352

File tree

9 files changed

+48
-46
lines changed

9 files changed

+48
-46
lines changed

‎ant/jdk14.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
<exclude name="**/pqc/**/PolynomialTest.java"/>
102102
<exclude name="**/pqc/**/HPS*.java"/>
103103
<exclude name="**/GetInstanceTest.java"/>
104+
<exclude name="**/SIKE*.java"/>
104105
</fileset>
105106
<fileset dir="pg/src/test/java">
106107
<exclude name="**/keybox/**/*.java"/>
@@ -141,6 +142,7 @@
141142
<exclude name="**/jce/provider/test/nist/PKITSTest.java"/>
142143
<exclude name="**/jce/provider/test/nist/NistCertPathTest2.java"/>
143144
<exclude name="**/jce/provider/test/JceTestUtil.java"/>
145+
<exclude name="**/SIKE*.java"/>
144146
</fileset>
145147

146148
<fileset dir="tls/src/main/java" includes="**/*.java">

‎core/src/main/java/org/bouncycastle/math/ec/rfc8032/Ed25519.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ private static boolean isNeutralElementVar(int[] x, int[] y, int[] z)
595595
private static void pointAdd(PointExtended p, PointExtended q, PointExtended r, PointTemp t)
596596
{
597597
// p may ref the same point as r (or q), but q may not ref the same point as r.
598-
assert q != r;
598+
// assert q != r;
599599

600600
int[] a = r.x;
601601
int[] b = r.y;

‎core/src/test/java/org/bouncycastle/pqc/crypto/test/BIKETest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ public void testVectors()
8282
}
8383

8484
System.out.println("test case: " + count);
85-
byte[] seed = Hex.decode(buf.get("seed")); // seed for bike secure random
86-
byte[] pk = Hex.decode(buf.get("pk")); // public key
87-
byte[] sk = Hex.decode(buf.get("sk")); // private key
88-
byte[] ct = Hex.decode(buf.get("ct")); // ciphertext
89-
byte[] ss = Hex.decode(buf.get("ss")); // session key
85+
byte[] seed = Hex.decode((String)buf.get("seed")); // seed for bike secure random
86+
byte[] pk = Hex.decode((String)buf.get("pk")); // public key
87+
byte[] sk = Hex.decode((String)buf.get("sk")); // private key
88+
byte[] ct = Hex.decode((String)buf.get("ct")); // ciphertext
89+
byte[] ss = Hex.decode((String)buf.get("ss")); // session key
9090

9191
NISTSecureRandom random = new NISTSecureRandom(seed, null);
9292
BIKEParameters parameters = listParams[fileIndex];

‎core/src/test/java/org/bouncycastle/pqc/crypto/test/CrystalsDilithiumTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,20 @@ public void testVectors()
110110
{
111111
if (buf.size() > 0)
112112
{
113-
String count = buf.get("count");
113+
String count = (String)buf.get("count");
114114
if (sampler.skipTest(count))
115115
{
116116
continue;
117117
}
118118
System.out.println("test case: " + count);
119119

120-
byte[] seed = Hex.decode(buf.get("seed")); // seed for Dilithium secure random
121-
byte[] pk = Hex.decode(buf.get("pk")); // public key
122-
byte[] sk = Hex.decode(buf.get("sk")); // private key
123-
byte[] sm = Hex.decode(buf.get("sm")); // signed message
124-
int sm_len = Integer.parseInt(buf.get("smlen"));
125-
byte[] msg = Hex.decode(buf.get("msg")); // message
126-
int m_len = Integer.parseInt(buf.get("mlen"));
120+
byte[] seed = Hex.decode((String)buf.get("seed")); // seed for Dilithium secure random
121+
byte[] pk = Hex.decode((String)buf.get("pk")); // public key
122+
byte[] sk = Hex.decode((String)buf.get("sk")); // private key
123+
byte[] sm = Hex.decode((String)buf.get("sm")); // signed message
124+
int sm_len = Integer.parseInt((String)buf.get("smlen"));
125+
byte[] msg = Hex.decode((String)buf.get("msg")); // message
126+
int m_len = Integer.parseInt((String)buf.get("mlen"));
127127

128128
NISTSecureRandom random = new NISTSecureRandom(seed, null);
129129

‎core/src/test/java/org/bouncycastle/pqc/crypto/test/CrystalsKyberTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ public void testVectors()
146146
}
147147
System.out.println("test case: " + count);
148148

149-
byte[] seed = Hex.decode(buf.get("seed")); // seed for Kyber secure random
150-
byte[] pk = Hex.decode(buf.get("pk")); // public key
151-
byte[] sk = Hex.decode(buf.get("sk")); // private key
152-
byte[] ct = Hex.decode(buf.get("ct")); // ciphertext
153-
byte[] ss = Hex.decode(buf.get("ss")); // session key
149+
byte[] seed = Hex.decode((String)buf.get("seed")); // seed for Kyber secure random
150+
byte[] pk = Hex.decode((String)buf.get("pk")); // public key
151+
byte[] sk = Hex.decode((String)buf.get("sk")); // private key
152+
byte[] ct = Hex.decode((String)buf.get("ct")); // ciphertext
153+
byte[] ss = Hex.decode((String)buf.get("ss")); // session key
154154

155155
NISTSecureRandom random = new NISTSecureRandom(seed, null);
156156
KyberParameters parameters = params[fileIndex];

‎core/src/test/java/org/bouncycastle/pqc/crypto/test/FalconTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,20 @@ public void testVectors()
5656
{
5757
if (buf.size() > 0)
5858
{
59-
String count = buf.get("count");
59+
String count = (String)buf.get("count");
6060
if (sampler.skipTest(count))
6161
{
6262
continue;
6363
}
6464
System.out.println("test case: " + count);
6565

66-
byte[] seed = Hex.decode(buf.get("seed")); // seed for Falcon secure random
67-
byte[] pk = Hex.decode(buf.get("pk")); // public key
68-
byte[] sk = Hex.decode(buf.get("sk")); // private key
69-
byte[] sm = Hex.decode(buf.get("sm")); // signed message
70-
int sm_len = Integer.parseInt(buf.get("smlen"));
71-
byte[] msg = Hex.decode(buf.get("msg")); // message
72-
int m_len = Integer.parseInt(buf.get("mlen"));
66+
byte[] seed = Hex.decode((String)buf.get("seed")); // seed for Falcon secure random
67+
byte[] pk = Hex.decode((String)buf.get("pk")); // public key
68+
byte[] sk = Hex.decode((String)buf.get("sk")); // private key
69+
byte[] sm = Hex.decode((String)buf.get("sm")); // signed message
70+
int sm_len = Integer.parseInt((String)buf.get("smlen"));
71+
byte[] msg = Hex.decode((String)buf.get("msg")); // message
72+
int m_len = Integer.parseInt((String)buf.get("mlen"));
7373

7474
NISTSecureRandom random = new NISTSecureRandom(seed, null);
7575

‎core/src/test/java/org/bouncycastle/pqc/crypto/test/HQCTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,18 @@ public void testVectors()
7777
{
7878
if (buf.size() > 0)
7979
{
80-
String count = buf.get("count");
80+
String count = (String)buf.get("count");
8181
if (sampler.skipTest(count))
8282
{
8383
continue;
8484
}
8585
System.out.println("test case: " + count);
8686

87-
byte[] seed = Hex.decode(buf.get("seed")); // seed for bike secure random
88-
byte[] pk = Hex.decode(buf.get("pk")); // public key
89-
byte[] sk = Hex.decode(buf.get("sk")); // private key
90-
byte[] ct = Hex.decode(buf.get("ct")); // ciphertext
91-
byte[] ss = Hex.decode(buf.get("ss")); // session key
87+
byte[] seed = Hex.decode((String)buf.get("seed")); // seed for bike secure random
88+
byte[] pk = Hex.decode((String)buf.get("pk")); // public key
89+
byte[] sk = Hex.decode((String)buf.get("sk")); // private key
90+
byte[] ct = Hex.decode((String)buf.get("ct")); // ciphertext
91+
byte[] ss = Hex.decode((String)buf.get("ss")); // session key
9292

9393
HQCParameters parameters = listParams[fileIndex];
9494

‎core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUKAT.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ public static List<NTRUKAT> getKAT(InputStream src)
5151
if (buf.size() > 0)
5252
{
5353
NTRUKAT kat = new NTRUKAT();
54-
kat.count = Integer.parseInt(buf.get("count"));
55-
kat.seed = Hex.decode(buf.get("seed")); // seed for secure random
56-
kat.pk = Hex.decode(buf.get("pk")); // public key
57-
kat.sk = Hex.decode(buf.get("sk")); // private key
58-
kat.ct = Hex.decode(buf.get("ct"));
59-
kat.ss = Hex.decode(buf.get("ss"));
54+
kat.count = Integer.parseInt((String)buf.get("count"));
55+
kat.seed = Hex.decode((String)buf.get("seed")); // seed for secure random
56+
kat.pk = Hex.decode((String)buf.get("pk")); // public key
57+
kat.sk = Hex.decode((String)buf.get("sk")); // private key
58+
kat.ct = Hex.decode((String)buf.get("ct"));
59+
kat.ss = Hex.decode((String)buf.get("ss"));
6060

6161
if (sampler.skipTest(kat.count))
6262
{

‎core/src/test/java/org/bouncycastle/pqc/crypto/test/PicnicVectorTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ public void testVectors()
118118
continue;
119119
}
120120
System.out.println("test case: " + count);
121-
byte[] seed = Hex.decode(buf.get("seed")); // seed for picnic secure random
122-
int mlen = Integer.parseInt(buf.get("mlen")); // message length
123-
byte[] msg = Hex.decode(buf.get("msg")); // message
124-
byte[] pk = Hex.decode(buf.get("pk")); // public key
125-
byte[] sk = Hex.decode(buf.get("sk")); // private key
126-
int smlen = Integer.parseInt(buf.get("smlen")); // signature length
127-
byte[] sigExpected = Hex.decode(buf.get("sm")); // signature
121+
byte[] seed = Hex.decode((String)buf.get("seed")); // seed for picnic secure random
122+
int mlen = Integer.parseInt((String)buf.get("mlen")); // message length
123+
byte[] msg = Hex.decode((String)buf.get("msg")); // message
124+
byte[] pk = Hex.decode((String)buf.get("pk")); // public key
125+
byte[] sk = Hex.decode((String)buf.get("sk")); // private key
126+
int smlen = Integer.parseInt((String)buf.get("smlen")); // signature length
127+
byte[] sigExpected = Hex.decode((String)buf.get("sm")); // signature
128128

129129
// System.out.println("message: " + Hex.toHexString(msg));
130130
NISTSecureRandom random = new NISTSecureRandom(seed, null);

0 commit comments

Comments
 (0)