PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-12-08 21:31:08 +01:00
Code Issues Releases Wiki Activity

Remove API instance parameter from ProducerOptions

Browse source
This commit is contained in:
Paul Schaub 2025-04-01 14:52:48 +02:00
parent 41251296ce
commit ca22446f1c
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
8 changed files with 33 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pgpainless-core/src/test/java/org/pgpainless/encryption_signing/SigningTest.java
View file

@ -66,8 +66,7 @@ public class SigningTest {
.addRecipient(cryptieKey.toCertificate()),
SigningOptions.get(api).addInlineSignature(
SecretKeyRingProtector.unlockSingleKeyWith(TestKeys.CRYPTIE_PASSPHRASE, cryptieSigningKey),
cryptieKey, TestKeys.CRYPTIE_UID, DocumentSignatureType.CANONICAL_TEXT_DOCUMENT),
api
cryptieKey, TestKeys.CRYPTIE_UID, DocumentSignatureType.CANONICAL_TEXT_DOCUMENT)
).setAsciiArmor(true));
byte[] messageBytes = "This message is signed and encrypted to Romeo and Juliet."
@ -159,7 +158,7 @@ public class SigningTest {
String data = "Hello, World!\n";
EncryptionStream signer = api.generateMessage()
.onOutputStream(new ByteArrayOutputStream())
.withOptions(ProducerOptions.sign(options, api));
.withOptions(ProducerOptions.sign(options));
Streams.pipeAll(new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8)), signer);
signer.close();
@ -192,7 +191,7 @@ public class SigningTest {
String data = "Hello, World!\n";
EncryptionStream signer = api.generateMessage()
.onOutputStream(new ByteArrayOutputStream())
.withOptions(ProducerOptions.sign(options, api));
.withOptions(ProducerOptions.sign(options));
Streams.pipeAll(new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8)), signer);
signer.close();
@ -223,7 +222,7 @@ public class SigningTest {
String data = "Hello, World!\n";
EncryptionStream signer = api.generateMessage()
.onOutputStream(new ByteArrayOutputStream())
.withOptions(ProducerOptions.sign(options, api));
.withOptions(ProducerOptions.sign(options));
Streams.pipeAll(new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8)), signer);
signer.close();

17
pgpainless-core/src/test/java/org/pgpainless/example/Sign.java
View file

@ -32,12 +32,13 @@ import org.pgpainless.util.ArmorUtils;
public class Sign {
private static OpenPGPKey secretKey;
private static OpenPGPKey key;
private static SecretKeyRingProtector protector;
private static final PGPainless api = PGPainless.getInstance();
@BeforeAll
public static void prepare() {
secretKey = PGPainless.generateKeyRing()
key = api.generateKey()
.modernKeyRing("Emilia Example <emilia@example.org>");
protector = SecretKeyRingProtector.unprotectedKeys(); // no password
}
@ -51,10 +52,10 @@ public class Sign {
String message = "\"Derivative Works\" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.";
InputStream messageIn = new ByteArrayInputStream(message.getBytes(StandardCharsets.UTF_8));
ByteArrayOutputStream signedOut = new ByteArrayOutputStream();
EncryptionStream signingStream = PGPainless.encryptAndOrSign()
EncryptionStream signingStream = api.generateMessage()
.onOutputStream(signedOut)
.withOptions(ProducerOptions.sign(SigningOptions.get()
.addSignature(protector, secretKey))
.withOptions(ProducerOptions.sign(SigningOptions.get(api)
.addSignature(protector, key))
);
Streams.pipeAll(messageIn, signingStream);
@ -84,7 +85,7 @@ public class Sign {
EncryptionStream signingStream = PGPainless.encryptAndOrSign()
.onOutputStream(ignoreMe)
.withOptions(ProducerOptions.sign(SigningOptions.get()
.addDetachedSignature(protector, secretKey, DocumentSignatureType.CANONICAL_TEXT_DOCUMENT))
.addDetachedSignature(protector, key, DocumentSignatureType.CANONICAL_TEXT_DOCUMENT))
.setAsciiArmor(false)
);
@ -93,7 +94,7 @@ public class Sign {
EncryptionResult result = signingStream.getResult();
OpenPGPCertificate.OpenPGPComponentKey signingKey = PGPainless.inspectKeyRing(secretKey).getSigningSubkeys().get(0);
OpenPGPCertificate.OpenPGPComponentKey signingKey = PGPainless.inspectKeyRing(key).getSigningSubkeys().get(0);
PGPSignature signature = result.getDetachedSignatures().get(new SubkeyIdentifier(signingKey)).iterator().next();
String detachedSignature = ArmorUtils.toAsciiArmoredString(signature.getEncoded());
@ -128,7 +129,7 @@ public class Sign {
EncryptionStream signingStream = PGPainless.encryptAndOrSign()
.onOutputStream(signedOut)
.withOptions(ProducerOptions.sign(SigningOptions.get()
.addDetachedSignature(protector, secretKey, DocumentSignatureType.CANONICAL_TEXT_DOCUMENT)) // Human-readable text document
.addDetachedSignature(protector, key, DocumentSignatureType.CANONICAL_TEXT_DOCUMENT)) // Human-readable text document
.setCleartextSigned() // <- Explicitly use Cleartext Signature Framework!!!
);

3
pgpainless-core/src/test/java/org/pgpainless/key/generation/StupidAlgorithmPreferenceEncryptionTest.java
View file

@ -107,8 +107,7 @@ public class StupidAlgorithmPreferenceEncryptionTest {
EncryptionStream encryptionStream = api.generateMessage()
.onOutputStream(out)
.withOptions(ProducerOptions.encrypt(
EncryptionOptions.get(api).addRecipient(certificate),
api
EncryptionOptions.get(api).addRecipient(certificate)
));
encryptionStream.write("Hello".getBytes(StandardCharsets.UTF_8));