From 4782868bc125a57f6aa9ade8aadc2a962754ec27 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Wed, 30 Mar 2022 12:49:26 +0200 Subject: [PATCH] SOP encrypt: match signature type when using --as= option --- .../src/main/java/org/pgpainless/sop/EncryptImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pgpainless-sop/src/main/java/org/pgpainless/sop/EncryptImpl.java b/pgpainless-sop/src/main/java/org/pgpainless/sop/EncryptImpl.java index bb0af660..51624214 100644 --- a/pgpainless-sop/src/main/java/org/pgpainless/sop/EncryptImpl.java +++ b/pgpainless-sop/src/main/java/org/pgpainless/sop/EncryptImpl.java @@ -60,7 +60,11 @@ public class EncryptImpl implements Encrypt { signingOptions = SigningOptions.get(); } try { - signingOptions.addInlineSignatures(SecretKeyRingProtector.unprotectedKeys(), keys, DocumentSignatureType.BINARY_DOCUMENT); + signingOptions.addInlineSignatures( + SecretKeyRingProtector.unprotectedKeys(), + keys, + (encryptAs == EncryptAs.Binary ? DocumentSignatureType.BINARY_DOCUMENT : DocumentSignatureType.CANONICAL_TEXT_DOCUMENT) + ); } catch (IllegalArgumentException e) { throw new SOPGPException.KeyCannotSign(); } catch (WrongPassphraseException e) {