PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-20 03:12:05 +01:00
Code Issues Releases Wiki Activity

Make sop decrypt throw for unencrypted data

Browse source
This commit is contained in:
Paul Schaub 2022-06-23 11:47:48 +02:00
parent efc0cb357b
commit 14531f0050
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pgpainless-sop/src/main/java/org/pgpainless/sop/DecryptImpl.java
View file

@ -149,6 +149,10 @@ public class DecryptImpl implements Decrypt {
decryptionStream.close();
OpenPgpMetadata metadata = decryptionStream.getResult();
if (!metadata.isEncrypted()) {
throw new SOPGPException.BadData("Data is not encrypted.");
}
List<Verification> verificationList = new ArrayList<>();
for (SignatureVerification signatureVerification : metadata.getVerifiedInbandSignatures()) {
verificationList.add(map(signatureVerification));

18
pgpainless-sop/src/test/java/org/pgpainless/sop/EncryptDecryptRoundTripTest.java
View file

@ -515,4 +515,22 @@ public class EncryptDecryptRoundTripTest {
assertThrows(SOPGPException.BadData.class, () ->
sop.decrypt().withSessionKey(wrongSessionKey).ciphertext(ciphertext));
}
@Test
public void decryptNonEncryptedDataFailsBadData() throws IOException {
byte[] signed = sop.inlineSign()
.key(aliceKey)
.withKeyPassword(alicePassword)
.data(message)
.getBytes();
assertThrows(SOPGPException.BadData.class, () ->
sop.decrypt()
.verifyWithCert(aliceCert)
.withKey(aliceKey)
.withKeyPassword(alicePassword)
.ciphertext(signed)
.toByteArrayAndResult()
);
}
}