PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-09-09 18:29:39 +02:00
Code Issues Releases Wiki Activity

Introduce SigningResult class to allow for additional signing information to be returned

Browse source
This commit is contained in:
Paul Schaub 2022-01-08 17:28:19 +01:00
parent 987c328ad8
commit f2d88d8a86
5 changed files with 70 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pgpainless-sop/src/main/java/org/pgpainless/sop/SignImpl.java
View file

@ -28,6 +28,7 @@ import org.pgpainless.key.protection.SecretKeyRingProtector;
import org.pgpainless.util.ArmoredOutputStreamFactory;
import sop.MicAlg;
import sop.ReadyWithResult;
import sop.SigningResult;
import sop.enums.SignAs;
import sop.exception.SOPGPException;
import sop.operation.Sign;
@ -69,7 +70,7 @@ public class SignImpl implements Sign {
}
@Override
public ReadyWithResult<MicAlg> data(InputStream data) throws IOException {
public ReadyWithResult<SigningResult> data(InputStream data) throws IOException {
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
try {
EncryptionStream signingStream = PGPainless.encryptAndOrSign()
@ -77,9 +78,9 @@ public class SignImpl implements Sign {
.withOptions(ProducerOptions.sign(signingOptions)
.setAsciiArmor(armor));
return new ReadyWithResult<MicAlg>() {
return new ReadyWithResult<SigningResult>() {
@Override
public MicAlg writeTo(OutputStream outputStream) throws IOException {
public SigningResult writeTo(OutputStream outputStream) throws IOException {
if (signingStream.isClosed()) {
throw new IllegalStateException("EncryptionStream is already closed.");
@ -106,7 +107,9 @@ public class SignImpl implements Sign {
out.close();
outputStream.close(); // armor out does not close underlying stream
return micAlgFromSignatures(signatures);
return SigningResult.builder()
.setMicAlg(micAlgFromSignatures(signatures))
.build();
}
};