Compare commits

1 Commits

Author SHA256 Message Date
Fridrich Štrba
5ee759baf5 Fix build with Java 25 2025-10-24 10:29:57 +02:00
3 changed files with 57 additions and 0 deletions

View File

@@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Oct 24 08:21:05 UTC 2025 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* java22.patch
+ java.security.PrivateKey and java.security.PublicKey from
JDK version 22 extend the java.security.AsymmetricKey
interface, that contains default getParams() method.
The jce.javax.crypto.interfaces.DHPublicKey and
jce.javax.crypto.interfaces.DHPrivateKey thus inherits
abstract (from DHKey) and default for getParams(). This patch
fixes this problem the same way as OpenJDK did.
-------------------------------------------------------------------
Wed Feb 21 09:08:01 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@@ -25,6 +25,7 @@ Group: Development/Languages/Java
URL: https://www.gnu.org/software/gnu-crypto/
Source: ftp://ftp.gnu.org/gnu/%{name}/releases/%{name}-%{version}.tar.bz2
Patch0: sasl-functions.patch
Patch1: java22.patch
BuildRequires: ant
BuildRequires: java-devel >= 1.8
BuildRequires: unzip
@@ -39,6 +40,7 @@ end-users.
%prep
%setup -q
%patch -P 0
%patch -P 1 -p1
%build
export CLASSPATH=$(build-classpath glibj)

42
java22.patch Normal file
View File

@@ -0,0 +1,42 @@
--- gnu-crypto-2.0.1/jce/javax/crypto/interfaces/DHPrivateKey.java 2025-10-24 10:02:31.699275462 +0200
+++ gnu-crypto-2.0.1/jce/javax/crypto/interfaces/DHPrivateKey.java 2025-10-24 10:10:54.401404169 +0200
@@ -29,6 +29,8 @@
import java.math.BigInteger;
import java.security.PrivateKey;
+import javax.crypto.spec.DHParameterSpec;
+
/**
* The interface to a Diffie-Hellman private key.
*
@@ -44,4 +46,9 @@
* @return the private value, <code>x</code>
*/
public BigInteger getX();
+
+ @Override
+ default DHParameterSpec getParams() {
+ return null;
+ }
}
--- gnu-crypto-2.0.1/jce/javax/crypto/interfaces/DHPublicKey.java 2025-10-24 10:02:31.699298082 +0200
+++ gnu-crypto-2.0.1/jce/javax/crypto/interfaces/DHPublicKey.java 2025-10-24 10:10:14.617114832 +0200
@@ -29,6 +29,8 @@
import java.math.BigInteger;
import java.security.PublicKey;
+import javax.crypto.spec.DHParameterSpec;
+
/**
* The interface to a Diffie-Hellman public key.
*
@@ -44,4 +46,9 @@
* @return the public value, <code>y</code>
*/
public BigInteger getY();
+
+ @Override
+ default DHParameterSpec getParams() {
+ return null;
+ }
}