mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-08-29 13:27:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix null pointer exception when using public only keys (#3143) (#3144)

Browse Source 
Co-authored-by: Greg Renda <greg@renda.org>
This commit is contained in:
Greg Renda 2024-07-30 11:31:10 -07:00 committed by GitHub
parent 1ae6cc4c8f
commit b5b7f746df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt
View File

@ -54,7 +54,7 @@ public class PGPainlessCryptoHandler @Inject constructor() :
} }
val keyringCollection = val keyringCollection =
keys keys
.map { key -> PGPainless.readKeyRing().secretKeyRing(key.contents) } .mapNotNull { key -> PGPainless.readKeyRing().secretKeyRing(key.contents) }
.run(::PGPSecretKeyRingCollection) .run(::PGPSecretKeyRingCollection)
val protector = SecretKeyRingProtector.unlockAnyKeyWith(Passphrase.fromPassword(passphrase)) val protector = SecretKeyRingProtector.unlockAnyKeyWith(Passphrase.fromPassword(passphrase))
val decryptionStream = val decryptionStream =

36
crypto/pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt
View File

@ -181,4 +181,40 @@ class PGPainlessCryptoHandlerTest {
assertTrue { cryptoHandler.canHandle("example.com.gpg") } assertTrue { cryptoHandler.canHandle("example.com.gpg") }
assertFalse { cryptoHandler.canHandle("example.com.asc") } assertFalse { cryptoHandler.canHandle("example.com.asc") }
} }
@Test
fun decryptWithPublicKeys() {
val alice =
PGPainless.generateKeyRing().modernKeyRing("Alice <owner@example.com>", KEY_PASSPHRASE)
val bob = PGPainless.generateKeyRing().modernKeyRing("Bob <owner@example.com>", KEY_PASSPHRASE)
val bobCertificate = PGPainless.extractCertificate(bob)
val aliceKey = PGPKey(PGPainless.asciiArmor(alice).encodeToByteArray())
val bobPublicKey = PGPKey(PGPainless.asciiArmor(bobCertificate).encodeToByteArray())
val ciphertextStream = ByteArrayOutputStream()
val encryptRes =
cryptoHandler.encrypt(
listOf(aliceKey, bobPublicKey),
PLAIN_TEXT.byteInputStream(Charsets.UTF_8),
ciphertextStream,
PGPEncryptOptions.Builder().withAsciiArmor(true).build(),
)
assertTrue(encryptRes.isOk)
val message = ciphertextStream.toByteArray().decodeToString()
val info = MessageInspector.determineEncryptionInfoForMessage(message)
assertTrue(info.isEncrypted)
assertEquals(2, info.keyIds.size)
assertFalse(info.isSignedOnly)
val ciphertextStreamCopy = message.byteInputStream()
val plaintextStream = ByteArrayOutputStream()
val res =
cryptoHandler.decrypt(
listOf(aliceKey, bobPublicKey),
KEY_PASSPHRASE,
ciphertextStreamCopy,
plaintextStream,
PGPDecryptOptions.Builder().build(),
)
assertTrue(res.isOk)
}
} }