From a9993fd86699bcaf0790dc7f5d8944d2a0f4ccbd Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Thu, 20 Oct 2022 16:13:18 +0200
Subject: [PATCH] Throw UnacceptableAlgEx for unencrypted encData

---
 .../decryption_verification/OpenPgpMessageInputStream.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java
index bba7b396..969f3717 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java
@@ -480,7 +480,10 @@ public class OpenPgpMessageInputStream extends DecryptionStream {
         return false;
     }
 
-    private boolean decryptPKESKAndStream(SubkeyIdentifier subkeyIdentifier, PublicKeyDataDecryptorFactory decryptorFactory, PGPPublicKeyEncryptedData pkesk) throws IOException {
+    private boolean decryptPKESKAndStream(SubkeyIdentifier subkeyIdentifier,
+                                          PublicKeyDataDecryptorFactory decryptorFactory,
+                                          PGPPublicKeyEncryptedData pkesk)
+            throws IOException, UnacceptableAlgorithmException {
         try {
             InputStream decrypted = pkesk.getDataStream(decryptorFactory);
             SessionKey sessionKey = new SessionKey(pkesk.getSessionKey(decryptorFactory));
@@ -495,6 +498,8 @@ public class OpenPgpMessageInputStream extends DecryptionStream {
             IntegrityProtectedInputStream integrityProtected = new IntegrityProtectedInputStream(decrypted, pkesk, options);
             nestedInputStream = new OpenPgpMessageInputStream(buffer(integrityProtected), options, encryptedData, policy);
             return true;
+        } catch (UnacceptableAlgorithmException e) {
+            throw e;
         } catch (PGPException e) {
 
         }