PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-26 22:32:07 +01:00
Code Issues Releases Wiki Activity

Only check message integrity once

Browse source
This commit is contained in:
Paul Schaub 2022-10-24 17:49:30 +02:00
parent e281143d48
commit aa398f9963
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pgpainless-core/src/main/java/org/pgpainless/decryption_verification/IntegrityProtectedInputStream.java
View file

@ -11,12 +11,17 @@ import javax.annotation.Nonnull;
import org.bouncycastle.openpgp.PGPEncryptedData; import org.bouncycastle.openpgp.PGPEncryptedData;
import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPException;
import org.pgpainless.exception.ModificationDetectionException; import org.pgpainless.exception.ModificationDetectionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class IntegrityProtectedInputStream extends InputStream { public class IntegrityProtectedInputStream extends InputStream {
private static final Logger LOGGER = LoggerFactory.getLogger(IntegrityProtectedInputStream.class);
private final InputStream inputStream; private final InputStream inputStream;
private final PGPEncryptedData encryptedData; private final PGPEncryptedData encryptedData;
private final ConsumerOptions options; private final ConsumerOptions options;
private boolean closed = false;
public IntegrityProtectedInputStream(InputStream inputStream, PGPEncryptedData encryptedData, ConsumerOptions options) { public IntegrityProtectedInputStream(InputStream inputStream, PGPEncryptedData encryptedData, ConsumerOptions options) {
this.inputStream = inputStream; this.inputStream = inputStream;
@ -36,11 +41,17 @@ public class IntegrityProtectedInputStream extends InputStream {
@Override @Override
public void close() throws IOException { public void close() throws IOException {
if (closed) {
return;
}
closed = true;
if (encryptedData.isIntegrityProtected() && !options.isIgnoreMDCErrors()) { if (encryptedData.isIntegrityProtected() && !options.isIgnoreMDCErrors()) {
try { try {
if (!encryptedData.verify()) { if (!encryptedData.verify()) {
throw new ModificationDetectionException(); throw new ModificationDetectionException();
} }
LOGGER.debug("Integrity Protection check passed");
} catch (PGPException e) { } catch (PGPException e) {
throw new IOException("Failed to verify integrity protection", e); throw new IOException("Failed to verify integrity protection", e);
} }