PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-09-10 10:49:39 +02:00
Code Issues Releases Wiki Activity

WIP: Migrate away from static methods

Browse source
This commit is contained in:
Paul Schaub 2025-02-10 12:44:33 +01:00
parent 64dd7a9245
commit 39ad8f43db
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pgpainless-core/src/main/kotlin/org/pgpainless/PGPainless.kt
View file

@ -10,7 +10,9 @@ import org.bouncycastle.openpgp.PGPKeyRing
import org.bouncycastle.openpgp.PGPPublicKeyRing import org.bouncycastle.openpgp.PGPPublicKeyRing
import org.bouncycastle.openpgp.PGPSecretKeyRing import org.bouncycastle.openpgp.PGPSecretKeyRing
import org.bouncycastle.openpgp.PGPSignature import org.bouncycastle.openpgp.PGPSignature
import org.bouncycastle.openpgp.api.OpenPGPApi
import org.bouncycastle.openpgp.api.OpenPGPImplementation import org.bouncycastle.openpgp.api.OpenPGPImplementation
import org.bouncycastle.openpgp.api.bc.BcOpenPGPApi
import org.pgpainless.algorithm.OpenPGPKeyVersion import org.pgpainless.algorithm.OpenPGPKeyVersion
import org.pgpainless.bouncycastle.PolicyAdapter import org.pgpainless.bouncycastle.PolicyAdapter
import org.pgpainless.decryption_verification.DecryptionBuilder import org.pgpainless.decryption_verification.DecryptionBuilder
@ -30,11 +32,17 @@ class PGPainless(
val algorithmPolicy: Policy = Policy.getInstance() val algorithmPolicy: Policy = Policy.getInstance()
) { ) {
private var api: OpenPGPApi
init { init {
implementation.setPolicy( implementation.setPolicy(
PolicyAdapter(algorithmPolicy)) // adapt PGPainless' Policy to BCs OpenPGPPolicy PolicyAdapter(algorithmPolicy)) // adapt PGPainless' Policy to BCs OpenPGPPolicy
api = BcOpenPGPApi(implementation)
} }
fun generateKey(version: OpenPGPKeyVersion = OpenPGPKeyVersion.v4): KeyRingTemplates =
KeyRingTemplates(version)
companion object { companion object {
@Volatile private var instance: PGPainless? = null @Volatile private var instance: PGPainless? = null
@ -43,6 +51,11 @@ class PGPainless(
fun getInstance() = fun getInstance() =
instance ?: synchronized(this) { instance ?: PGPainless().also { instance = it } } instance ?: synchronized(this) { instance ?: PGPainless().also { instance = it } }
@JvmStatic
fun setInstance(pgpainless: PGPainless) {
instance = pgpainless
}
/** /**
* Generate a fresh OpenPGP key ring from predefined templates. * Generate a fresh OpenPGP key ring from predefined templates.
* *
@ -51,7 +64,7 @@ class PGPainless(
@JvmStatic @JvmStatic
@JvmOverloads @JvmOverloads
fun generateKeyRing(version: OpenPGPKeyVersion = OpenPGPKeyVersion.v4) = fun generateKeyRing(version: OpenPGPKeyVersion = OpenPGPKeyVersion.v4) =
KeyRingTemplates(version) getInstance().generateKey(version)
/** /**
* Build a custom OpenPGP key ring. * Build a custom OpenPGP key ring.