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

Fix some tests

Browse source
This commit is contained in:
Paul Schaub 2025-02-04 15:59:26 +01:00
parent b1e9316ecf
commit 71a8a4b809
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
6 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pgpainless-core/src/main/kotlin/org/pgpainless/algorithm/EncryptionPurpose.kt
View file

@ -4,11 +4,13 @@
package org.pgpainless.algorithm
enum class EncryptionPurpose {
import org.bouncycastle.bcpg.sig.KeyFlags
enum class EncryptionPurpose(val code: Int) {
/** The stream will encrypt communication that goes over the wire. E.g. EMail, Chat... */
COMMUNICATIONS,
COMMUNICATIONS(KeyFlags.ENCRYPT_COMMS),
/** The stream will encrypt data at rest. E.g. Encrypted backup... */
STORAGE,
STORAGE(KeyFlags.ENCRYPT_STORAGE),
/** The stream will use keys with either flags to encrypt the data. */
ANY
ANY(KeyFlags.ENCRYPT_COMMS or KeyFlags.ENCRYPT_STORAGE)
}

17
pgpainless-core/src/main/kotlin/org/pgpainless/key/info/KeyRingInfo.kt
View file

@ -97,10 +97,10 @@ class KeyRingInfo(
/** List of valid public subkeys. */
val validSubkeys: List<PGPPublicKey> =
keys.pgpKeyRing.publicKeys.asSequence().filter { isKeyValidlyBound(it.keyID) }.toList()
keys.publicKeys.values.filter { it.isBoundAt(referenceDate) }.map { it.pgpPublicKey }
/** List of valid user-IDs. */
val validUserIds: List<String> = userIds.filter { isUserIdBound(it) }
val validUserIds: List<String> = keys.getValidUserIds(referenceDate).map { it.userId }
/** List of valid and expired user-IDs. */
val validAndExpiredUserIds: List<String> =
@ -136,7 +136,7 @@ class KeyRingInfo(
val creationDate: Date = publicKey.creationTime!!
/** Latest date at which the key was modified (either by adding a subkey or self-signature). */
val lastModified: Date = getMostRecentSignature()?.creationTime ?: getLatestKeyCreationDate()
val lastModified: Date = keys.lastModificationDate
/** True, if the underlying keyring is a [PGPSecretKeyRing]. */
val isSecretKey: Boolean = keys.pgpKeyRing is PGPSecretKeyRing
@ -195,10 +195,11 @@ class KeyRingInfo(
/** List of all subkeys that can be used to sign a message. */
val signingSubkeys: List<PGPPublicKey> =
validSubkeys.filter { getKeyFlagsOf(it.keyID).contains(KeyFlag.SIGN_DATA) }
keys.getSigningKeys(referenceDate).map { it.pgpPublicKey }
/** Whether the key is usable for encryption. */
val isUsableForEncryption: Boolean = isUsableForEncryption(EncryptionPurpose.ANY)
val isUsableForEncryption: Boolean =
keys.getComponentKeysWithFlag(referenceDate, EncryptionPurpose.ANY.code).isNotEmpty()
/**
* Whether the key is capable of signing messages. This field is also true, if the key contains
@ -417,7 +418,7 @@ class KeyRingInfo(
* @return latest key creation time
*/
fun getLatestKeyCreationDate(): Date =
validSubkeys.maxByOrNull { creationDate }?.creationTime
keys.getValidKeys(referenceDate).maxByOrNull { it.creationTime }?.creationTime
?: throw AssertionError("Apparently there is no validly bound key in this key ring.")
/**
@ -426,7 +427,7 @@ class KeyRingInfo(
* @return latest self-certification for the given user-ID.
*/
fun getLatestUserIdCertification(userId: CharSequence): PGPSignature? =
signatures.userIdCertifications[userId]
keys.getUserId(userId.toString())?.getCertification(referenceDate)?.signature
/**
* Return the latest revocation self-signature for the given user-ID
@ -434,7 +435,7 @@ class KeyRingInfo(
* @return latest user-ID revocation for the given user-ID
*/
fun getUserIdRevocation(userId: CharSequence): PGPSignature? =
signatures.userIdRevocations[userId]
keys.getUserId(userId.toString())?.getRevocation(referenceDate)?.signature
/**
* Return the current binding signature for the subkey with the given key-ID.