From 5f7d5a7dc4cddbe3b04bb91746fd9661a35a48fe Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 9 Dec 2013 14:01:43 +0900 Subject: [PATCH] Update EncryptedContactStore to not use deprecated/removed methods The PGPEncryptedDataGenerator constructor and addMethod calls used in EncryptedContactStore were deprecated in version 1.49 and removed in version 1.51 of Bouncycastle. Update the calls to use the recommended non-deprecated versions. Change-Id: I134fd8c0b4538ae23a2c17dd0a632ddaff28aa3d --- .../gerrit/server/contact/EncryptedContactStore.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java b/gerrit-server/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java index 8c1fdb6b79..f200879963 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java @@ -38,6 +38,8 @@ import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.bouncycastle.openpgp.PGPUtil; +import org.bouncycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder; +import org.bouncycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -167,12 +169,16 @@ class EncryptedContactStore implements ContactStore { } } - @SuppressWarnings("deprecation") private final PGPEncryptedDataGenerator cpk() throws NoSuchProviderException, PGPException { + final BcPGPDataEncryptorBuilder builder = + new BcPGPDataEncryptorBuilder(PGPEncryptedData.CAST5) + .setSecureRandom(prng); PGPEncryptedDataGenerator cpk = - new PGPEncryptedDataGenerator(PGPEncryptedData.CAST5, true, prng, "BC"); - cpk.addMethod(dest); + new PGPEncryptedDataGenerator(builder, true); + final BcPublicKeyKeyEncryptionMethodGenerator methodGenerator = + new BcPublicKeyKeyEncryptionMethodGenerator(dest); + cpk.addMethod(methodGenerator); return cpk; }