cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update BouncyCastle to 1.77

Browse Source
This commit is contained in:
Vincent Breitmoser
2024-01-11 13:29:08 +01:00
parent e69ff0a2ad
commit 034eab9df1
6 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenKeychain/src/main/java/org/bouncycastle/openpgp/operator/jcajce/CachingDataDecryptorFactory.java
View File

@@ -13,24 +13,30 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.bouncycastle.bcpg.AEADEncDataPacket;
import org.bouncycastle.bcpg.SymmetricEncIntegrityPacket;
import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData;
import org.bouncycastle.openpgp.PGPSessionKey;
import org.bouncycastle.openpgp.operator.PGPDataDecryptor;
import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory;
public class CachingDataDecryptorFactory implements PublicKeyDataDecryptorFactory
{
private final PublicKeyDataDecryptorFactory mWrappedDecryptor;
private final HashMap<ByteBuffer, byte[]> mSessionKeyCache;
private OperatorHelper mOperatorHelper;
private JceAEADUtil mAeadHelper;
public CachingDataDecryptorFactory(String providerName, Map<ByteBuffer, byte[]> sessionKeyCache)
{
this((PublicKeyDataDecryptorFactory) null, sessionKeyCache);
mOperatorHelper = new OperatorHelper(new NamedJcaJceHelper(providerName));
mAeadHelper = new JceAEADUtil(mOperatorHelper);
}
public CachingDataDecryptorFactory(PublicKeyDataDecryptorFactory wrapped,
@@ -83,4 +89,22 @@ public class CachingDataDecryptorFactory implements PublicKeyDataDecryptorFactor
return mOperatorHelper.createDataDecryptor(withIntegrityPacket, encAlgorithm, key);
}
@Override
public PGPDataDecryptor createDataDecryptor(AEADEncDataPacket aeadEncDataPacket,
PGPSessionKey sessionKey) throws PGPException {
if (mWrappedDecryptor != null) {
mWrappedDecryptor.createDataDecryptor(aeadEncDataPacket, sessionKey);
}
return mAeadHelper.createOpenPgpV5DataDecryptor(aeadEncDataPacket, sessionKey);
}
@Override
public PGPDataDecryptor createDataDecryptor(SymmetricEncIntegrityPacket seipd,
PGPSessionKey sessionKey) throws PGPException {
if (mWrappedDecryptor != null) {
mWrappedDecryptor.createDataDecryptor(seipd, sessionKey);
}
return mAeadHelper.createOpenPgpV6DataDecryptor(seipd, sessionKey);
}
}

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKey.java
View File

@@ -72,7 +72,10 @@ public class CanonicalizedPublicKey extends UncachedPublicKey {
}
JcePublicKeyKeyEncryptionMethodGenerator getPubKeyEncryptionGenerator(boolean hiddenRecipients) {
return new JcePublicKeyKeyEncryptionMethodGenerator(mPublicKey, hiddenRecipients);
JcePublicKeyKeyEncryptionMethodGenerator generator =
new JcePublicKeyKeyEncryptionMethodGenerator(mPublicKey);
generator.setSessionKeyObfuscation(hiddenRecipients);
return generator;
}
public boolean canSign() {

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
View File

@@ -59,8 +59,8 @@ public class WrappedUserAttribute implements Serializable {
}
public static WrappedUserAttribute fromSubpacket (int type, byte[] data) {
UserAttributeSubpacket subpacket = new UserAttributeSubpacket(type, data);
PGPUserAttributeSubpacketVector vector = new PGPUserAttributeSubpacketVector(
UserAttributeSubpacket subpacket = UserAttributeSubpacket.create(type, data);
PGPUserAttributeSubpacketVector vector = PGPUserAttributeSubpacketVector.fromSubpackets(
new UserAttributeSubpacket[] { subpacket });
return new WrappedUserAttribute(vector);
@@ -86,7 +86,7 @@ public class WrappedUserAttribute implements Serializable {
UserAttributeSubpacket[] result = new UserAttributeSubpacket[list.size()];
list.toArray(result);
return new WrappedUserAttribute(
new PGPUserAttributeSubpacketVector(result));
PGPUserAttributeSubpacketVector.fromSubpackets(result));
}
/** Writes this object to an ObjectOutputStream. */
@@ -107,7 +107,7 @@ public class WrappedUserAttribute implements Serializable {
if ( ! UserAttributePacket.class.isInstance(p)) {
throw new IOException("Could not decode UserAttributePacket!");
}
mVector = new PGPUserAttributeSubpacketVector(((UserAttributePacket) p).getSubpackets());
mVector = PGPUserAttributeSubpacketVector.fromSubpackets(((UserAttributePacket) p).getSubpackets());
}