Skip to content

Commit c8229b1

Browse files
committed
minor refactorings, compatibility changes
1 parent 6d2d3c2 commit c8229b1

10 files changed

Lines changed: 982 additions & 13 deletions

File tree

build1-1

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ find $jdk11src -name "*.java" -exec scripts/useseccert.sh \{\} \;
294294
rm -f org/bouncycastle/jcajce/provider/asymmetric/NTRU.java
295295
rm -f org/bouncycastle/jcajce/provider/asymmetric/Falcon.java
296296
rm -f org/bouncycastle/test/PrintTestResult.java
297+
rm org/bouncycastle/openpgp/test/PGPAeadTest.java
297298

298299
sh ../../scripts/jdk1.2ed.sh > /dev/null 2>&1
299300
sh ../../scripts/jdk1.1ed.sh > /dev/null 2>&1
@@ -680,6 +681,7 @@ then
680681
rm src/org/bouncycastle/openpgp/test/ArmoredOutputStreamUTF8Test.java
681682
rm -f src/org/bouncycastle/openpgp/examples/DSAElGamalKeyRingGenerator.java
682683
rm -f src/org/bouncycastle/openpgp/examples/EllipticCurveKeyPairGenerator.java
684+
rm src/org/bouncycastle/openpgp/test/PGPAeadTest.java
683685

684686
find src -name AllTests.java -exec rm {} \;
685687

@@ -732,6 +734,12 @@ q
732734
g/private.*final.*;/s/final//
733735
w
734736
q
737+
%
738+
739+
ed src/org/bouncycastle/bcpg/sig/PreferredAEADCiphersuites.java <<%
740+
g/private.*final.*;/s/final//
741+
w
742+
q
735743
%
736744

737745
ed src/org/bouncycastle/bcpg/ArmoredOutputStream.java <<%

build1-2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ find $jdk12src -name "*.java" -exec scripts/usejcecert.sh \{\} \;
237237
rm -rf org/bouncycastle/tsp/TimeStampTokenInfoUnit*
238238
rm org/bouncycastle/openpgp/test/BcPGPEd25519JcaKeyPairConversionTest.java
239239
rm org/bouncycastle/openpgp/test/ArmoredOutputStreamUTF8Test.java
240+
rm org/bouncycastle/openpgp/test/PGPAeadTest.java
240241

241242
sh ../../scripts/jdk1.2ed.sh
242243

core/src/main/java/org/bouncycastle/pqc/crypto/crystals/dilithium/Symmetric.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.bouncycastle.pqc.crypto.crystals.dilithium;
22

3+
import org.bouncycastle.crypto.StreamCipher;
34
import org.bouncycastle.crypto.digests.SHAKEDigest;
45
import org.bouncycastle.crypto.engines.AESEngine;
5-
import org.bouncycastle.crypto.modes.CTRModeCipher;
66
import org.bouncycastle.crypto.modes.SICBlockCipher;
77
import org.bouncycastle.crypto.params.KeyParameter;
88
import org.bouncycastle.crypto.params.ParametersWithIV;
@@ -31,7 +31,7 @@ static class AesSymmetric
3131
extends Symmetric
3232
{
3333

34-
private final CTRModeCipher cipher;
34+
private final StreamCipher cipher;
3535

3636
AesSymmetric()
3737
{

core/src/main/java/org/bouncycastle/pqc/crypto/crystals/kyber/Symmetric.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.bouncycastle.pqc.crypto.crystals.kyber;
22

33
import org.bouncycastle.crypto.ExtendedDigest;
4+
import org.bouncycastle.crypto.StreamCipher;
45
import org.bouncycastle.crypto.digests.SHA256Digest;
56
import org.bouncycastle.crypto.digests.SHA3Digest;
67
import org.bouncycastle.crypto.digests.SHA512Digest;
78
import org.bouncycastle.crypto.digests.SHAKEDigest;
89
import org.bouncycastle.crypto.engines.AESEngine;
9-
import org.bouncycastle.crypto.modes.CTRModeCipher;
1010
import org.bouncycastle.crypto.modes.SICBlockCipher;
1111
import org.bouncycastle.crypto.params.KeyParameter;
1212
import org.bouncycastle.crypto.params.ParametersWithIV;
@@ -105,7 +105,7 @@ static class AesSymmetric
105105
{
106106
private final SHA256Digest sha256Digest;
107107
private final SHA512Digest sha512Digest;
108-
private final CTRModeCipher cipher;
108+
private final StreamCipher cipher;
109109

110110
AesSymmetric()
111111
{

core/src/main/java/org/bouncycastle/pqc/crypto/saber/Symmetric.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.bouncycastle.pqc.crypto.saber;
22

3+
import org.bouncycastle.crypto.StreamCipher;
34
import org.bouncycastle.crypto.Xof;
45
import org.bouncycastle.crypto.digests.SHA256Digest;
56
import org.bouncycastle.crypto.digests.SHA3Digest;
67
import org.bouncycastle.crypto.digests.SHA512Digest;
78
import org.bouncycastle.crypto.digests.SHAKEDigest;
89
import org.bouncycastle.crypto.engines.AESEngine;
9-
import org.bouncycastle.crypto.modes.CTRModeCipher;
1010
import org.bouncycastle.crypto.modes.SICBlockCipher;
1111
import org.bouncycastle.crypto.params.KeyParameter;
1212
import org.bouncycastle.crypto.params.ParametersWithIV;
@@ -54,18 +54,14 @@ void prf(byte[] out, byte[] in, int inLen, int outLen)
5454
shakeDigest.update(in, 0, inLen);
5555
shakeDigest.doFinal(out, 0, outLen);
5656
}
57-
58-
5957
}
58+
6059
static class AesSymmetric
6160
extends Symmetric
6261
{
63-
6462
private final SHA256Digest sha256Digest;
6563
private final SHA512Digest sha512Digest;
66-
67-
private final CTRModeCipher cipher;
68-
64+
private final StreamCipher cipher;
6965

7066
AesSymmetric()
7167
{

0 commit comments

Comments
 (0)