PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-04 19:45:59 +01:00
Code Issues Releases Wiki Activity

Use new packet format when armoring key material

Browse source
This commit is contained in:
Paul Schaub 2022-02-13 00:18:03 +01:00
parent b202972042
commit bcf8f25d21
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pgpainless-core/src/main/java/org/pgpainless/util/ArmorUtils.java
View file

@ -17,6 +17,7 @@ import java.util.regex.Pattern;
import org.bouncycastle.bcpg.ArmoredInputStream; import org.bouncycastle.bcpg.ArmoredInputStream;
import org.bouncycastle.bcpg.ArmoredOutputStream; import org.bouncycastle.bcpg.ArmoredOutputStream;
import org.bouncycastle.bcpg.BCPGOutputStream;
import org.bouncycastle.openpgp.PGPKeyRing; import org.bouncycastle.openpgp.PGPKeyRing;
import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPPublicKey;
import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPPublicKeyRing;
@ -47,22 +48,38 @@ public final class ArmorUtils {
public static String toAsciiArmoredString(PGPSecretKey secretKey) throws IOException { public static String toAsciiArmoredString(PGPSecretKey secretKey) throws IOException {
MultiMap<String, String> header = keyToHeader(secretKey.getPublicKey()); MultiMap<String, String> header = keyToHeader(secretKey.getPublicKey());
return toAsciiArmoredString(secretKey.getEncoded(), header); ByteArrayOutputStream bytes = new ByteArrayOutputStream();
BCPGOutputStream bcpgOut = new BCPGOutputStream(bytes, true);
secretKey.encode(bcpgOut);
bcpgOut.close();
return toAsciiArmoredString(bytes.toByteArray(), header);
} }
public static String toAsciiArmoredString(PGPPublicKey publicKey) throws IOException { public static String toAsciiArmoredString(PGPPublicKey publicKey) throws IOException {
MultiMap<String, String> header = keyToHeader(publicKey); MultiMap<String, String> header = keyToHeader(publicKey);
return toAsciiArmoredString(publicKey.getEncoded(), header); ByteArrayOutputStream bytes = new ByteArrayOutputStream();
BCPGOutputStream bcpgOut = new BCPGOutputStream(bytes, true);
publicKey.encode(bcpgOut);
bcpgOut.close();
return toAsciiArmoredString(bytes.toByteArray(), header);
} }
public static String toAsciiArmoredString(PGPSecretKeyRing secretKeys) throws IOException { public static String toAsciiArmoredString(PGPSecretKeyRing secretKeys) throws IOException {
MultiMap<String, String> header = keysToHeader(secretKeys); MultiMap<String, String> header = keysToHeader(secretKeys);
return toAsciiArmoredString(secretKeys.getEncoded(), header); ByteArrayOutputStream bytes = new ByteArrayOutputStream();
BCPGOutputStream bcpgOut = new BCPGOutputStream(bytes, true);
secretKeys.encode(bcpgOut);
bcpgOut.close();
return toAsciiArmoredString(bytes.toByteArray(), header);
} }
public static String toAsciiArmoredString(PGPPublicKeyRing publicKeys) throws IOException { public static String toAsciiArmoredString(PGPPublicKeyRing publicKeys) throws IOException {
MultiMap<String, String> header = keysToHeader(publicKeys); MultiMap<String, String> header = keysToHeader(publicKeys);
return toAsciiArmoredString(publicKeys.getEncoded(), header); ByteArrayOutputStream bytes = new ByteArrayOutputStream();
BCPGOutputStream bcpgOut = new BCPGOutputStream(bytes, true);
publicKeys.encode(bcpgOut);
bcpgOut.close();
return toAsciiArmoredString(bytes.toByteArray(), header);
} }
public static String toAsciiArmoredString(PGPSecretKeyRingCollection secretKeyRings) throws IOException { public static String toAsciiArmoredString(PGPSecretKeyRingCollection secretKeyRings) throws IOException {