PGPainless/pgpainless
PGPainless
/
pgpainless
mirror of https://github.com/pgpainless/pgpainless.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename OpenPgpComponentKeyBUilder.key to pair

This commit is contained in:
Paul Schaub 2024-02-03 13:32:59 +01:00
parent 9cea63529f
commit 2f7266d771
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/GenerateOpenPgpKey.kt
View File

@ -148,8 +148,8 @@ open class GenerateOpenPgpKey(
subpacketsCallback: SelfSignatureSubpackets.Callback = SelfSignatureSubpackets.nop() subpacketsCallback: SelfSignatureSubpackets.Callback = SelfSignatureSubpackets.nop()
) = apply { ) = apply {
val hasPrimaryUID = val hasPrimaryUID =
primaryKey.key.publicKey.userIDs.asSequence().any { uid -> primaryKey.pair.publicKey.userIDs.asSequence().any { uid ->
primaryKey.key.publicKey.getSignaturesForID(uid).asSequence().any { primaryKey.pair.publicKey.getSignaturesForID(uid).asSequence().any {
it.hashedSubPackets.isPrimaryUserID it.hashedSubPackets.isPrimaryUserID
} }
} }
@ -302,10 +302,10 @@ open class GenerateOpenPgpKey(
return PGPSecretKeyRing( return PGPSecretKeyRing(
mutableListOf( mutableListOf(
toSecretKey(primaryKey, true, protector.getEncryptor(primaryKey.key.keyID))) toSecretKey(primaryKey, true, protector.getEncryptor(primaryKey.pair.keyID)))
.plus( .plus(
subkeys.map { subkeys.map {
toSecretKey(it, false, protector.getEncryptor(it.key.keyID)) toSecretKey(it, false, protector.getEncryptor(it.pair.keyID))
})) }))
} }
@ -323,8 +323,8 @@ open class GenerateOpenPgpKey(
encryptor: PBESecretKeyEncryptor? encryptor: PBESecretKeyEncryptor?
): PGPSecretKey { ): PGPSecretKey {
return PGPSecretKey( return PGPSecretKey(
key.key.privateKey, key.pair.privateKey,
key.key.publicKey, key.pair.publicKey,
ImplementationFactory.getInstance().v4FingerprintCalculator, ImplementationFactory.getInstance().v4FingerprintCalculator,
isPrimaryKey, isPrimaryKey,
encryptor) encryptor)

34
pgpainless-core/src/main/kotlin/org/pgpainless/key/generation/OpenPgpComponentKeyBuilder.kt
View File

@ -35,7 +35,7 @@ class OpenPgpComponentKeyBuilder {
val policy: Policy val policy: Policy
) { ) {
internal var key = generateKeyPair() internal var pair = generateKeyPair()
fun subkey(type: KeyType, creationTime: Date = certificateCreationTime): V4SubkeyBuilder = fun subkey(type: KeyType, creationTime: Date = certificateCreationTime): V4SubkeyBuilder =
V4SubkeyBuilder(type, creationTime, policy, primaryKey()) V4SubkeyBuilder(type, creationTime, policy, primaryKey())
@ -77,10 +77,10 @@ class OpenPgpComponentKeyBuilder {
val sig = val sig =
buildCertificationFor( buildCertificationFor(
userId, certificationType, bindingTime, hashAlgorithm, subpacketsCallback) userId, certificationType, bindingTime, hashAlgorithm, subpacketsCallback)
key = pair =
PGPKeyPair( PGPKeyPair(
PGPPublicKey.addCertification(key.publicKey, userId.toString(), sig), PGPPublicKey.addCertification(pair.publicKey, userId.toString(), sig),
key.privateKey) pair.privateKey)
} }
fun buildCertificationFor( fun buildCertificationFor(
@ -92,7 +92,7 @@ class OpenPgpComponentKeyBuilder {
): PGPSignature { ): PGPSignature {
val builder = val builder =
SelfSignatureBuilder( SelfSignatureBuilder(
key.privateKey, key.publicKey, certificationType.signatureType, hashAlgorithm) pair.privateKey, pair.publicKey, certificationType.signatureType, hashAlgorithm)
builder.hashedSubpackets.apply { setSignatureCreationTime(bindingTime) } builder.hashedSubpackets.apply { setSignatureCreationTime(bindingTime) }
builder.applyCallback(subpacketsCallback) builder.applyCallback(subpacketsCallback)
return builder.build(userId) return builder.build(userId)
@ -113,10 +113,10 @@ class OpenPgpComponentKeyBuilder {
bindingTime, bindingTime,
hashAlgorithm, hashAlgorithm,
subpacketsCallback) subpacketsCallback)
key = pair =
PGPKeyPair( PGPKeyPair(
PGPPublicKey.addCertification(key.publicKey, userAttribute, sig), PGPPublicKey.addCertification(pair.publicKey, userAttribute, sig),
key.privateKey) pair.privateKey)
} }
fun buildCertificationFor( fun buildCertificationFor(
@ -128,7 +128,7 @@ class OpenPgpComponentKeyBuilder {
): PGPSignature { ): PGPSignature {
val builder = val builder =
SelfSignatureBuilder( SelfSignatureBuilder(
key.privateKey, key.publicKey, certificationType.signatureType, hashAlgorithm) pair.privateKey, pair.publicKey, certificationType.signatureType, hashAlgorithm)
builder.hashedSubpackets.apply { setSignatureCreationTime(bindingTime) } builder.hashedSubpackets.apply { setSignatureCreationTime(bindingTime) }
builder.applyCallback(subpacketsCallback) builder.applyCallback(subpacketsCallback)
return builder.build(userAttribute) return builder.build(userAttribute)
@ -144,7 +144,7 @@ class OpenPgpComponentKeyBuilder {
val sig = val sig =
buildDirectKeySignature( buildDirectKeySignature(
bindingTime, algorithmSuite, hashAlgorithm, subpacketsCallback) bindingTime, algorithmSuite, hashAlgorithm, subpacketsCallback)
key = PGPKeyPair(PGPPublicKey.addCertification(key.publicKey, sig), key.privateKey) pair = PGPKeyPair(PGPPublicKey.addCertification(pair.publicKey, sig), pair.privateKey)
} }
fun buildDirectKeySignature( fun buildDirectKeySignature(
@ -154,7 +154,7 @@ class OpenPgpComponentKeyBuilder {
subpacketsCallback: SelfSignatureSubpackets.Callback subpacketsCallback: SelfSignatureSubpackets.Callback
): PGPSignature { ): PGPSignature {
val builder = val builder =
DirectKeySelfSignatureBuilder(key.privateKey, key.publicKey, hashAlgorithm) DirectKeySelfSignatureBuilder(pair.privateKey, pair.publicKey, hashAlgorithm)
builder.hashedSubpackets.apply { builder.hashedSubpackets.apply {
setSignatureCreationTime(bindingTime) setSignatureCreationTime(bindingTime)
@ -191,7 +191,7 @@ class OpenPgpComponentKeyBuilder {
subpacketsCallback: SelfSignatureSubpackets.Callback = SelfSignatureSubpackets.nop() subpacketsCallback: SelfSignatureSubpackets.Callback = SelfSignatureSubpackets.nop()
) = apply { ) = apply {
val sig = buildBindingSignature(bindingTime, hashAlgorithm, subpacketsCallback) val sig = buildBindingSignature(bindingTime, hashAlgorithm, subpacketsCallback)
key = PGPKeyPair(PGPPublicKey.addCertification(key.publicKey, sig), key.privateKey) pair = PGPKeyPair(PGPPublicKey.addCertification(pair.publicKey, sig), pair.privateKey)
} }
fun buildBindingSignature( fun buildBindingSignature(
@ -202,8 +202,8 @@ class OpenPgpComponentKeyBuilder {
): PGPSignature { ): PGPSignature {
val builder = val builder =
SubkeyBindingSignatureBuilder( SubkeyBindingSignatureBuilder(
primaryKeyBuilder.key.privateKey, primaryKeyBuilder.pair.privateKey,
primaryKeyBuilder.key.publicKey, primaryKeyBuilder.pair.publicKey,
hashAlgorithm) hashAlgorithm)
builder.hashedSubpackets.setSignatureCreationTime(bindingTime) builder.hashedSubpackets.setSignatureCreationTime(bindingTime)
@ -215,15 +215,15 @@ class OpenPgpComponentKeyBuilder {
// Create back-sig // Create back-sig
val backSigBuilder = val backSigBuilder =
PrimaryKeyBindingSignatureBuilder(key.privateKey, key.publicKey, hashAlgorithm) PrimaryKeyBindingSignatureBuilder(pair.privateKey, pair.publicKey, hashAlgorithm)
backSigBuilder.hashedSubpackets.setSignatureCreationTime(bindingTime) backSigBuilder.hashedSubpackets.setSignatureCreationTime(bindingTime)
val backSig = backSigBuilder.build(primaryKey().key.publicKey) val backSig = backSigBuilder.build(primaryKey().pair.publicKey)
builder.hashedSubpackets.addEmbeddedSignature(backSig) builder.hashedSubpackets.addEmbeddedSignature(backSig)
} }
return builder.build(key.publicKey) return builder.build(pair.publicKey)
} }
override fun toPrimaryOrSubkey(keyPair: PGPKeyPair) = toSubkey(keyPair) override fun toPrimaryOrSubkey(keyPair: PGPKeyPair) = toSubkey(keyPair)