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/bcjmail-jdk18on-1.78.1.pom b/bcjmail-jdk18on-1.78.1.pom new file mode 100644 index 0000000000000000000000000000000000000000..f501c7f250f18e31c29f47dfe73ef06886532696 --- /dev/null +++ b/bcjmail-jdk18on-1.78.1.pom @@ -0,0 +1,52 @@ + + + 4.0.0 + org.bouncycastle + bcjmail-jdk18on + jar + Bouncy Castle Jakarta S/MIME API + 1.78.1 + 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 Jakarta Mail API and the Jakarta activation framework will also be needed. + https://www.bouncycastle.org/java.html + + + Bouncy Castle Licence + https://www.bouncycastle.org/licence.html + repo + + + + https://github.com/bcgit/bc-java + + + GitHub + https://github.com/bcgit/bc-java/issues + + + + feedback-crypto + The Legion of the Bouncy Castle Inc. + feedback-crypto@bouncycastle.org + + + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + diff --git a/bcmail-jdk15on-1.70.pom b/bcmail-jdk18on-1.78.1.pom similarity index 79% rename from bcmail-jdk15on-1.70.pom rename to bcmail-jdk18on-1.78.1.pom index 140e13f5fa6b4196550127fe57b61a0e28885ae6..61eae63f0030248392ab464683026239de3c5974 100644 --- a/bcmail-jdk15on-1.70.pom +++ b/bcmail-jdk18on-1.78.1.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.78.1 + 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.78.1 jar org.bouncycastle - bcutil-jdk15on - 1.70 + bcutil-jdk18on + 1.78.1 jar org.bouncycastle - bcpkix-jdk15on - 1.70 + bcpkix-jdk18on + 1.78.1 jar diff --git a/bcpg-jdk15on-1.70.pom b/bcpg-jdk18on-1.78.1.pom similarity index 71% rename from bcpg-jdk15on-1.70.pom rename to bcpg-jdk18on-1.78.1.pom index e16fdc21460fed278e29679f3e8db202c1259d44..8633f559916ea2db931ac076251ca41ecb290c9c 100644 --- a/bcpg-jdk15on-1.70.pom +++ b/bcpg-jdk18on-1.78.1.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.78.1 + 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,14 @@ org.bouncycastle - bcprov-jdk15on - 1.70 + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 jar diff --git a/bcpkix-jdk15on-1.70.pom b/bcpkix-jdk18on-1.78.1.pom similarity index 82% rename from bcpkix-jdk15on-1.70.pom rename to bcpkix-jdk18on-1.78.1.pom index 01353ff1466a7f78acc97aa68bc08806d5711202..d83fb833ad1abd0c9340876736b9b1886f028955 100644 --- a/bcpkix-jdk15on-1.70.pom +++ b/bcpkix-jdk18on-1.78.1.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.78.1 + 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.78.1 jar org.bouncycastle - bcutil-jdk15on - 1.70 + bcutil-jdk18on + 1.78.1 jar diff --git a/bcprov-jdk15on-1.70.pom b/bcprov-jdk18on-1.78.1.pom similarity index 90% rename from bcprov-jdk15on-1.70.pom rename to bcprov-jdk18on-1.78.1.pom index ea5148262ce83bcf4e3ce7d0597138bcba0872c4..4164f5db7f9a41316f6d29a0d80933656cf8c5bd 100644 --- a/bcprov-jdk15on-1.70.pom +++ b/bcprov-jdk18on-1.78.1.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.78.1 + 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.78.1.pom similarity index 84% rename from bctls-jdk15on-1.70.pom rename to bctls-jdk18on-1.78.1.pom index 7612c05afcb194e96208cd85f937347b04ddab52..210a216b25ba2241ad4777fcfcfa76d6b3de8bc1 100644 --- a/bctls-jdk15on-1.70.pom +++ b/bctls-jdk18on-1.78.1.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.78.1 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.78.1 jar org.bouncycastle - bcutil-jdk15on - 1.70 + bcutil-jdk18on + 1.78.1 jar diff --git a/bcutil-jdk15on-1.70.pom b/bcutil-jdk18on-1.78.1.pom similarity index 85% rename from bcutil-jdk15on-1.70.pom rename to bcutil-jdk18on-1.78.1.pom index 994c9354051d04169cb47e7f1b9472a21f1d0c9b..8660171cbf118c018a1f07f47ff0c91ca330ee37 100644 --- a/bcutil-jdk15on-1.70.pom +++ b/bcutil-jdk18on-1.78.1.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.78.1 + 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.78.1 jar diff --git a/bouncycastle.spec b/bouncycastle.spec index 1361381f95864a3a10a6f5c602e3561cc6a7ae8e..16289e267691b69b926f2f3e95da66666d51edce 100644 --- a/bouncycastle.spec +++ b/bouncycastle.spec @@ -1,30 +1,35 @@ -%define anolis_release 2 +%define anolis_release 1 -%global gittag r1rv70 +%global gittag r1rv78v1 %global classname org.bouncycastle.jce.provider.BouncyCastleProvider +%global profilen 1.8 +%global profile %(echo %{profilen} | sed "s/\\.//g" ) +%global jdkon jdk%{profile}on + Summary: Bouncy Castle Cryptography APIs for Java Name: bouncycastle -Version: 1.70 +Version: 1.78.1 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 +Source7: https://repo1.maven.org/maven2/org/bouncycastle/bcjmail-%{jdkon}/%{version}/bcjmail-%{jdkon}-%{version}.pom # Script to fetch POMs from Maven Central -Source7: get-poms.sh +Source8: get-poms.sh # Backport fix for regression in bouncycastle 1.70 -Patch0: 0001-added-back-support-for-subject-key-identifier-check-.patch +Patch0: jmail.packages.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -94,22 +99,22 @@ API documentation for the Bouncy Castle Cryptography APIs. %prep %setup -q -n bc-java-%{gittag} -%patch0 -p1 + +#%patch -P0 -p1 + +#?!?!!?!??!?!!? +for x in `find | grep -e x_pkcs7_signature.java -e PKCS7ContentHandler.java -e multipart_signed.java` ; do + sed "s/getTransferData.ActivationDataFlavor/getTransferData(DataFlavor/g" -i $x + sed "s/ ActivationDataFlavor df,/ DataFlavor df,/g" -i $x +done # Remove bundled binary libs find . -type f -name "*.class" -exec rm -f {} \; find . -type f -name "*.jar" -exec rm -f {} \; -# Relax javadoc linting and set expected source encoding -sed -i -e '/ bnd.bnd < - 1.78.1-1 +- update to 1.78 +- fix CVE-2024-2955 + +* Fri Jun 14 2024 mgb01105731 - 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/jmail.packages.patch b/jmail.packages.patch new file mode 100644 index 0000000000000000000000000000000000000000..69a0d14155cb54fb6b1972f59dc30b923ecc8886 --- /dev/null +++ b/jmail.packages.patch @@ -0,0 +1,19 @@ +--- bc-java-r1rv77/ant/bc+-build.xml ++++ bc-java-r1rv77/ant/bc+-build.xml +@@ -652,13 +652,13 @@ + + + +- ++ + + + + + +- ++ + + + + diff --git a/r1rv78v1.tar.gz b/r1rv78v1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d0251b32c2d70d0ec307d1c9c22e318feff8dea3 Binary files /dev/null and b/r1rv78v1.tar.gz differ