1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-12-28 13:57:58 +01:00
Commit graph

542 commits

Author SHA1 Message Date
3585203557
Prettify user-id info on armor 2022-03-21 16:44:59 +01:00
Simon Frankenberger
e569c2c991
ArmorUtils now prints out the primary user-id and brief information about other user-ids 2022-03-21 16:09:45 +01:00
9e0aa95a5a
Add documentation for the DecryptOrVerify examples 2022-03-16 21:29:34 +01:00
d4d29553ec
Add decryption example 2022-03-15 15:10:23 +01:00
ffdbd21491 Implement configuration option for SignerUserId subpacket verification level.
By default we ignore SignerUserId subpackets on signatures.
This behavior can be changed by calling Policy.setSignerUserIdValidationLevel().
Right now, STRICT and DISABLED are available as options, but it may make sense to implement
another option PARTIALLY, which will accept signatures made by key with user-id 'A <foo@bar>'
but where the sig contains a signer user id of value 'foo@bar' for example.
2022-03-14 11:10:12 +01:00
6b9b956c2c
Add OpenPgpFingerprint.parse(String) 2022-03-10 12:22:02 +01:00
8f473b513f
Add support for OpenPGP v5 fingerprints.
Obviously we need support for key.getFingerprint() in BC, but once
that is there, this should magically start working.
2022-03-10 12:01:12 +01:00
0824bbd37c
Add investigative test for signers user-ids 2022-03-09 21:05:17 +01:00
9d160ef047
Reject subkeys with predating binding signatures 2022-03-07 12:17:45 +01:00
10e72f6773
Allow custom key creation dates during generation 2022-03-07 11:08:59 +01:00
5b9e72d42c
Add KeyRingInfo.isUsableForEncryption() 2022-03-06 14:58:36 +01:00
1949cc5eea
Fix generics of CertificationSubpackets callback 2022-03-02 11:15:07 +01:00
35dd4f9a67
Fix unused import 2022-03-01 17:37:24 +01:00
d55d6a1686
Improve RegExs for extracting email addresses from keys
Based on https://github.com/pgpainless/pgpainless/pull/257/
Thanks @bratkartoffel for the initial proposed changes
2022-03-01 12:14:09 +01:00
feri
7a77d0847a Support multiline comments in ProducerOption.setComment(). 2022-02-24 17:46:45 +01:00
feri
928fa12b51
Add new ProducerOption setComment() for Ascii armored EncryptionStreams. (#254)
* Add new ProducerOption setComment() for Ascii armored EncryptionStreams.
2022-02-24 00:51:16 +01:00
1753cef10e Simplify handling of cleartext-signed data 2022-02-23 18:45:29 +01:00
e8da3b30d8 Yet another patch for ASCII armor detection -.- 2022-02-15 14:23:03 +01:00
458b4f1f78 Fix detection of unarmored data in detached signature verification 2022-02-11 14:07:29 +01:00
01839728f0 Remove workaround for publicKey.getBitStrength() == -1 in BC
see https://github.com/bcgit/bc-java/issues/972
2022-01-15 02:46:41 +01:00
e374951ed0 Remove ProofUtil.
This does not belong here.
2022-01-15 02:46:41 +01:00
d9e3c6ed91 Remove investigative test with expired key 2022-01-15 02:46:41 +01:00
e7f583c1af Fix KeyRingInfo.get*Algorithm(keyId) 2022-01-15 02:45:21 +01:00
9de196d6c5 Fix test for algorithm preference extraction 2022-01-15 02:45:10 +01:00
b1bde161b4
Fix typos and wording 2021-12-28 13:53:25 +01:00
ce7b69269b
Various code cleanup 2021-12-28 13:32:50 +01:00
59f1a85887
Fix more code issues 2021-12-28 12:30:52 +01:00
f3b7286eaf Introduce and use DateUtil.toSecondsPrecision 2021-12-28 01:42:12 +01:00
d0ef8581e8
Add RevokeUserIdsTest 2021-12-27 13:49:31 +01:00
a0e9c1f555
Add SelectUserId.byEmail() 2021-12-27 13:36:13 +01:00
245376d7d0
Remove KeyRingUtils.deleteUserId() in favor of revoking SecretKeyRingEditor.removeUserId() methods 2021-12-27 13:35:58 +01:00
3aa9e2915a
Re-certify expired user-ids when changing key expiration date 2021-12-20 13:28:16 +01:00
710f961984 Rework key modification API.
Fixes #225
2021-12-20 13:01:58 +01:00
78b668880b
Delete unused TestImplementationFactoryProvider 2021-12-14 16:57:50 +01:00
cf90c25afc
rename invocationContextProvider to TestAllImplementations 2021-12-14 16:56:29 +01:00
c331dee6b1
Replace @ArgumentSource with @TestTemplate, @ExtendWith 2021-12-14 16:55:04 +01:00
2ebf4be39c
Replace @MethodSource annotation with @ArgumentsSource 2021-12-14 15:47:53 +01:00
a66b45c3d2
Further sourcing of PGPObjectFactory from ImplementationProvider 2021-12-14 15:03:45 +01:00
60f7a9d9ec
Source PGPObjectFactory from ImplementationProvider 2021-12-14 14:43:16 +01:00
1681f3934f
Fix method name getCommentHeader 2021-12-14 14:42:53 +01:00
f8968fc075
Add test for CachingSecretKeyRingProtector.replacePassphrase(*) 2021-12-13 13:28:53 +01:00
5108b81252
Add test to ensure PGPainless will refuse to decrypt message with incapable key 2021-12-13 12:43:08 +01:00
35462ab539
Add tests for PublicKeyParameterValidation 2021-12-09 13:25:23 +01:00
296f811b7f Merge branch 'KO' 2021-12-07 19:08:03 +01:00
82cbe467f2
Introduce iteration limit to prevent resource exhaustion when reading keys 2021-12-06 17:11:42 +01:00
073cf870d2
Fix NPE when attempting to decrypt GNU_DUMMY_S2K keys 2021-12-06 15:07:34 +01:00
a34cd77920
Add test keys 2021-12-06 15:02:31 +01:00
d54a40196b
Fix NPE when attempting to decrypt GNU_DUMMY_S2K keys 2021-12-06 15:01:37 +01:00
8d6aca0d04
Test modifyKeyRing().addSubkey() respects pk algorithm policy 2021-12-02 14:45:54 +01:00
14c1cf013e
Add test to verify correct behavior of public key algorithm policy enforcement during key generation 2021-12-02 14:29:01 +01:00
ddc071374c Add invalid signature version processing regression test 2021-12-02 12:42:02 +01:00
03f13ee4a7 Add StreamGeneratorWrapper which uses new PGPCanonicalizedDataGenerator if required 2021-12-02 12:40:20 +01:00
888073b604 Add basic canonicalization test for new BC generator class 2021-12-02 12:40:20 +01:00
176ad09d19
Make Passphrase comparison constant time 2021-11-29 21:55:35 +01:00
635de19fb8
Add tests for KeyRingUtils.injectCertification and render keysPlusPublicKey unusable 2021-11-28 14:15:01 +01:00
b09858e186
Add basic test for DirectKeySignatureBuilder 2021-11-27 17:14:45 +01:00
27c4fd240d
Improve test for preferred sym algs 2021-11-27 17:03:17 +01:00
d670b5ee07
Fix test 2021-11-27 16:15:50 +01:00
06a4b4cf5e Add basic test for SubkeyBindingSignatureBuilder 2021-11-27 16:14:28 +01:00
b44a97760a
Add test for ThirdPartyCertificationBuilder 2021-11-27 15:36:45 +01:00
c9c84a2dc5 Add revocation certificate test 2021-11-27 15:11:44 +01:00
151d3c7b96 SecretKeyRingEditor: Restructure arguments of modification methods 2021-11-27 15:00:19 +01:00
5e85e975cd Add RevocationAttributesTest 2021-11-27 15:00:12 +01:00
5364e21b5e
WiP implementation of public key parameter validation 2021-11-24 18:46:29 +01:00
cc16a3da88
Add overloaded method for user-id revocation using SelectUserId 2021-11-24 15:07:54 +01:00
16e283f3a6
Fix unvalid cursor mark for large cleartext signed messages
Fixes #219, #220
2021-11-24 14:51:16 +01:00
9e715aabfe
Test signature subpackets and fix bug for missing user-id sig 2021-11-21 22:25:45 +01:00
6a137698c4
Wip: Add test for signature structure, set fingerprint on primary user-id self sig 2021-11-20 21:12:12 +01:00
91080f411d
Rework secret key protection 2021-11-20 20:19:22 +01:00
176574df50
Wip 2021-11-20 16:07:27 +01:00
24aebfaf63
Rework subkey-revocation using new signature subpackets api 2021-11-16 15:18:51 +01:00
3d5a005ec7 Make SignatureSubpackets more procedural 2021-11-16 13:45:35 +01:00
3f09fa0cc7 Progress 2021-11-16 13:45:34 +01:00
04ada88188 Fix errors 2021-11-16 13:44:10 +01:00
15d42c294e Add tests for SignatureSubpacketGeneratorWrapper 2021-11-16 13:40:33 +01:00
352f099d8a Refactoring: Move signature verification stuff to consumer subpacket 2021-11-16 13:40:33 +01:00
3438b7259a Restructured API 2021-11-16 13:40:33 +01:00
b8a376f86a Create signature creator methods and fix compilation issues 2021-11-16 13:40:33 +01:00
de926e022f More signature builder experimentations 2021-11-16 13:40:33 +01:00
e9dc26b1da Started working on proofs 2021-11-16 13:40:33 +01:00
f0bc19b0da WIP: Work on SignatureBuilders 2021-11-16 13:40:33 +01:00
19b1a0238d
Fix API for accessing preferred algorithms 2021-11-15 13:02:26 +01:00
021fd7846e
Rename user-id deletion methods 2021-11-13 16:05:55 +01:00
74609e0ef7 Add another test for deletion of non-existent user-ids from key 2021-11-12 16:56:27 +01:00
d036cf2593 Add tests for KeyRingUtils.deleteUserIdFrom*KeyRing methods 2021-11-12 16:56:27 +01:00
e4d1aa7edf Remove support for deleting user-ids and subkeys. Use revoke* instead. 2021-11-12 16:56:27 +01:00
03a350d279
Separate key generation from scratch and from templates in to buildKeyRing() and generateKeyRing() 2021-11-02 12:23:05 +01:00
59c9ec341e
Hide distinction between clearsigned and inline signed message verification 2021-11-02 12:12:29 +01:00
bd67d9c0fa
Rename EncryptionPurpose.STORAGE_AND_COMMUNICATION -> ANY 2021-11-02 11:30:44 +01:00
a9a61bc799
Improve library usage of slf4j and logback.
Logback-classic is now a test dependency and is additionally declared as OPTIONAL runtime dependency.
Applications that don't want to use logback can now easily disable it by not explicitly depending on it.
2021-10-29 20:28:14 +02:00
2d364d0939
Replace OpenPgpV4Fingerprint with OpenPgpFingerprint in examples 2021-10-29 20:08:11 +02:00
3a9473ad6c
V5 Key-readyness: Replace usages of OpenPgpV4Fingerprint with abstract super class 2021-10-27 17:38:25 +02:00
e8bf2ea9e7
Add tests for message inspection 2021-10-27 15:54:50 +02:00
abdc5c8fdd
Fix license of KleopatraCompatibilityTest 2021-10-27 14:29:05 +02:00
4857056986 Add failing Kleopatra interoperability test 2021-10-27 13:26:49 +02:00
963a8170da
Fix decryption of signed messages created with PGPainless < 0.2.10 2021-10-23 16:44:40 +02:00
f05be3dc30
Fix prematurely throwing of MissingPassphraseException 2021-10-19 18:13:23 +02:00
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
bebb9709ac
Add tests for how unbound subkeys are handled in KeyRingInfo 2021-10-14 16:16:06 +02:00
b04ecc4eef
Further increase coverage of KeyRingInfo 2021-10-12 14:56:24 +02:00
ee1d38a38a
Increase test coverage for KeyRingInfo 2021-10-12 14:18:59 +02:00
33f516efe8
Fix detection of signed messages when verification keys are missing
Fixes #187, supersedes #189
2021-10-08 14:03:12 +02:00
e390389c0a Reuse compliance 2021-10-07 16:28:31 +02:00
18a6090f0e
Add tests for user-attribute validation 2021-10-04 15:53:58 +02:00
c0ae6d75ba
Add tests for UserAttribute certification/revocation 2021-10-04 14:47:16 +02:00
5d28823c80
Add more signing tests 2021-10-04 14:21:06 +02:00
96755a82a5
More SignatureSubpacketsUtilTest methods 2021-10-04 14:00:23 +02:00
bccf384dbf
Add feature-related utilities and tests 2021-10-04 13:32:04 +02:00
7113dd1d7e
Add test for SignatureUtils 2021-10-03 14:32:32 +02:00
7bc35dcba3
Add regression test for PGPUtil.getDecoderStream mistaking plaintext for base64 encoded data 2021-10-01 15:21:42 +02:00
f7a7035059
Workaround for PGPUtil accidentally mistaking plain data for base64 encoded data. 2021-10-01 15:04:37 +02:00
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
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
526dc0caac
Add support for creating cleartext signed messages and add tests 2021-09-27 17:10:00 +02:00
ece5897bae
CleartextSignedMessage processing: Reuse normal processing API 2021-09-27 11:47:54 +02:00
f15f3a4e2a
Fix example use of ascii armoring 2021-09-23 18:06:54 +02:00
1aa6541766 Merge branch 'key_generator_rework' 2021-09-20 14:50:02 +02:00
be47a96030
Further simplify the KeyRingBuilder API 2021-09-20 12:30:03 +02:00
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
81379a5176
Add MessageInspector utility class which can be used to determine encryption keys for a message 2021-09-14 21:49:02 +02:00
fedf7c0cf8 Make AlgorithmSuite members final and remove setters 2021-09-13 19:46:18 +02:00
21f424551b Simplify KeySpecBuilder 2021-09-13 19:46:18 +02:00
f28232893c
Refactoring: Move cleartext signed message processing to decryption_verification 2021-09-13 18:09:53 +02:00
194e4d7631
Automatically 'repair' keys with S2K usage CHECKSUM to use SHA1 when changing passphrases 2021-09-10 20:14:12 +02:00
7e71af973b
Add JUnit tests for modification of keys with different sig classes 2021-09-10 19:57:05 +02:00
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
c942238b40
Add tests for CachingSecretKeyRingProtector 2021-09-07 18:19:34 +02:00
3994f87c78 Cleartext Signature Framework: Return OpenPgpMetadata 2021-09-07 14:02:07 +02:00
90a00e0541 Move signature verification to dedicated streams 2021-09-07 14:02:07 +02:00
90e0f74aea
Stabilize expiration dates in revocation tests 2021-09-06 15:23:10 +02:00
e5ae09b79c
Change default compression algorithm from UNCOMPRESSED to ZIP 2021-09-06 15:13:41 +02:00
97c8ff8312
Throw WrongConsumingMethodException when processing Cleartext Signed Messages with Inband Signature verification API and vice versa 2021-08-29 13:35:27 +02:00
2885ff7a14
Cleartext signature framework: Reuse ConsumerOptions 2021-08-28 11:39:50 +02:00
e19acb667c
Add SignatureUtils.readSignatures(byte[]) 2021-08-26 19:35:25 +02:00
ac469ff5d7
Make non-test method a main method 2021-08-26 15:07:48 +02:00
4d6ca80e25 Debug signature verification using debug build of bcpg 2021-08-26 15:03:20 +02:00
3573115a60 Add investigation test for cleartext signature verification 2021-08-23 14:27:03 +02:00
829068d5a8 Switch from JUL logging to SLF4J 2021-08-23 14:20:25 +02:00
ae1539fa24
Add test to check, how messages with multiple SEIP packets are handled 2021-08-23 00:48:38 +02:00
3abb796220
Separate Signature verification methods out of SignatureValidator into SignatureVerifier 2021-08-18 14:28:36 +02:00
8c3b694a71
Refactoring 2021-08-18 13:19:43 +02:00
5a9b8a2c50
Verify notBefore and notAfter on any message signatures 2021-08-18 12:55:24 +02:00
2bd71617bd PGPException is not thrown during secret key reading 2021-08-15 15:46:41 +02:00
1ce6632f18 Rename KeyValidationException -> KeyValidationError 2021-08-15 15:46:41 +02:00
fd867bbfbe
Allow customization of ASCII armor comment and version headers 2021-08-14 13:56:16 +02:00
8256cd3a5b
Test some methods of KeyRingInfo 2021-08-08 18:26:38 +02:00
08a5ce73dc
Test SignatureValidator.verifyWasPossiblyMadeByKey() 2021-08-08 17:55:57 +02:00
aa0aaf134d
Bundle ASCII-Armor CRC related tests 2021-08-08 17:39:36 +02:00
cae099eabe
Properly evaluate key expiration dates 2021-08-08 16:58:32 +02:00
a0be510fc2
Update test key to have no key-expiration date 2021-08-08 16:57:37 +02:00
944d79b009
Rearrange armored input stream workaround code 2021-08-08 15:58:12 +02:00
1983cfb4ac
ArmoredInputStreams: Properly catch ignorable IOExceptions caused by missing CRC sums 2021-08-08 15:35:05 +02:00
245e4a380d
Add JUnit test to ensure proper bracketing and nested-ness of multiple OnePassSignatures 2021-08-05 13:12:12 +02:00
9a485a3354
Encrypt to all capable subkeys by default 2021-08-04 16:38:17 +02:00
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
e4fdc3bc1e
SubkeyIdentifier: Throw NoSuchElementException for non-existent subkey 2021-08-01 17:23:17 +02:00
1327e08ac3
Add tests for SubkeyIdentifier 2021-08-01 17:19:04 +02:00
b674a412b5
Reformat issuer-fingerprint inclusion code 2021-08-01 16:03:30 +02:00
bd04e35a53
Commit investigation code for #160 (Thunderbird interop issues) 2021-08-01 15:54:19 +02:00
fb16db5db4
Improve handling of signatures with missing issuerKeyId packets 2021-07-31 22:24:39 +02:00
311c842196
Revert introduction of StreamUtil 2021-07-31 20:40:31 +02:00
107e53c03e
Fully drain ArmoredInputStreams to verify CRC checksum.
Fixes #159 (for real this time)
2021-07-27 15:09:59 +02:00
fc311fe781
Workaround for #159: Avoid to prevent swallowing IOExceptions 2021-07-26 16:19:30 +02:00
726d22b8d6 Change passphrase: Skip GNU_DUMMY_S2K keys 2021-07-19 15:05:03 +02:00
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
2ba782c451
Move file-related encryption-info into ProducerOptions 2021-07-10 12:22:47 +02:00
447c08b446 Add tests for ignoring marker packets when reading keys 2021-07-10 11:48:56 +02:00
0330d3cfa3 Add getMarkerPacket() test method 2021-07-10 11:48:46 +02:00
6a90c4303e
OpenPgpMetadat: identify verified sigs by SubkeyIdentifier 2021-07-04 13:08:24 +02:00
48314fde40
Assign sensible names to test() methods 2021-07-03 13:23:11 +02:00
70666d276b
Rework MultiMapTest 2021-07-03 13:20:25 +02:00
43a21de53a
Delete useless GenerateKeyTest 2021-07-03 12:59:33 +02:00
0321a6170c
Execute signature related tests on all implementations 2021-07-03 12:56:42 +02:00
a5dba7a368
Enable MultiPassphraseSymEncTest 2021-07-03 12:56:30 +02:00
7c612dd2ef
Parametrize BindingSignatureSubpacketsTest to run on all implementations 2021-07-03 12:50:44 +02:00
84ff6ce015
Improve tests 2021-07-03 12:42:17 +02:00
63c75f1f86
Rename TestUtil -> TestImplementationFactoryProvider 2021-07-03 12:42:12 +02:00
9ac4b30ec7
Delete unused NonEmptyList class 2021-07-03 12:24:08 +02:00
863d443052
Request deletion of temp test files upon exit 2021-07-03 12:23:40 +02:00
c8a281d6a4
Move UTC timestamp methods to DateUtil class 2021-07-03 12:23:24 +02:00
9b046a0cf1
Change SymmetricEncryptionAlgorithmNegotiator to return the 'best' avail. alg 2021-07-01 21:33:38 +02:00
30740aba4f
Add SymAlgoNegotiatorTest 2021-07-01 19:24:17 +02:00
3cb014e3f6
Add TestUtils.now() to have stable 'rounded' UTC dates in tests 2021-07-01 19:12:23 +02:00
9f76d16a34
Execute more tests on both implementation providers 2021-07-01 19:11:55 +02:00
c234e38ae2
Add key extraction and ascii armor examples 2021-07-01 17:37:30 +02:00
b6eed91f47
Remove deprecated encryption API 2021-06-29 16:43:37 +02:00
42aed70719
Add SignatureTypeTest 2021-06-29 15:10:22 +02:00
fee3041bcb
Add test for SignatureSubpacket.fromCodes() 2021-06-29 15:03:37 +02:00
4947f17842
JUnit test the AlgorithmSuite class 2021-06-29 14:58:50 +02:00
9637ef5d35
Increase test coverage 2021-06-29 14:42:22 +02:00
dff47d17d1
Remove more unused methods and fix method name 2021-06-28 21:14:40 +02:00
60cbcac58b
Fix test and use new decryption API 2021-06-26 18:41:02 +02:00
715ae707ed Merge branch 'decryptionAPI2' 2021-06-26 18:36:04 +02:00
fc14a86d9c Add user-id revocation example 2021-06-26 18:33:41 +02:00
f6ffc4c28d Add examples for encryption and decryption of messages 2021-06-26 18:33:41 +02:00
9b34664ba2 Add example for unlocking secret keys 2021-06-26 18:33:41 +02:00
8d05eea92d Add documentation to ManagePolicy 2021-06-26 18:33:41 +02:00
ac8fb5ad6b Add ManagePolicy example 2021-06-26 18:33:41 +02:00
4a0ef1ac6b Add ConvertKeys example 2021-06-26 18:33:41 +02:00
3de076eb31 Add modify keys tests 2021-06-26 18:33:41 +02:00