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

Better support for Armor headers

Browse source
This commit is contained in:
Paul Schaub 2021-05-15 15:56:51 +02:00
parent f2e89bae36
commit b05f6887bd
3 changed files with 131 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,17 +19,27 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.bouncycastle.bcpg.ArmoredInputStream;
import org.bouncycastle.bcpg.ArmoredOutputStream;
import org.bouncycastle.openpgp.PGPKeyRing;
import org.bouncycastle.openpgp.PGPPublicKeyRing;
import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.bouncycastle.util.io.Streams;
import org.pgpainless.algorithm.HashAlgorithm;
import org.pgpainless.key.OpenPgpV4Fingerprint;
public class ArmorUtils {
public static final String HEADER_COMMENT = "Comment";
public static final String HEADER_VERSION = "Version";
public static final String HEADER_MESSAGEID = "MessageID";
public static final String HEADER_HASH = "Hash";
public static final String HEADER_CHARSET = "Charset";
public static String toAsciiArmoredString(PGPSecretKeyRing secretKeys) throws IOException {
MultiMap<String, String> header = keyToHeader(secretKeys);
return toAsciiArmoredString(secretKeys.getEncoded(), header);
@ -45,9 +55,9 @@ public class ArmorUtils {
OpenPgpV4Fingerprint fingerprint = new OpenPgpV4Fingerprint(keyRing);
Iterator<String> userIds = keyRing.getPublicKey().getUserIDs();
header.put("Comment", fingerprint.prettyPrint());
header.put(HEADER_COMMENT, fingerprint.prettyPrint());
if (userIds.hasNext()) {
header.put("Comment", userIds.next());
header.put(HEADER_COMMENT, userIds.next());
}
return header;
}
@ -79,4 +89,45 @@ public class ArmorUtils {
return out.toString();
}
public static List<String> getCommendHeaderValues(ArmoredInputStream armor) {
return getArmorHeaderValues(armor, HEADER_COMMENT);
}
public static List<String> getMessageIdHeaderValues(ArmoredInputStream armor) {
return getArmorHeaderValues(armor, HEADER_MESSAGEID);
}
public static List<String> getHashHeaderValues(ArmoredInputStream armor) {
return getArmorHeaderValues(armor, HEADER_HASH);
}
public static List<HashAlgorithm> getHashAlgorithms(ArmoredInputStream armor) {
List<String> algorithmNames = getHashHeaderValues(armor);
List<HashAlgorithm> algorithms = new ArrayList<>(algorithmNames.size());
for (String name : algorithmNames) {
algorithms.add(HashAlgorithm.fromName(name));
}
return algorithms;
}
public static List<String> getVersionHeaderValues(ArmoredInputStream armor) {
return getArmorHeaderValues(armor, HEADER_VERSION);
}
public static List<String> getCharsetHeaderValues(ArmoredInputStream armor) {
return getArmorHeaderValues(armor, HEADER_CHARSET);
}
public static List<String> getArmorHeaderValues(ArmoredInputStream armor, String headerKey) {
String[] header = armor.getArmorHeaders();
String key = headerKey + ": ";
List<String> values = new ArrayList<>();
for (String line : header) {
if (line.startsWith(key)) {
values.add(line.substring(key.length()));
}
}
return values;
}
}

2
pgpainless-core/src/main/java/org/pgpainless/util/ArmoredOutputStreamFactory.java
View file

@ -28,7 +28,7 @@ public class ArmoredOutputStreamFactory {
public static ArmoredOutputStream get(OutputStream outputStream) {
ArmoredOutputStream armoredOutputStream = new ArmoredOutputStream(outputStream);
armoredOutputStream.setHeader(ArmoredOutputStream.VERSION_HDR, VERSION);
armoredOutputStream.setHeader(ArmorUtils.HEADER_VERSION, VERSION);
return armoredOutputStream;
}
}