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

Add read(b,off,len)

Browse source
This commit is contained in:
Paul Schaub 2022-09-14 20:10:42 +02:00
parent a921f0b85e
commit 0bf85c32c0
1 changed files with 50 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java
View file

@ -38,14 +38,12 @@ import org.pgpainless.implementation.ImplementationFactory;
import org.pgpainless.key.info.KeyRingInfo; import org.pgpainless.key.info.KeyRingInfo;
import org.pgpainless.key.protection.SecretKeyRingProtector; import org.pgpainless.key.protection.SecretKeyRingProtector;
import org.pgpainless.key.protection.UnlockSecretKey; import org.pgpainless.key.protection.UnlockSecretKey;
import org.pgpainless.signature.consumer.DetachedSignatureCheck;
import org.pgpainless.util.Passphrase; import org.pgpainless.util.Passphrase;
import org.pgpainless.util.Tuple; import org.pgpainless.util.Tuple;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@ -88,6 +86,7 @@ public class OpenPgpMessageInputStream extends InputStream {
*/ */
private void consumePackets() private void consumePackets()
throws IOException, PGPException { throws IOException, PGPException {
System.out.println("Walk " + automaton);
int tag; int tag;
loop: while ((tag = bcpgIn.nextPacketTag()) != -1) { loop: while ((tag = bcpgIn.nextPacketTag()) != -1) {
OpenPgpPacket nextPacket = OpenPgpPacket.requireFromTag(tag); OpenPgpPacket nextPacket = OpenPgpPacket.requireFromTag(tag);
@ -237,7 +236,7 @@ public class OpenPgpMessageInputStream extends InputStream {
case MOD: case MOD:
throw new MalformedOpenPgpMessageException("Unexpected Packet in Stream: " + nextPacket); throw new MalformedOpenPgpMessageException("Unexpected Packet in Stream: " + nextPacket);
// Experimental Packets are not supported // Experimental Packets are not supported
case EXP_1: case EXP_1:
case EXP_2: case EXP_2:
case EXP_3: case EXP_3:
@ -313,15 +312,19 @@ public class OpenPgpMessageInputStream extends InputStream {
@Override @Override
public int read() throws IOException { public int read() throws IOException {
int r = -1; if (in == null) {
if (in != null) { automaton.assertValid();
try { return -1;
r = in.read();
} catch (IOException e) {
//
}
} }
if (r != -1) {
int r;
try {
r = in.read();
} catch (IOException e) {
r = -1;
}
boolean eos = r == -1;
if (!eos) {
byte b = (byte) r; byte b = (byte) r;
signatures.update(b); signatures.update(b);
} else { } else {
@ -330,7 +333,32 @@ public class OpenPgpMessageInputStream extends InputStream {
in = null; in = null;
} else { } else {
try { try {
System.out.println("Walk " + automaton); System.out.println("Read consume");
consumePackets();
} catch (PGPException e) {
throw new RuntimeException(e);
}
}
}
return r;
}
@Override
public int read(byte[] b, int off, int len)
throws IOException {
if (in == null) {
automaton.assertValid();
return -1;
}
int r = in.read(b, off, len);
if (r == -1) {
if (in instanceof OpenPgpMessageInputStream) {
in.close();
in = null;
} else {
try {
consumePackets(); consumePackets();
} catch (PGPException e) { } catch (PGPException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
@ -343,6 +371,7 @@ public class OpenPgpMessageInputStream extends InputStream {
@Override @Override
public void close() throws IOException { public void close() throws IOException {
if (closed) { if (closed) {
automaton.assertValid();
return; return;
} }
@ -418,15 +447,15 @@ public class OpenPgpMessageInputStream extends InputStream {
public void update(byte b) { public void update(byte b) {
/** /**
for (PGPSignature prepended : prependedSignatures) { for (PGPSignature prepended : prependedSignatures) {
prepended.update(b); prepended.update(b);
} }
for (PGPOnePassSignature ops : onePassSignatures) { for (PGPOnePassSignature ops : onePassSignatures) {
ops.update(b); ops.update(b);
} }
for (PGPSignature detached : detachedSignatures) { for (PGPSignature detached : detachedSignatures) {
detached.update(b); detached.update(b);
} }
*/ */
} }