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

Use ArmoredOutputStreamFactory to hide version string in ascii armor

Browse source 
Partially fixes #82
This commit is contained in:
Paul Schaub 2021-02-19 19:50:36 +01:00
parent ea89289852
commit c75a192513
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
9 changed files with 51 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pgpainless-core/src/test/java/org/pgpainless/encryption_signing/EncryptDecryptTest.java
View file

@ -52,6 +52,7 @@ import org.pgpainless.key.generation.type.rsa.RsaLength;
import org.pgpainless.key.protection.SecretKeyRingProtector;
import org.pgpainless.key.protection.UnprotectedKeysProtector;
import org.pgpainless.key.util.KeyRingUtils;
import org.pgpainless.util.ArmoredOutputStreamFactory;
import org.pgpainless.util.BCUtil;
public class EncryptDecryptTest {
@ -205,7 +206,7 @@ public class EncryptDecryptTest {
Set<PGPSignature> signatureSet = metadata.getSignatures();
ByteArrayOutputStream sigOut = new ByteArrayOutputStream();
ArmoredOutputStream armorOut = new ArmoredOutputStream(sigOut);
ArmoredOutputStream armorOut = ArmoredOutputStreamFactory.get(sigOut);
signatureSet.iterator().next().encode(armorOut);
armorOut.close();
String armorSig = sigOut.toString();

5
pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateKeyTest.java
View file

@ -30,6 +30,7 @@ import org.junit.jupiter.api.Test;
import org.pgpainless.PGPainless;
import org.pgpainless.key.OpenPgpV4Fingerprint;
import org.pgpainless.key.util.KeyRingUtils;
import org.pgpainless.util.ArmoredOutputStreamFactory;
public class GenerateKeyTest {
@ -41,13 +42,13 @@ public class GenerateKeyTest {
PGPPublicKeyRing publicKeys = KeyRingUtils.publicKeyRingFrom(secretKeys);
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
ArmoredOutputStream armor = new ArmoredOutputStream(bytes);
ArmoredOutputStream armor = ArmoredOutputStreamFactory.get(bytes);
secretKeys.encode(armor);
armor.close();
String publicKey = new String(bytes.toByteArray());
bytes = new ByteArrayOutputStream();
armor = new ArmoredOutputStream(bytes);
armor = ArmoredOutputStreamFactory.get(bytes);
secretKeys.encode(armor);
armor.close();
String privateKey = new String(bytes.toByteArray());

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

@ -35,6 +35,7 @@ import org.pgpainless.algorithm.KeyFlag;
import org.pgpainless.key.generation.type.KeyType;
import org.pgpainless.key.generation.type.rsa.RsaLength;
import org.pgpainless.key.util.KeyRingUtils;
import org.pgpainless.util.ArmoredOutputStreamFactory;
public class GenerateKeyWithAdditionalUserIdTest {
@ -65,7 +66,7 @@ public class GenerateKeyWithAdditionalUserIdTest {
assertFalse(userIds.hasNext());
ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
ArmoredOutputStream armor = new ArmoredOutputStream(byteOut);
ArmoredOutputStream armor = ArmoredOutputStreamFactory.get(byteOut);
secretKeys.encode(armor);
armor.close();

5
pgpainless-core/src/test/java/org/pgpainless/key/modification/RevokeKeyWithGenericCertificationSignatureTest.java
View file

@ -28,6 +28,7 @@ import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.junit.jupiter.api.Test;
import org.pgpainless.PGPainless;
import org.pgpainless.key.protection.UnprotectedKeysProtector;
import org.pgpainless.util.ArmoredOutputStreamFactory;
/**
* Test that makes sure that PGPainless can deal with keys that carry a key
@ -88,14 +89,14 @@ public class RevokeKeyWithGenericCertificationSignatureTest {
PGPPublicKey pkr = secretKeyRing.getPublicKeys().next();
ByteArrayOutputStream pubOutBytes = new ByteArrayOutputStream();
try (ArmoredOutputStream pubOut = new ArmoredOutputStream(pubOutBytes)) {
try (ArmoredOutputStream pubOut = ArmoredOutputStreamFactory.get(pubOutBytes)) {
pkr.encode(pubOut);
}
pubOutBytes.close();
PGPSecretKey skr = secretKeyRing.getSecretKeys().next();
ByteArrayOutputStream secOutBytes = new ByteArrayOutputStream();
try (ArmoredOutputStream privOut = new ArmoredOutputStream(secOutBytes)) {
try (ArmoredOutputStream privOut = ArmoredOutputStreamFactory.get(secOutBytes)) {
skr.encode(privOut);
}
secOutBytes.close();

3
pgpainless-core/src/test/java/org/pgpainless/symmetric_encryption/LegacySymmetricEncryptionTest.java
View file

@ -27,6 +27,7 @@ import org.bouncycastle.openpgp.PGPException;
import org.junit.jupiter.api.Test;
import org.pgpainless.PGPainless;
import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
import org.pgpainless.util.ArmoredOutputStreamFactory;
import org.pgpainless.util.Passphrase;
public class LegacySymmetricEncryptionTest {
@ -52,7 +53,7 @@ public class LegacySymmetricEncryptionTest {
Passphrase passphrase = new Passphrase(password.toCharArray());
byte[] enc = PGPainless.encryptWithPassword(plain, passphrase, SymmetricKeyAlgorithm.AES_128);
ByteArrayOutputStream out = new ByteArrayOutputStream();
ArmoredOutputStream armor = new ArmoredOutputStream(out);
ArmoredOutputStream armor = ArmoredOutputStreamFactory.get(out);
armor.write(enc);
armor.flush();
armor.close();