diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-04-29 17:03:57 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-04-29 17:03:57 +0200 |
commit | ab7f6fa99256b97f6a9cd618feea7325bb9d3fab (patch) | |
tree | cf3641de42c8d7ac40b7d31d6cf5f09b249dc622 /OpenKeychain/src/main/java/org/bouncycastle/openpgp | |
parent | 19e6103e5f6a896d459edc9469411be9e8124cc6 (diff) | |
parent | 8e4d68c55a4e3f236cbc7d4664cd48c8fa0857f3 (diff) | |
download | open-keychain-ab7f6fa99256b97f6a9cd618feea7325bb9d3fab.tar.gz open-keychain-ab7f6fa99256b97f6a9cd618feea7325bb9d3fab.tar.bz2 open-keychain-ab7f6fa99256b97f6a9cd618feea7325bb9d3fab.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/bouncycastle/openpgp')
-rw-r--r-- | OpenKeychain/src/main/java/org/bouncycastle/openpgp/operator/jcajce/CachingDataDecryptorFactory.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/bouncycastle/openpgp/operator/jcajce/CachingDataDecryptorFactory.java b/OpenKeychain/src/main/java/org/bouncycastle/openpgp/operator/jcajce/CachingDataDecryptorFactory.java index 703af94f4..7679f8486 100644 --- a/OpenKeychain/src/main/java/org/bouncycastle/openpgp/operator/jcajce/CachingDataDecryptorFactory.java +++ b/OpenKeychain/src/main/java/org/bouncycastle/openpgp/operator/jcajce/CachingDataDecryptorFactory.java @@ -6,15 +6,16 @@ package org.bouncycastle.openpgp.operator.jcajce; + +import java.nio.ByteBuffer; +import java.util.Map; + import org.bouncycastle.jcajce.util.NamedJcaJceHelper; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; import org.bouncycastle.openpgp.operator.PGPDataDecryptor; import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory; -import java.nio.ByteBuffer; -import java.util.Map; - public class CachingDataDecryptorFactory implements PublicKeyDataDecryptorFactory { private final PublicKeyDataDecryptorFactory mWrappedDecryptor; @@ -59,6 +60,10 @@ public class CachingDataDecryptorFactory implements PublicKeyDataDecryptorFactor return mSessionKeyCache.get(bi); } + if (mWrappedDecryptor == null) { + throw new IllegalStateException("tried to decrypt without wrapped decryptor, this is a bug!"); + } + byte[] sessionData = mWrappedDecryptor.recoverSessionData(keyAlgorithm, secKeyData); mSessionKeyCache.put(bi, sessionData); return sessionData; |