mirror of
https://github.com/pgpainless/pgpainless.git
synced 2024-12-22 19:08:00 +01:00
Kotlin conversion: KeySpecBuilder
This commit is contained in:
parent
eaef1fe44a
commit
bb17c627ce
2 changed files with 63 additions and 88 deletions
|
@ -1,88 +0,0 @@
|
||||||
// SPDX-FileCopyrightText: 2018 Paul Schaub <vanitasvitae@fsfe.org>
|
|
||||||
//
|
|
||||||
// SPDX-License-Identifier: Apache-2.0
|
|
||||||
|
|
||||||
package org.pgpainless.key.generation;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.LinkedHashSet;
|
|
||||||
import java.util.Set;
|
|
||||||
import javax.annotation.Nonnull;
|
|
||||||
|
|
||||||
import org.pgpainless.PGPainless;
|
|
||||||
import org.pgpainless.algorithm.AlgorithmSuite;
|
|
||||||
import org.pgpainless.algorithm.CompressionAlgorithm;
|
|
||||||
import org.pgpainless.algorithm.Feature;
|
|
||||||
import org.pgpainless.algorithm.HashAlgorithm;
|
|
||||||
import org.pgpainless.algorithm.KeyFlag;
|
|
||||||
import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
|
|
||||||
import org.pgpainless.key.generation.type.KeyType;
|
|
||||||
import org.pgpainless.signature.subpackets.SelfSignatureSubpackets;
|
|
||||||
import org.pgpainless.signature.subpackets.SignatureSubpackets;
|
|
||||||
import org.pgpainless.signature.subpackets.SignatureSubpacketsUtil;
|
|
||||||
|
|
||||||
public class KeySpecBuilder implements KeySpecBuilderInterface {
|
|
||||||
|
|
||||||
private final KeyType type;
|
|
||||||
private final KeyFlag[] keyFlags;
|
|
||||||
private final SelfSignatureSubpackets hashedSubpackets = new SignatureSubpackets();
|
|
||||||
private final AlgorithmSuite algorithmSuite = PGPainless.getPolicy().getKeyGenerationAlgorithmSuite();
|
|
||||||
private Set<CompressionAlgorithm> preferredCompressionAlgorithms = algorithmSuite.getCompressionAlgorithms();
|
|
||||||
private Set<HashAlgorithm> preferredHashAlgorithms = algorithmSuite.getHashAlgorithms();
|
|
||||||
private Set<SymmetricKeyAlgorithm> preferredSymmetricAlgorithms = algorithmSuite.getSymmetricKeyAlgorithms();
|
|
||||||
private Date keyCreationDate;
|
|
||||||
|
|
||||||
KeySpecBuilder(@Nonnull KeyType type, KeyFlag... flags) {
|
|
||||||
if (flags == null) {
|
|
||||||
this.keyFlags = new KeyFlag[0];
|
|
||||||
} else {
|
|
||||||
SignatureSubpacketsUtil.assureKeyCanCarryFlags(type, flags);
|
|
||||||
this.keyFlags = flags;
|
|
||||||
}
|
|
||||||
this.type = type;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public KeySpecBuilder overridePreferredCompressionAlgorithms(
|
|
||||||
@Nonnull CompressionAlgorithm... compressionAlgorithms) {
|
|
||||||
this.preferredCompressionAlgorithms = new LinkedHashSet<>(Arrays.asList(compressionAlgorithms));
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public KeySpecBuilder overridePreferredHashAlgorithms(
|
|
||||||
@Nonnull HashAlgorithm... preferredHashAlgorithms) {
|
|
||||||
this.preferredHashAlgorithms = new LinkedHashSet<>(Arrays.asList(preferredHashAlgorithms));
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public KeySpecBuilder overridePreferredSymmetricKeyAlgorithms(
|
|
||||||
@Nonnull SymmetricKeyAlgorithm... preferredSymmetricKeyAlgorithms) {
|
|
||||||
for (SymmetricKeyAlgorithm algo : preferredSymmetricKeyAlgorithms) {
|
|
||||||
if (algo == SymmetricKeyAlgorithm.NULL) {
|
|
||||||
throw new IllegalArgumentException("NULL (unencrypted) is an invalid symmetric key algorithm preference.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.preferredSymmetricAlgorithms = new LinkedHashSet<>(Arrays.asList(preferredSymmetricKeyAlgorithms));
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public KeySpecBuilder setKeyCreationDate(@Nonnull Date creationDate) {
|
|
||||||
this.keyCreationDate = creationDate;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public KeySpec build() {
|
|
||||||
this.hashedSubpackets.setKeyFlags(keyFlags);
|
|
||||||
this.hashedSubpackets.setPreferredCompressionAlgorithms(preferredCompressionAlgorithms);
|
|
||||||
this.hashedSubpackets.setPreferredHashAlgorithms(preferredHashAlgorithms);
|
|
||||||
this.hashedSubpackets.setPreferredSymmetricKeyAlgorithms(preferredSymmetricAlgorithms);
|
|
||||||
this.hashedSubpackets.setFeatures(Feature.MODIFICATION_DETECTION);
|
|
||||||
|
|
||||||
return new KeySpec(type, (SignatureSubpackets) hashedSubpackets, false, keyCreationDate);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,63 @@
|
||||||
|
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||||
|
//
|
||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
|
package org.pgpainless.key.generation
|
||||||
|
|
||||||
|
import org.pgpainless.PGPainless
|
||||||
|
import org.pgpainless.algorithm.*
|
||||||
|
import org.pgpainless.key.generation.type.KeyType
|
||||||
|
import org.pgpainless.signature.subpackets.SelfSignatureSubpackets
|
||||||
|
import org.pgpainless.signature.subpackets.SignatureSubpackets
|
||||||
|
import org.pgpainless.signature.subpackets.SignatureSubpacketsUtil
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
|
class KeySpecBuilder constructor(
|
||||||
|
private val type: KeyType,
|
||||||
|
private val keyFlags: List<KeyFlag>,
|
||||||
|
) : KeySpecBuilderInterface {
|
||||||
|
|
||||||
|
private val hashedSubpackets: SelfSignatureSubpackets = SignatureSubpackets()
|
||||||
|
private val algorithmSuite: AlgorithmSuite = PGPainless.getPolicy().keyGenerationAlgorithmSuite
|
||||||
|
private var preferredCompressionAlgorithms: Set<CompressionAlgorithm> = algorithmSuite.compressionAlgorithms
|
||||||
|
private var preferredHashAlgorithms: Set<HashAlgorithm> = algorithmSuite.hashAlgorithms
|
||||||
|
private var preferredSymmetricAlgorithms: Set<SymmetricKeyAlgorithm> = algorithmSuite.symmetricKeyAlgorithms
|
||||||
|
private var keyCreationDate = Date()
|
||||||
|
|
||||||
|
constructor(type: KeyType, vararg keyFlags: KeyFlag): this(type, listOf(*keyFlags))
|
||||||
|
|
||||||
|
init {
|
||||||
|
SignatureSubpacketsUtil.assureKeyCanCarryFlags(type, *keyFlags.toTypedArray())
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun overridePreferredCompressionAlgorithms(vararg algorithms: CompressionAlgorithm): KeySpecBuilder = apply {
|
||||||
|
this.preferredCompressionAlgorithms = algorithms.toSet()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun overridePreferredHashAlgorithms(vararg algorithms: HashAlgorithm): KeySpecBuilder = apply {
|
||||||
|
this.preferredHashAlgorithms = algorithms.toSet()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun overridePreferredSymmetricKeyAlgorithms(vararg algorithms: SymmetricKeyAlgorithm): KeySpecBuilder = apply {
|
||||||
|
require(!algorithms.contains(SymmetricKeyAlgorithm.NULL)) {
|
||||||
|
"NULL (unencrypted) is an invalid symmetric key algorithm preference."
|
||||||
|
}
|
||||||
|
this.preferredSymmetricAlgorithms = algorithms.toSet()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun setKeyCreationDate(creationDate: Date): KeySpecBuilder = apply {
|
||||||
|
this.keyCreationDate = creationDate
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun build(): KeySpec {
|
||||||
|
return hashedSubpackets.apply {
|
||||||
|
setKeyFlags(keyFlags)
|
||||||
|
setPreferredCompressionAlgorithms(preferredCompressionAlgorithms)
|
||||||
|
setPreferredHashAlgorithms(preferredHashAlgorithms)
|
||||||
|
setPreferredSymmetricKeyAlgorithms(preferredSymmetricAlgorithms)
|
||||||
|
setFeatures(Feature.MODIFICATION_DETECTION)
|
||||||
|
}.let {
|
||||||
|
KeySpec(type, hashedSubpackets as SignatureSubpackets, false, keyCreationDate)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue