diff --git a/0001-added-back-support-for-subject-key-identifier-check-.patch b/0001-added-back-support-for-subject-key-identifier-check-.patch deleted file mode 100644 index a2e2481f493a0a84298129998a7b01f838ea3b63..0000000000000000000000000000000000000000 --- a/0001-added-back-support-for-subject-key-identifier-check-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d1fb007090813ce348a2d439f12fa347a8d5010c Mon Sep 17 00:00:00 2001 -From: David Hook -Date: Wed, 12 Jan 2022 15:02:59 +1100 -Subject: [PATCH] added back support for subject key identifier check where - serial number is not provided. - ---- - .../java/org/bouncycastle/x509/PKIXCertPathReviewer.java | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/prov/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java b/prov/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java -index 58a07d6c7..a78e97735 100644 ---- a/prov/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java -+++ b/prov/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java -@@ -2492,6 +2492,14 @@ protected Collection getTrustAnchors(X509Certificate cert, Set trustanchors) thr - { - certSelectX509.setSerialNumber(authID.getAuthorityCertSerialNumber()); - } -+ else -+ { -+ byte[] keyID = authID.getKeyIdentifier(); -+ if (keyID != null) -+ { -+ certSelectX509.setSubjectKeyIdentifier(new DEROctetString(keyID).getEncoded()); -+ } -+ } - } - } - catch (IOException ex) --- -2.34.1 - diff --git a/bcmail-jdk15on-1.70.pom b/bcmail-jdk18on-1.73.pom similarity index 80% rename from bcmail-jdk15on-1.70.pom rename to bcmail-jdk18on-1.73.pom index 140e13f5fa6b4196550127fe57b61a0e28885ae6..86c3c07c2878b70bd32f419f698e8d2221353675 100644 --- a/bcmail-jdk15on-1.70.pom +++ b/bcmail-jdk18on-1.73.pom @@ -2,11 +2,11 @@ 4.0.0 org.bouncycastle - bcmail-jdk15on + bcmail-jdk18on jar Bouncy Castle S/MIME API - 1.70 - The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. This jar contains S/MIME APIs for JDK 1.5 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. The JavaMail API and the Java activation framework will also be needed. + 1.73 + The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. This jar contains S/MIME APIs for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. The JavaMail API and the Java activation framework will also be needed. https://www.bouncycastle.org/java.html @@ -32,20 +32,20 @@ org.bouncycastle - bcprov-jdk15on - 1.70 + bcprov-jdk18on + 1.73 jar org.bouncycastle - bcutil-jdk15on - 1.70 + bcutil-jdk18on + 1.73 jar org.bouncycastle - bcpkix-jdk15on - 1.70 + bcpkix-jdk18on + 1.73 jar diff --git a/bcpg-jdk15on-1.70.pom b/bcpg-jdk18on-1.73.pom similarity index 79% rename from bcpg-jdk15on-1.70.pom rename to bcpg-jdk18on-1.73.pom index e16fdc21460fed278e29679f3e8db202c1259d44..7a88cbb752d9965664651886e1336243465ea76f 100644 --- a/bcpg-jdk15on-1.70.pom +++ b/bcpg-jdk18on-1.73.pom @@ -2,11 +2,11 @@ 4.0.0 org.bouncycastle - bcpg-jdk15on + bcpg-jdk18on jar Bouncy Castle OpenPGP API - 1.70 - The Bouncy Castle Java API for handling the OpenPGP protocol. This jar contains the OpenPGP API for JDK 1.5 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. + 1.73 + The Bouncy Castle Java API for handling the OpenPGP protocol. This jar contains the OpenPGP API for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. https://www.bouncycastle.org/java.html @@ -15,8 +15,8 @@ repo - Apache Software License, Version 1.1 - https://www.apache.org/licenses/LICENSE-1.1 + Apache Software License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 repo @@ -37,8 +37,8 @@ org.bouncycastle - bcprov-jdk15on - 1.70 + bcprov-jdk18on + 1.73 jar diff --git a/bcpkix-jdk15on-1.70.pom b/bcpkix-jdk18on-1.73.pom similarity index 82% rename from bcpkix-jdk15on-1.70.pom rename to bcpkix-jdk18on-1.73.pom index 01353ff1466a7f78acc97aa68bc08806d5711202..1ce12fb7a2e9d66bb75b1d9fd6bf79d39865e9d4 100644 --- a/bcpkix-jdk15on-1.70.pom +++ b/bcpkix-jdk18on-1.73.pom @@ -2,11 +2,11 @@ 4.0.0 org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on jar Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs - 1.70 - The Bouncy Castle Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation. This jar contains APIs for JDK 1.5 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. + 1.73 + The Bouncy Castle Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation. This jar contains APIs for JDK 1.8 and up. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. https://www.bouncycastle.org/java.html @@ -32,14 +32,14 @@ org.bouncycastle - bcprov-jdk15on - 1.70 + bcprov-jdk18on + 1.73 jar org.bouncycastle - bcutil-jdk15on - 1.70 + bcutil-jdk18on + 1.73 jar diff --git a/bcprov-jdk15on-1.70.pom b/bcprov-jdk18on-1.73.pom similarity index 90% rename from bcprov-jdk15on-1.70.pom rename to bcprov-jdk18on-1.73.pom index ea5148262ce83bcf4e3ce7d0597138bcba0872c4..4a39066b51b3887796a38643d064961136ba2569 100644 --- a/bcprov-jdk15on-1.70.pom +++ b/bcprov-jdk18on-1.73.pom @@ -2,11 +2,11 @@ 4.0.0 org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on jar Bouncy Castle Provider - 1.70 - The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.5 and up. + 1.73 + The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.8 and up. https://www.bouncycastle.org/java.html diff --git a/bctls-jdk15on-1.70.pom b/bctls-jdk18on-1.73.pom similarity index 84% rename from bctls-jdk15on-1.70.pom rename to bctls-jdk18on-1.73.pom index 7612c05afcb194e96208cd85f937347b04ddab52..e7116238b6905623aeea1eac35d139f4d26405ec 100644 --- a/bctls-jdk15on-1.70.pom +++ b/bctls-jdk18on-1.73.pom @@ -2,10 +2,10 @@ 4.0.0 org.bouncycastle - bctls-jdk15on + bctls-jdk18on jar Bouncy Castle JSSE provider and TLS/DTLS API - 1.70 + 1.73 The Bouncy Castle Java APIs for TLS and DTLS, including a provider for the JSSE. https://www.bouncycastle.org/java.html @@ -32,14 +32,14 @@ org.bouncycastle - bcprov-jdk15on - 1.70 + bcprov-jdk18on + 1.73 jar org.bouncycastle - bcutil-jdk15on - 1.70 + bcutil-jdk18on + 1.73 jar diff --git a/bcutil-jdk15on-1.70.pom b/bcutil-jdk18on-1.73.pom similarity index 85% rename from bcutil-jdk15on-1.70.pom rename to bcutil-jdk18on-1.73.pom index 994c9354051d04169cb47e7f1b9472a21f1d0c9b..11158259a2aec3f52f2b7431640d8609a07dc115 100644 --- a/bcutil-jdk15on-1.70.pom +++ b/bcutil-jdk18on-1.73.pom @@ -2,11 +2,11 @@ 4.0.0 org.bouncycastle - bcutil-jdk15on + bcutil-jdk18on jar Bouncy Castle ASN.1 Extension and Utility APIs - 1.70 - The Bouncy Castle Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls. This jar contains APIs for JDK 1.5 and up. + 1.73 + The Bouncy Castle Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls. This jar contains APIs for JDK 1.8 and up. https://www.bouncycastle.org/java.html @@ -32,8 +32,8 @@ org.bouncycastle - bcprov-jdk15on - 1.70 + bcprov-jdk18on + 1.73 jar diff --git a/bouncycastle.spec b/bouncycastle.spec index 1361381f95864a3a10a6f5c602e3561cc6a7ae8e..5aa8aae44743c14de15d5e66ee591d17378ec62b 100644 --- a/bouncycastle.spec +++ b/bouncycastle.spec @@ -1,30 +1,30 @@ -%define anolis_release 2 +%define anolis_release 1 -%global gittag r1rv70 +%global gittag r1rv73 %global classname org.bouncycastle.jce.provider.BouncyCastleProvider Summary: Bouncy Castle Cryptography APIs for Java Name: bouncycastle -Version: 1.70 +Version: 1.73 Release: %{anolis_release}%{?dist} License: MIT URL: http://www.bouncycastle.org -Source0: https://github.com/bcgit/bc-java/archive/%{gittag}.tar.gz +Source0: https://github.com/bcgit/bc-java/archive/refs/tags/%{gittag}.tar.gz # POMs from Maven Central -Source1: https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/%{version}/bcprov-jdk15on-%{version}.pom -Source2: https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/%{version}/bcpkix-jdk15on-%{version}.pom -Source3: https://repo1.maven.org/maven2/org/bouncycastle/bcpg-jdk15on/%{version}/bcpg-jdk15on-%{version}.pom -Source4: https://repo1.maven.org/maven2/org/bouncycastle/bcmail-jdk15on/%{version}/bcmail-jdk15on-%{version}.pom -Source5: https://repo1.maven.org/maven2/org/bouncycastle/bctls-jdk15on/%{version}/bctls-jdk15on-%{version}.pom -Source6: https://repo1.maven.org/maven2/org/bouncycastle/bcutil-jdk15on/%{version}/bcutil-jdk15on-%{version}.pom +Source1: https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk18on/%{version}/bcprov-jdk18on-%{version}.pom +Source2: https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk18on/%{version}/bcpkix-jdk18on-%{version}.pom +Source3: https://repo1.maven.org/maven2/org/bouncycastle/bcpg-jdk18on/%{version}/bcpg-jdk18on-%{version}.pom +Source4: https://repo1.maven.org/maven2/org/bouncycastle/bcmail-jdk18on/%{version}/bcmail-jdk18on-%{version}.pom +Source5: https://repo1.maven.org/maven2/org/bouncycastle/bctls-jdk18on/%{version}/bctls-jdk18on-%{version}.pom +Source6: https://repo1.maven.org/maven2/org/bouncycastle/bcutil-jdk18on/%{version}/bcutil-jdk18on-%{version}.pom # Script to fetch POMs from Maven Central Source7: get-poms.sh # Backport fix for regression in bouncycastle 1.70 -Patch0: 0001-added-back-support-for-subject-key-identifier-check-.patch +#Patch0: 0001-added-back-support-for-subject-key-identifier-check-.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -94,7 +94,7 @@ API documentation for the Bouncy Castle Cryptography APIs. %prep %setup -q -n bc-java-%{gittag} -%patch0 -p1 +#%%patch0 -p1 # Remove bundled binary libs find . -type f -name "*.class" -exec rm -f {} \; @@ -105,11 +105,11 @@ sed -i -e '/ - 1.73-1 +- update to 1.73 + * Wed Dec 27 2023 mgb01105731 - 1.70-2 - rebuild diff --git a/download b/download deleted file mode 100644 index 0755c20b8499d7f4ad83977ddb70147942448783..0000000000000000000000000000000000000000 --- a/download +++ /dev/null @@ -1 +0,0 @@ -dfb9fe299291ebad193e37cbc8d0eef9 r1rv70.tar.gz diff --git a/r1rv73.tar.gz b/r1rv73.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e01fa92efc0640d2dca7f97410ea0996639fe642 Binary files /dev/null and b/r1rv73.tar.gz differ