1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-06-28 14:34:49 +02:00
Commit graph

629 commits

Author SHA1 Message Date
Paul Schaub 2ad917d27c
Add ConsumerOptions.setMissingKeyPassphraseStrategy()
This allows switching missing passphrase handling from interactive mode
(fire callbacks to prompt user for missing key passphrases) to non-interactive mode
(throw MissingPassphraseException with all keys with missing passphrase in it).

Fixes #193
2021-10-18 16:01:19 +02:00
Paul Schaub bebb9709ac
Add tests for how unbound subkeys are handled in KeyRingInfo 2021-10-14 16:16:06 +02:00
Paul Schaub 23b714f61b
Only consider validly bound subkeys when determining latest key creation date 2021-10-14 16:15:42 +02:00
Paul Schaub aef213a672
Fix AssertionError when determining encryption subkeys from set containing unbound key 2021-10-14 15:53:49 +02:00
Paul Schaub 5ea8294a60
Improve javadoc of Feature class 2021-10-14 15:27:01 +02:00
Paul Schaub 4e16cf13c5
Remove unused subclass 2021-10-12 15:31:38 +02:00
Paul Schaub b04ecc4eef
Further increase coverage of KeyRingInfo 2021-10-12 14:56:24 +02:00
Paul Schaub ee1d38a38a
Increase test coverage for KeyRingInfo 2021-10-12 14:18:59 +02:00
Paul Schaub bbc68e9803
Fix Picking of Subkey Revocation Signatures 2021-10-12 14:04:23 +02:00
Paul Schaub 33f516efe8
Fix detection of signed messages when verification keys are missing
Fixes #187, supersedes #189
2021-10-08 14:03:12 +02:00
Paul Schaub e390389c0a Reuse compliance 2021-10-07 16:28:31 +02:00
Paul Schaub 18a6090f0e
Add tests for user-attribute validation 2021-10-04 15:53:58 +02:00
Paul Schaub c0ae6d75ba
Add tests for UserAttribute certification/revocation 2021-10-04 14:47:16 +02:00
Paul Schaub 5d28823c80
Add more signing tests 2021-10-04 14:21:06 +02:00
Paul Schaub 96755a82a5
More SignatureSubpacketsUtilTest methods 2021-10-04 14:00:23 +02:00
Paul Schaub bccf384dbf
Add feature-related utilities and tests 2021-10-04 13:32:04 +02:00
Paul Schaub 7113dd1d7e
Add test for SignatureUtils 2021-10-03 14:32:32 +02:00
Paul Schaub 76a0a6479a
Remove unused OPS methods 2021-10-03 14:12:26 +02:00
Paul Schaub 0e1d6cb5a1
Rename DetachedSignature -> DetachedSignatureCheck 2021-10-03 13:47:20 +02:00
Paul Schaub 910bae58c0
Remove unused methods in DetachedSignature 2021-10-03 13:46:15 +02:00
Paul Schaub 7bc35dcba3
Add regression test for PGPUtil.getDecoderStream mistaking plaintext for base64 encoded data 2021-10-01 15:21:42 +02:00
Paul Schaub f7a7035059
Workaround for PGPUtil accidentally mistaking plain data for base64 encoded data. 2021-10-01 15:04:37 +02:00
Paul Schaub 5869996059
Add isSignedOnly() to MessageInspector
This method can be used to determine, whether the message was created using gpg --sign --armor.
It will return false if the message is signed and encrypted, since we cannot determine signed status while the message is encrypted.
Fixes #188
2021-10-01 14:12:10 +02:00
Paul Schaub 8ec8a55f10
Add ConsumerOptions.setIgnoreMDCErrors()
This method can be used to make PGPainless ignore certain MDC related errors or mishabits.
Use of this options is discouraged, but may come in handy in some situations.

Fixes #190
2021-10-01 13:54:51 +02:00
Paul Schaub 526dc0caac
Add support for creating cleartext signed messages and add tests 2021-09-27 17:10:00 +02:00
Paul Schaub ece5897bae
CleartextSignedMessage processing: Reuse normal processing API 2021-09-27 11:47:54 +02:00
Paul Schaub f15f3a4e2a
Fix example use of ascii armoring 2021-09-23 18:06:54 +02:00
Paul Schaub 1aa6541766 Merge branch 'key_generator_rework' 2021-09-20 14:50:02 +02:00
Paul Schaub be47a96030
Further simplify the KeyRingBuilder API 2021-09-20 12:30:03 +02:00
Paul Schaub 387b2b4b43
Ensure that KeySpecBuilder gets at least one key flag 2021-09-20 11:26:00 +02:00
Paul Schaub 895adb24c6
Export dependency on bcprov 2021-09-17 18:05:54 +02:00
Paul Schaub ce645fc429
Postpone decryption of PKESK if secret key passphrase is missing and try next PKESK first before passphrase retrieval using callback
Fixes #186
2021-09-15 16:33:03 +02:00
Paul Schaub 81379a5176
Add MessageInspector utility class which can be used to determine encryption keys for a message 2021-09-14 21:49:02 +02:00
Paul Schaub fedf7c0cf8 Make AlgorithmSuite members final and remove setters 2021-09-13 19:46:18 +02:00
Paul Schaub 11ad6361f8 Reformat arguments 2021-09-13 19:46:18 +02:00
Paul Schaub 21f424551b Simplify KeySpecBuilder 2021-09-13 19:46:18 +02:00
Paul Schaub 0a45f4de9e
Add documentation to SignatureVerification class 2021-09-13 18:18:50 +02:00
Paul Schaub f28232893c
Refactoring: Move cleartext signed message processing to decryption_verification 2021-09-13 18:09:53 +02:00
Paul Schaub 9a8bb7d3ef
Add missing break statement to loop 2021-09-10 21:04:36 +02:00
Paul Schaub 194e4d7631
Automatically 'repair' keys with S2K usage CHECKSUM to use SHA1 when changing passphrases 2021-09-10 20:14:12 +02:00
Paul Schaub 7e71af973b
Add JUnit tests for modification of keys with different sig classes 2021-09-10 19:57:05 +02:00
Paul Schaub c851457ef8
Add S2KUsageFix class and tests to switch secret keys encrypted with USAGE_CHECKSUM over to USAGE_SHA1 2021-09-09 20:31:02 +02:00
Paul Schaub 17ba3c3879
SecretKeyRingEditor: Take not only positive, but also generic,casual certifications into consideration 2021-09-08 11:59:28 +02:00
Paul Schaub c942238b40
Add tests for CachingSecretKeyRingProtector 2021-09-07 18:19:34 +02:00
Paul Schaub ab3f20ea54
VerifyCleartextSignatures: Remove deprecated methods 2021-09-07 17:44:03 +02:00
Paul Schaub 3994f87c78 Cleartext Signature Framework: Return OpenPgpMetadata 2021-09-07 14:02:07 +02:00
Paul Schaub 90a00e0541 Move signature verification to dedicated streams 2021-09-07 14:02:07 +02:00
Paul Schaub ba0e5eb3fe
Improve readability of DecryptionStreamFactory 2021-09-06 17:15:17 +02:00
Paul Schaub 90e0f74aea
Stabilize expiration dates in revocation tests 2021-09-06 15:23:10 +02:00
Paul Schaub e81ee648d8
Clean DecryptionStream: We only ever have one IntegrityProtectedInputStream at most 2021-09-06 15:14:13 +02:00
Paul Schaub e5ae09b79c
Change default compression algorithm from UNCOMPRESSED to ZIP 2021-09-06 15:13:41 +02:00
Paul Schaub f68779d8a5
Add tests for pgpainless-sop 2021-08-30 17:15:11 +02:00
Paul Schaub 97c8ff8312
Throw WrongConsumingMethodException when processing Cleartext Signed Messages with Inband Signature verification API and vice versa 2021-08-29 13:35:27 +02:00
Paul Schaub 2885ff7a14
Cleartext signature framework: Reuse ConsumerOptions 2021-08-28 11:39:50 +02:00
Paul Schaub 943360aa65
Document OpenPgpMetadata class 2021-08-26 19:53:15 +02:00
Paul Schaub e19acb667c
Add SignatureUtils.readSignatures(byte[]) 2021-08-26 19:35:25 +02:00
Paul Schaub ac469ff5d7
Make non-test method a main method 2021-08-26 15:07:48 +02:00
Paul Schaub 004a761fdb Globally set slf4j version 2021-08-26 15:03:20 +02:00
Paul Schaub 1124c6fd15 Wip: Configure logback logging 2021-08-26 15:03:20 +02:00
Paul Schaub 4d6ca80e25 Debug signature verification using debug build of bcpg 2021-08-26 15:03:20 +02:00
Paul Schaub 3573115a60 Add investigation test for cleartext signature verification 2021-08-23 14:27:03 +02:00
Paul Schaub 200e00990b Remove unused class and move detached sig initialization in own method 2021-08-23 14:27:02 +02:00
Paul Schaub 772f69788b Refactor CleartextSignatureProcessor to allow reuse in DetachInbandSignatureAndMessage 2021-08-23 14:26:17 +02:00
Paul Schaub 829068d5a8 Switch from JUL logging to SLF4J 2021-08-23 14:20:25 +02:00
Paul Schaub ae1539fa24
Add test to check, how messages with multiple SEIP packets are handled 2021-08-23 00:48:38 +02:00
Paul Schaub 0874805580
build.gradle: get rid of quick switch for bcprov debug
Since we don't need to debug low level crypto often, leaving the switch
in is a source of mistakes like accidentally depending on debug versions
in releases
2021-08-18 14:59:06 +02:00
Paul Schaub 03efb5e14c
Rename verifySignatureCreationTimeIsInBounds method 2021-08-18 14:50:01 +02:00
Paul Schaub 3bee3e5916
Add README for signature package 2021-08-18 14:49:31 +02:00
Paul Schaub 3abb796220
Separate Signature verification methods out of SignatureValidator into SignatureVerifier 2021-08-18 14:28:36 +02:00
Paul Schaub 8c3b694a71
Refactoring 2021-08-18 13:19:43 +02:00
Paul Schaub 5a9b8a2c50
Verify notBefore and notAfter on any message signatures 2021-08-18 12:55:24 +02:00
Paul Schaub 099b160656
Native support for notBefore and notAfter signature creation time constraints 2021-08-17 14:47:07 +02:00
Paul Schaub 6a108cb8c0 SignatureValidityComparator: Remove member order 2021-08-15 15:46:41 +02:00
Paul Schaub 452ee3fb30 Do not hide member has with local variable 2021-08-15 15:46:41 +02:00
Paul Schaub e368a8b16a Reduce complexity of statements 2021-08-15 15:46:41 +02:00
Paul Schaub 6467217bd1 Make defaultDigestHashAlgorithm static 2021-08-15 15:46:41 +02:00
Paul Schaub dd941fb293 Merge nested if-statements 2021-08-15 15:46:41 +02:00
Paul Schaub 28f6664b29 Change order of modifiers 2021-08-15 15:46:41 +02:00
Paul Schaub 09ffd527b5 Change constructor visibility of KeyAccessor 2021-08-15 15:46:41 +02:00
Paul Schaub 9ac0ee4043 Avoid hiding member with local variable 2021-08-15 15:46:41 +02:00
Paul Schaub 672acd38d0 ProviderFactory: Avoid accessing subclass in parent class initialization 2021-08-15 15:46:41 +02:00
Paul Schaub adc69caa51 ImplementationFactory: Avoid accessing subclass in parent class initialization 2021-08-15 15:46:41 +02:00
Paul Schaub 8539157405 Move builder() method above Builder class 2021-08-15 15:46:41 +02:00
Paul Schaub 54a4625fed fix comments and javadoc 2021-08-15 15:46:41 +02:00
Paul Schaub c11f334fa4 Policy: Use EnumMap for improved performance 2021-08-15 15:46:41 +02:00
Paul Schaub e5b15fe0c2 Use String-formatting in Logger statements 2021-08-15 15:46:41 +02:00
Paul Schaub 485666c72a Change static variable names 2021-08-15 15:46:41 +02:00
Paul Schaub 20b3080e94 getBitStrenght: Throw NoSuchAlgorithmException for unknown curves 2021-08-15 15:46:41 +02:00
Paul Schaub ccc62e090c Make DateUtil thread-safe 2021-08-15 15:46:41 +02:00
Paul Schaub bb27fddc89 Remove default constructor of NotationRegistry 2021-08-15 15:46:41 +02:00
Paul Schaub ab951fcf03 InputStreams: overwrite read(b, off, len) for improved performance 2021-08-15 15:46:41 +02:00
Paul Schaub 5eb470862e Remove OpenPgpMetadata.FileInfo subclass 2021-08-15 15:46:41 +02:00
Paul Schaub 2bd71617bd PGPException is not thrown during secret key reading 2021-08-15 15:46:41 +02:00
Paul Schaub 6251e01d57 Make classes final where sensible 2021-08-15 15:46:41 +02:00
Paul Schaub 1ce6632f18 Rename KeyValidationException -> KeyValidationError 2021-08-15 15:46:41 +02:00
Paul Schaub 66293bf333
Add documentation to ArmoredOutputStreamFactory 2021-08-15 13:41:07 +02:00
Paul Schaub fd867bbfbe
Allow customization of ASCII armor comment and version headers 2021-08-14 13:56:16 +02:00
Paul Schaub a678ff1b6e
Add documentation to classes related to verification of cleartext signed data 2021-08-14 11:39:13 +02:00
Paul Schaub 468159b2ad
Add documentation to SignatureSubpacketsUtil 2021-08-14 11:19:40 +02:00
Paul Schaub 3c68840a29
Add documentation to SignatureUtils methods 2021-08-14 11:09:51 +02:00
Paul Schaub 8256cd3a5b
Test some methods of KeyRingInfo 2021-08-08 18:26:38 +02:00
Paul Schaub 50e7fd96b8
Fix javadoc issues 2021-08-08 18:13:48 +02:00
Paul Schaub 08a5ce73dc
Test SignatureValidator.verifyWasPossiblyMadeByKey() 2021-08-08 17:55:57 +02:00
Paul Schaub aa0aaf134d
Bundle ASCII-Armor CRC related tests 2021-08-08 17:39:36 +02:00
Paul Schaub cae099eabe
Properly evaluate key expiration dates 2021-08-08 16:58:32 +02:00
Paul Schaub a0be510fc2
Update test key to have no key-expiration date 2021-08-08 16:57:37 +02:00
Paul Schaub 944d79b009
Rearrange armored input stream workaround code 2021-08-08 15:58:12 +02:00
Paul Schaub 1983cfb4ac
ArmoredInputStreams: Properly catch ignorable IOExceptions caused by missing CRC sums 2021-08-08 15:35:05 +02:00
Paul Schaub 089b81b070
Improve parsing of data containing invalid signatures
partial workaround for https://github.com/bcgit/bc-java/pull/1006
2021-08-05 15:18:33 +02:00
Paul Schaub 245e4a380d
Add JUnit test to ensure proper bracketing and nested-ness of multiple OnePassSignatures 2021-08-05 13:12:12 +02:00
Paul Schaub 9a485a3354
Encrypt to all capable subkeys by default 2021-08-04 16:38:17 +02:00
Paul Schaub 2d76cb5c82
Fix partial length encoding of some messages
Fixes #160

I'm not yet sure, why this issue only happened with some keys and not others,
but this fix works for now.
2021-08-04 16:02:35 +02:00
Paul Schaub 16c3116518
Fix order and nested-ness of one-pass-signatures
Fixes #164
2021-08-04 15:42:25 +02:00
Paul Schaub e4fdc3bc1e
SubkeyIdentifier: Throw NoSuchElementException for non-existent subkey 2021-08-01 17:23:17 +02:00
Paul Schaub 1327e08ac3
Add tests for SubkeyIdentifier 2021-08-01 17:19:04 +02:00
Paul Schaub 99ff6d537b
Prevent IllegalArgumentException for non-v4 issuer fingerprints 2021-08-01 16:11:47 +02:00
Paul Schaub b674a412b5
Reformat issuer-fingerprint inclusion code 2021-08-01 16:03:30 +02:00
Paul Schaub bd04e35a53
Commit investigation code for #160 (Thunderbird interop issues) 2021-08-01 15:54:19 +02:00
Paul Schaub 6a11e39d76
Add issuer-fingerprint to message signatures 2021-08-01 15:53:51 +02:00
Paul Schaub 5422468d73
Check key flags on binding sig to determine if backsig is required 2021-07-31 22:25:55 +02:00
Paul Schaub e7ed0f76a3
Properly ignore marker packets when reading keys/sigs 2021-07-31 22:25:12 +02:00
Paul Schaub fb16db5db4
Improve handling of signatures with missing issuerKeyId packets 2021-07-31 22:24:39 +02:00
Paul Schaub 311c842196
Revert introduction of StreamUtil 2021-07-31 20:40:31 +02:00
Paul Schaub 107e53c03e
Fully drain ArmoredInputStreams to verify CRC checksum.
Fixes #159 (for real this time)
2021-07-27 15:09:59 +02:00
Paul Schaub fc311fe781
Workaround for #159: Avoid to prevent swallowing IOExceptions 2021-07-26 16:19:30 +02:00
Paul Schaub 3e9979240b Add javadoc to the SignatureValidator class 2021-07-22 15:28:24 +02:00
Paul Schaub 1f08815633 Explicitly reject non-self signatures when picking user-id self sigs 2021-07-22 15:28:24 +02:00
Paul Schaub 726d22b8d6 Change passphrase: Skip GNU_DUMMY_S2K keys 2021-07-19 15:05:03 +02:00
Paul Schaub 4244107994
Add readmes for all modules 2021-07-17 00:27:58 +02:00
Paul Schaub 8cf5347b52 Base PGPainlessCLI on new sop-java module
* Rename pgpainless-sop -> pgpainless-cli
* Introduce sop-java (implementation-independent SOP API)
* Introduce sop-java-picocli (CLI frontend for sop-java)
* Introduce pgpainless-sop (implementation of sop-java using PGPainless)
* Rework pgpainless-cli (plugs pgpainless-sop into sop-java-picocli)
2021-07-15 17:03:56 +02:00
Paul Schaub 2ba782c451
Move file-related encryption-info into ProducerOptions 2021-07-10 12:22:47 +02:00
Paul Schaub 447c08b446 Add tests for ignoring marker packets when reading keys 2021-07-10 11:48:56 +02:00
Paul Schaub 0330d3cfa3 Add getMarkerPacket() test method 2021-07-10 11:48:46 +02:00
Paul Schaub be4962c531 Fix KeyRingReader methods not ignoring marker packets 2021-07-10 11:48:39 +02:00
Paul Schaub 6a90c4303e
OpenPgpMetadat: identify verified sigs by SubkeyIdentifier 2021-07-04 13:08:24 +02:00
Paul Schaub 48314fde40
Assign sensible names to test() methods 2021-07-03 13:23:11 +02:00
Paul Schaub 70666d276b
Rework MultiMapTest 2021-07-03 13:20:25 +02:00
Paul Schaub 43a21de53a
Delete useless GenerateKeyTest 2021-07-03 12:59:33 +02:00
Paul Schaub 0321a6170c
Execute signature related tests on all implementations 2021-07-03 12:56:42 +02:00
Paul Schaub a5dba7a368
Enable MultiPassphraseSymEncTest 2021-07-03 12:56:30 +02:00
Paul Schaub 7c612dd2ef
Parametrize BindingSignatureSubpacketsTest to run on all implementations 2021-07-03 12:50:44 +02:00
Paul Schaub b4b84badc0
ImplementationFactory: override toString() 2021-07-03 12:44:21 +02:00
Paul Schaub 84ff6ce015
Improve tests 2021-07-03 12:42:17 +02:00
Paul Schaub 63c75f1f86
Rename TestUtil -> TestImplementationFactoryProvider 2021-07-03 12:42:12 +02:00
Paul Schaub 9ac4b30ec7
Delete unused NonEmptyList class 2021-07-03 12:24:08 +02:00
Paul Schaub 863d443052
Request deletion of temp test files upon exit 2021-07-03 12:23:40 +02:00
Paul Schaub c8a281d6a4
Move UTC timestamp methods to DateUtil class 2021-07-03 12:23:24 +02:00
Paul Schaub 9b046a0cf1
Change SymmetricEncryptionAlgorithmNegotiator to return the 'best' avail. alg 2021-07-01 21:33:38 +02:00
Paul Schaub 30740aba4f
Add SymAlgoNegotiatorTest 2021-07-01 19:24:17 +02:00
Paul Schaub 3cb014e3f6
Add TestUtils.now() to have stable 'rounded' UTC dates in tests 2021-07-01 19:12:23 +02:00