From 766bec2148dff7aac4b3f03d06072c4789bbcd0e Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Tue, 12 Mar 2019 18:44:51 +0000
Subject: [PATCH 5/5] Port to bouncycastle 1.61 API
---
.../eclipse/jgit/lib/internal/BouncyCastleGpgKeyLocator.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BouncyCastleGpgKeyLocator.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BouncyCastleGpgKeyLocator.java
index 091667d..8f74827 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BouncyCastleGpgKeyLocator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BouncyCastleGpgKeyLocator.java
@@ -67,6 +67,7 @@
import org.bouncycastle.gpg.keybox.KeyInformation;
import org.bouncycastle.gpg.keybox.PublicKeyRingBlob;
import org.bouncycastle.gpg.keybox.UserID;
+import org.bouncycastle.gpg.keybox.bc.BcBlobVerifier;
import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPPublicKey;
import org.bouncycastle.openpgp.PGPSecretKey;
@@ -366,7 +367,7 @@ private KeyBox readKeyBoxFile(Path keyboxFile) throws IOException {
// note: KeyBox constructor reads in the whole InputStream at once
// this code will change in 1.61 to
// either 'new BcKeyBox(in)' or 'new JcaKeyBoxBuilder().build(in)'
- keyBox = new KeyBox(in, new JcaKeyFingerprintCalculator());
+ keyBox = new KeyBox(in, new JcaKeyFingerprintCalculator(), new BcBlobVerifier());
}
return keyBox;
}
--
2.20.1