motiejus
/
jgit
1
Fork 0
Code Releases Activity

KeyGrip: fix build error on java 15 

CryptlibObjectIdentifiers can't be used because bouncycastle doesn't
export the package org.bouncycastle.asn1.cryptlib.

Bug: 573638
Change-Id: I1f9e2af02d9fec69d2249a7d78301ba4b333a9ba
This commit is contained in:
Matthias Sohn 2021-09-12 21:40:04 +02:00
parent 05cd1fa5c7
commit 68a638deb0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/KeyGrip.java
View File

@ -15,7 +15,6 @@
import java.util.Arrays;
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
import org.bouncycastle.asn1.cryptlib.CryptlibObjectIdentifiers;
import org.bouncycastle.asn1.x9.ECNamedCurveTable;
import org.bouncycastle.asn1.x9.X9ECParameters;
import org.bouncycastle.bcpg.DSAPublicBCPGKey;
@ -52,6 +51,9 @@ public final class KeyGrip {
private static String OID_RFC8410_ED25519 = "1.3.101.112"; //$NON-NLS-1$
private static ASN1ObjectIdentifier CURVE25519 = ECNamedCurveTable
.getOID("curve25519"); //$NON-NLS-1$
private KeyGrip() {
// No instantiation
}
@ -105,7 +107,7 @@ public static byte[] getKeyGrip(PGPPublicKey publicKey)
if (OID_OPENPGP_ED25519.equals(curveOID.getId())
|| OID_RFC8410_ED25519.equals(curveOID.getId())) {
return hashEd25519(grip, ec.getEncodedPoint());
} else if (CryptlibObjectIdentifiers.curvey25519.equals(curveOID)
} else if (CURVE25519.equals(curveOID)
|| OID_RFC8410_CURVE25519.equals(curveOID.getId())) {
// curvey25519 actually is the OpenPGP OID for Curve25519 and is
// known to BC, but the parameters are for the short Weierstrass