diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2022-07-16 21:25:04 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-16 15:55:04 +0000 |
| commit | db01ed2a2e2a210de33cc96751b7a5281a96db77 (patch) | |
| tree | cfe1ccaa39c1e168de3cce697a8ef33973f77d5d /crypto-pgpainless/src/test/kotlin | |
| parent | 205a1d942ec9cc56f3b250bf2bf4c5142917bb6e (diff) | |
Use `KeyRingUtils#publicKeyRingCollectionFrom` to extract public keys (#2009)
Diffstat (limited to 'crypto-pgpainless/src/test/kotlin')
| -rw-r--r-- | crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt b/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt index 60e8fb6e..4dc0abd5 100644 --- a/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt +++ b/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt @@ -19,9 +19,10 @@ import kotlin.test.assertTrue import org.junit.runner.RunWith @Suppress("Unused") // Test runner handles it internally -enum class EncryptionKey(val key: PGPKey) { - PUBLIC(PGPKey(TestUtils.getArmoredPublicKey())), - SECRET(PGPKey(TestUtils.getArmoredPrivateKey())), +enum class EncryptionKey(val keySet: List<PGPKey>) { + PUBLIC(listOf(PGPKey(TestUtils.getArmoredPublicKey()))), + SECRET(listOf(PGPKey(TestUtils.getArmoredPrivateKey()))), + ALL(listOf(PGPKey(TestUtils.getArmoredPublicKey()), PGPKey(TestUtils.getArmoredPrivateKey()))), } @RunWith(TestParameterInjector::class) @@ -35,7 +36,7 @@ class PGPainlessCryptoHandlerTest { fun encryptAndDecrypt() { val ciphertextStream = ByteArrayOutputStream() cryptoHandler.encrypt( - listOf(encryptionKey.key), + encryptionKey.keySet, CryptoConstants.PLAIN_TEXT.byteInputStream(Charsets.UTF_8), ciphertextStream, ) @@ -53,7 +54,7 @@ class PGPainlessCryptoHandlerTest { fun decryptWithWrongPassphrase() { val ciphertextStream = ByteArrayOutputStream() cryptoHandler.encrypt( - listOf(encryptionKey.key), + encryptionKey.keySet, CryptoConstants.PLAIN_TEXT.byteInputStream(Charsets.UTF_8), ciphertextStream, ) |