Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, diff --git a/build.gradle b/build.gradle index 9a1f2f0963..936b089895 100644 --- a/build.gradle +++ b/build.gradle @@ -164,7 +164,7 @@ subprojects { targetCompatibility = 1.8 } - version = '1.70' + version = '1.73' task testFull(type:Test) { systemProperties = [ diff --git a/buildj2me b/buildj2me index 62cd6a2b07..4e9562f5bc 100644 --- a/buildj2me +++ b/buildj2me @@ -50,11 +50,14 @@ then ((cd pg/src/test/j2me; tar cf - * ) | (cd $target/src && tar xf -)) (cd $target; + rm src/org/bouncycastle/test/*.java + rm src/org/bouncycastle/asn1/LocaleUtil.java rm src/org/bouncycastle/crypto/test/AllTests.java rm src/org/bouncycastle/crypto/test/SHA3DigestTest.java rm src/org/bouncycastle/crypto/test/SHAKEDigestTest.java rm src/org/bouncycastle/crypto/test/NISTECCTest.java rm src/org/bouncycastle/crypto/test/LEATest.java + rm src/org/bouncycastle/crypto/test/AsconTest.java rm src/org/bouncycastle/crypto/test/Grain128AEADTest.java rm src/org/bouncycastle/crypto/test/RadixConverterTest.java rm src/org/bouncycastle/crypto/test/DigestConstraintsTest.java @@ -102,12 +105,15 @@ then rm -rf src/org/bouncycastle/pqc/legacy/crypto/*/NTRU* rm -rf src/org/bouncycastle/pqc/legacy/crypto/*/BitStringTest* rm -rf src/org/bouncycastle/pqc/legacy/crypto/*/IndexGenerator* + rm -rf src/org/bouncycastle/pqc/crypto/util/PQCOtherInfo*.java rm -rf src/org/bouncycastle/pqc/crypto/sphincsplus rm -rf src/org/bouncycastle/pqc/crypto/xmss rm -rf src/org/bouncycastle/pqc/crypto/lms rm -rf src/org/bouncycastle/pqc/crypto/test rm -rf src/org/bouncycastle/pqc/crypto/sike rm -rf src/org/bouncycastle/pqc/crypto/picnic + rm -rf src/org/bouncycastle/pqc/crypto/rainbow + rm -rf src/org/bouncycastle/pqc/crypto/gemss rm src/org/bouncycastle/pqc/crypto/legacy/qtesla/QTeslaKeyEncodingTests.java rm -rf src/org/bouncycastle/gpg/keybox rm -rf src/org/bouncycastle/gpg/test @@ -128,6 +134,7 @@ then rm src/org/bouncycastle/asn1/test/TypeOfBiometricDataUnitTest.java rm src/org/bouncycastle/asn1/test/UTCTimeTest.java rm src/org/bouncycastle/crypto/test/SimpleTestTest.java + rm src/org/bouncycastle/crypto/test/HPKETest*.java rm src/org/bouncycastle/crypto/test/Argon2Test.java rm src/org/bouncycastle/crypto/test/AESVectorFileTest.java rm src/org/bouncycastle/crypto/test/GCMReorderTest.java @@ -135,6 +142,12 @@ then rm src/org/bouncycastle/crypto/test/RSABlindedTest.java rm src/org/bouncycastle/crypto/test/SP80038GTest.java rm src/org/bouncycastle/crypto/digests/Blake3Digest.java + rm src/org/bouncycastle/crypto/digests/Blake2sxDigest.java + rm src/org/bouncycastle/crypto/digests/Blake2spDigest.java + rm src/org/bouncycastle/crypto/digests/Blake2bpDigest.java + rm src/org/bouncycastle/crypto/test/Blake2bp*.java + rm src/org/bouncycastle/crypto/test/Blake2sx*.java + rm src/org/bouncycastle/crypto/test/Blake2sp*.java rm src/org/bouncycastle/crypto/macs/Blake3Mac.java rm src/org/bouncycastle/crypto/test/Blake3*.java rm src/org/bouncycastle/crypto/params/Blake3*.java @@ -183,10 +196,15 @@ then rm -r src/org/bouncycastle/apache rm -r src/org/bouncycastle/voms rm -r src/org/bouncycastle/math/ec/tools + rm -f src/org/bouncycastle/crypto/*/PhotonB* + rm -f src/org/bouncycastle/crypto/*/Elephant* + rm -f src/org/bouncycastle/crypto/*/ISAP* + rm -f src/org/bouncycastle/crypto/*/Sparkle* + rm -f src/org/bouncycastle/crypto/*/Xoo* rm src/org/bouncycastle/cert/test/ExternalKeyTest.java rm src/org/bouncycastle/mozilla/SignedPublicKeyAndChallenge.java - for i in src/org/bouncycastle/pqc/crypto/*/*.java src/org/bouncycastle/pqc/crypto/*/*/*.java src/org/bouncycastle/pqc/math/*/*.java src/org/bouncycastle/pqc/math/*/*/*.java src/org/bouncycastle/crypto/engines/*.java + for i in src/org/bouncycastle/pqc/crypto/*/*.java src/org/bouncycastle/pqc/crypto/*/*/*.java src/org/bouncycastle/pqc/math/*/*.java src/org/bouncycastle/pqc/math/*/*/*.java src/org/bouncycastle/crypto/digests/*.java src/org/bouncycastle/crypto/engines/*.java src/org/bouncycastle/bcpg/*.java src/org/bouncycastle/openpgp/*.java do ed $i <<%% g/ .Override/d @@ -262,6 +280,20 @@ g/java.util.Collections/s//java.util.HashMap/ g/Collections.EMPTY_MAP/s//new HashMap()/ w q +% + + ed src/org/bouncycastle/cert/cmp/CMSProcessableCMPCertificate.java <<% +g/\.\.\. /s//[]/g +g/^ *.Override/s/// +w +q +% + + ed src/org/bouncycastle/cert/crmf/CertificateRepMessageBuilder.java <<% +g/\.\.\. /s//[]/g +g/^ *.Override/s/// +w +q % ) @@ -359,7 +391,6 @@ q org.bouncycastle.pqc.legacy.crypto.rainbow \ org.bouncycastle.pqc.legacy.crypto.mceliece \ org.bouncycastle.pqc.legacy.crypto.gmss \ - org.bouncycastle.pqc.math.linearalgebra \ org.bouncycastle.util \ org.bouncycastle.util.encoders \ org.bouncycastle.util.test > /dev/null \ diff --git a/prov/build.gradle b/prov/build.gradle index 697070da7e..ca870be7cb 100644 --- a/prov/build.gradle +++ b/prov/build.gradle @@ -5,6 +5,14 @@ dependencies { jar.archiveBaseName = "bcprov-$vmrange" +sourceSets { + main { + java { + srcDirs '../core/src/main/java' + } + } +} + task sourcesJar(type: Jar) { archiveBaseName = jar.archiveBaseName classifier = 'sources' diff --git a/run_test.sh b/run_test.sh index ad2d346066..30d47a6d55 100644 --- a/run_test.sh +++ b/run_test.sh @@ -19,8 +19,8 @@ q done ) -javac -d /tmp/classes.jakarta -classpath build/artifacts/jdk1.8/jars/bcprov-jdk18on-172.jar:build/artifacts/jdk1.8/jars/bcutil-jdk18on-172.jar:build/artifacts/jdk1.8/jars/bcpkix-jdk18on-172.jar:build/artifacts/jdk1.8/jars/bcjmail-jdk18on-172.jar:/opt/junit/junit.jar:libs/jakarta.mail-2.0.1.jar:libs/jakarta.activation-api-2.0.0.jar /tmp/jakarta.test/org/bouncycastle/mail/smime/test/*.java -java -cp /tmp/classes.jakarta:build/artifacts/jdk1.8/jars/bcprov-jdk18on-172.jar:build/artifacts/jdk1.8/jars/bcpkix-jdk18on-172.jar:build/artifacts/jdk1.8/jars/bcutil-jdk18on-172.jar:build/artifacts/jdk1.8/jars/bcjmail-jdk18on-172.jar:/opt/junit/junit.jar:libs/jakarta.mail-2.0.1.jar:libs/jakarta.activation-api-2.0.0.jar:libs/activation.jar org.bouncycastle.mail.smime.test.AllTests +javac -d /tmp/classes.jakarta -classpath build/artifacts/jdk1.8/jars/bcprov-jdk18on-173.jar:build/artifacts/jdk1.8/jars/bcutil-jdk18on-173.jar:build/artifacts/jdk1.8/jars/bcpkix-jdk18on-173.jar:build/artifacts/jdk1.8/jars/bcjmail-jdk18on-173.jar:/opt/junit/junit.jar:libs/jakarta.mail-2.0.1.jar:libs/jakarta.activation-api-2.0.0.jar /tmp/jakarta.test/org/bouncycastle/mail/smime/test/*.java +java -cp /tmp/classes.jakarta:build/artifacts/jdk1.8/jars/bcprov-jdk18on-173.jar:build/artifacts/jdk1.8/jars/bcpkix-jdk18on-173.jar:build/artifacts/jdk1.8/jars/bcutil-jdk18on-173.jar:build/artifacts/jdk1.8/jars/bcjmail-jdk18on-173.jar:/opt/junit/junit.jar:libs/jakarta.mail-2.0.1.jar:libs/jakarta.activation-api-2.0.0.jar:libs/activation.jar org.bouncycastle.mail.smime.test.AllTests ) @@ -28,8 +28,8 @@ java -cp /tmp/classes.jakarta:build/artifacts/jdk1.8/jars/bcprov-jdk18on-172.jar export JAVA_HOME=/opt/jdk-11.0.1 export PATH=$JAVA_HOME/bin:$PATH -javac -d /tmp/classes.jdk11 -classpath build/artifacts/jdk1.8/jars/bcprov-jdk18on-172.jar:/opt/junit/junit.jar prov/src/test/jdk1.11/org/bouncycastle/jcajce/provider/test/XDHKeyTest.java -java -cp /tmp/classes.jdk11:build/artifacts/jdk1.8/jars/bcprov-jdk18on-172.jar:/opt/junit/junit.jar org.bouncycastle.jcajce.provider.test.XDHKeyTest +javac -d /tmp/classes.jdk11 -classpath build/artifacts/jdk1.8/jars/bcprov-jdk18on-173.jar:/opt/junit/junit.jar prov/src/test/jdk1.11/org/bouncycastle/jcajce/provider/test/XDHKeyTest.java +java -cp /tmp/classes.jdk11:build/artifacts/jdk1.8/jars/bcprov-jdk18on-173.jar:/opt/junit/junit.jar org.bouncycastle.jcajce.provider.test.XDHKeyTest ) @@ -37,6 +37,6 @@ java -cp /tmp/classes.jdk11:build/artifacts/jdk1.8/jars/bcprov-jdk18on-172.jar:/ export JAVA_HOME=/opt/jdk-15 export PATH=$JAVA_HOME/bin:$PATH -javac -d /tmp/classes.jdk15 -classpath build/artifacts/jdk1.8/jars/bcprov-jdk18on-172.jar:/opt/junit/junit.jar prov/src/test/jdk1.15/org/bouncycastle/jcajce/provider/test/EdDSA15Test.java -java -cp /tmp/classes.jdk15:build/artifacts/jdk1.8/jars/bcprov-jdk18on-172.jar:/opt/junit/junit.jar org.bouncycastle.jcajce.provider.test.EdDSA15Test +javac -d /tmp/classes.jdk15 -classpath build/artifacts/jdk1.8/jars/bcprov-jdk18on-173.jar:/opt/junit/junit.jar prov/src/test/jdk1.15/org/bouncycastle/jcajce/provider/test/EdDSA15Test.java +java -cp /tmp/classes.jdk15:build/artifacts/jdk1.8/jars/bcprov-jdk18on-173.jar:/opt/junit/junit.jar org.bouncycastle.jcajce.provider.test.EdDSA15Test )