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

Remove unused methods from SignatureSubpacketGeneratorUtil

Browse source
This commit is contained in:
Paul Schaub 2021-11-28 13:09:21 +01:00
parent b874aee6bb
commit e133434888
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 0 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
pgpainless-core/src/main/java/org/pgpainless/signature/subpackets/SignatureSubpacketGeneratorUtil.java
View file

@ -4,16 +4,12 @@
package org.pgpainless.signature.subpackets; package org.pgpainless.signature.subpackets;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import org.bouncycastle.bcpg.SignatureSubpacket; import org.bouncycastle.bcpg.SignatureSubpacket;
import org.bouncycastle.bcpg.SignatureSubpacketTags; import org.bouncycastle.bcpg.SignatureSubpacketTags;
import org.bouncycastle.bcpg.sig.KeyFlags;
import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator;
import org.pgpainless.algorithm.KeyFlag;
/** /**
* Utility class that helps dealing with BCs SignatureSubpacketGenerator class. * Utility class that helps dealing with BCs SignatureSubpacketGenerator class.
@ -24,25 +20,6 @@ public final class SignatureSubpacketGeneratorUtil {
} }
/**
* Return a list of {@link SignatureSubpacket SignatureSubpackets} from the subpacket generator, which correspond
* to the given {@link org.pgpainless.algorithm.SignatureSubpacket} type.
*
* @param type subpacket type
* @param generator subpacket generator
* @param <P> generic subpacket type
* @return possibly empty list of subpackets
*/
public static <P extends SignatureSubpacket> List<P> getSubpacketsOfType(org.pgpainless.algorithm.SignatureSubpacket type,
PGPSignatureSubpacketGenerator generator) {
SignatureSubpacket[] subpackets = generator.getSubpackets(type.getCode());
List<P> list = new ArrayList<>();
for (SignatureSubpacket p : subpackets) {
list.add((P) p);
}
return list;
}
/** /**
* Remove all packets of the given type from the {@link PGPSignatureSubpacketGenerator PGPSignatureSubpacketGenerators} * Remove all packets of the given type from the {@link PGPSignatureSubpacketGenerator PGPSignatureSubpacketGenerators}
* internal set. * internal set.
@ -95,23 +72,4 @@ public final class SignatureSubpacketGeneratorUtil {
long secondsToExpire = SignatureSubpacketsUtil.getKeyLifetimeInSeconds(expirationDate, creationDate); long secondsToExpire = SignatureSubpacketsUtil.getKeyLifetimeInSeconds(expirationDate, creationDate);
subpacketGenerator.setKeyExpirationTime(true, secondsToExpire); subpacketGenerator.setKeyExpirationTime(true, secondsToExpire);
} }
/**
* Return true, if the subpacket generator has a {@link KeyFlags} subpacket which carries the given key flag.
* Returns false, if no {@link KeyFlags} subpacket is present.
* If there are more than one instance of a {@link KeyFlags} packet present, only the last occurrence will
* be tested.
*
* @param keyFlag flag to test for
* @param generator subpackets generator
* @return true if the generator has the given key flag set
*/
public static boolean hasKeyFlag(KeyFlag keyFlag, PGPSignatureSubpacketGenerator generator) {
List<KeyFlags> keyFlagPackets = getSubpacketsOfType(org.pgpainless.algorithm.SignatureSubpacket.keyFlags, generator);
if (keyFlagPackets.isEmpty()) {
return false;
}
KeyFlags last = keyFlagPackets.get(keyFlagPackets.size() - 1);
return KeyFlag.hasKeyFlag(last.getFlags(), keyFlag);
}
} }