1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-15 17:02:06 +01:00
Commit graph

596 commits

Author SHA1 Message Date
b9845912ee
Add tests for readKeyRing() 2022-08-08 13:20:28 +02:00
ca09ac62ca
KeyRingInfo.isUsableFor*(): Check if primary key is revoked 2022-08-03 13:37:18 +02:00
895fcced9a
Add gradle CI action 2022-07-22 20:21:02 +02:00
cb23cad625
Fix checkstyle issues and java API compatibility 2022-07-22 13:59:15 +02:00
Jérôme Charaoui
5a86d9db62 Fix tests that read from jar-embedded resources
It seems that none of the functions used here actually require a File
object as arguments, and will happily work on InputStream objects.
This also changes readFromResource() to use InputStream.readAllBytes()
instead of File.readAllBytes(), which is available from Java 9.
2022-07-22 13:55:05 +02:00
c4bffad478
Abort (skip) tests reading from resources 2022-07-21 21:34:44 +02:00
f966c1ed07
Explicitly cast Long to long to fix ambiguity in debian tests 2022-07-20 18:07:42 +02:00
cd5982cd47
Add AEADAlgorithm class and test 2022-07-18 11:30:37 +02:00
6fc1d25db8 Merge branch 'fix298' 2022-07-16 12:37:20 +02:00
ba191a1d0f
Prevent adding NULL to symmetric algorithm preference when generating key
Fixes #301
2022-07-15 14:19:45 +02:00
dec3c8be60
Add SecretKeyRingEditor.replaceUserId(old,new,protector) 2022-07-15 14:00:41 +02:00
2ad67a85fb
Add test to make sure we do not allow unencrypted as sym alg preference 2022-07-15 13:20:23 +02:00
4730ac427b
Add test for #298 2022-07-13 14:54:16 +02:00
223cf009fc
Fix User-ID format in documentation and note invalid user-id formats in tests 2022-07-12 10:33:43 +02:00
3842aa9ced
Add test to explore behavior when dealing with V3 keys 2022-07-08 15:08:45 +02:00
8b66b3527e
Add tests for pet name certification and scoped delegation 2022-06-30 13:16:15 +02:00
b8f4cc3935 Merge branch 'certification' 2022-06-29 16:01:03 +02:00
b2a5351cc3
Delete unused KeyRingValidator class 2022-06-29 16:00:21 +02:00
b6975b38f1
Add tests for KeyFlag bitmask methods 2022-06-20 19:03:52 +02:00
0690a21360
Increase coverage of Policy class 2022-06-20 18:48:27 +02:00
37441a81e8
Add OpenPgpV5Fingerprint constructor tests using mocked v5 keys 2022-06-20 18:35:48 +02:00
fed3080ae8
Add tests to increase coverage of v5 fingerprint class 2022-06-20 18:19:24 +02:00
ca39efda99
Add test for CleartextSignedMessageUtil 2022-06-20 18:10:44 +02:00
a944d2a6b9
Fix build errors 2022-06-20 15:09:02 +02:00
1483ff9e24 Add another test for Trustworthiness 2022-06-20 12:44:40 +02:00
d2b48e83d9 Implement certifying of certifications 2022-06-20 12:44:40 +02:00
fa5ddfd112 WIP: Implement delegations
THERE ARE THINGS BROKEN NOW. DO NOT MERGE!
2022-06-20 12:44:40 +02:00
c1170773bc Implement certification of third party keys 2022-06-20 12:44:40 +02:00
75455f1a3c
Add OpenPgpMetadata.isCleartextSigned and use it in sop to determine if message was cleartext signed 2022-06-19 17:31:48 +02:00
dd26b5230d Use newly introduced modernKeyRing(userId) method 2022-06-19 16:59:42 +02:00
44c32d0620
When setting expiration dates: Prevent integer overflow 2022-06-01 13:36:00 +02:00
9921fc6ff6
Add and test OpenPgpFingerprint.parseFromBinary(bytes) 2022-05-18 14:19:08 +02:00
3a9bfd57ac Add test for SignatureUtils.getSignaturesForUserIdBy() 2022-05-17 18:38:48 +02:00
12e62d381c
Make readSignatures skip over compressed data packets without decompression. 2022-05-08 11:24:34 +02:00
49d65788b4 Remove support for processing compressed detached signatures
Signatures are indistinguishable from randomness, so there is no point in
compressing them, apart from attempting to exploit flaws in compression
algorithms.
Thanks to @DemiMarie for pointing this out

Fixes #286
2022-05-07 21:46:12 +02:00
64a50266f1
Test for detection of uncompressed, signed messages, and improve decryption of seip messages 2022-05-05 12:43:44 +02:00
69f84f24b6
Implement heavy duty packet inspection to figure out nature of data 2022-05-04 20:55:29 +02:00
b980fcd7b1
EncryptionOptions.addRecipients(collection): Disallow empty collections
Fixes #281
2022-04-29 22:49:45 +02:00
6c983d66e0
Take hash algorithm usage date into account when checking algorithm acceptance 2022-04-22 22:45:39 +02:00
6c442e9568 Merge remote-tracking branch 'origin/hashContextSigner' 2022-04-22 21:36:47 +02:00
46f69b9fa5
Introduce OpenPgpInputStream to distinguish between armored, binary and non-OpenPGP data 2022-04-22 20:53:44 +02:00
73b7f1b9bb
Refactoring 2022-04-19 21:07:46 +02:00
c3dfb254b1
Experimental implementation of signing of existing hash contexts (MessageDigest instances) 2022-04-16 00:23:20 +02:00
864bfad80c Add test for encryption / decryption, signing with missing secret subkey 2022-04-07 19:42:58 +02:00
a22336a795 Create dedicated KeyException class for key-related exceptions. 2022-04-07 19:42:58 +02:00
0bce68d6ee
Add shortcut SigningOptions.addSignature() method 2022-04-04 20:18:15 +02:00
e601f8dbda
In Encrypt example: Read keys from string 2022-04-04 19:49:28 +02:00
c8a1ca5b29
Make use of DateUtil.now() in test 2022-04-04 12:53:47 +02:00
50bcb6a135 Fix changelog and change method signature 2022-04-02 16:18:12 +02:00
f8e66f4d61 Add ProducerOptions.applyCRLFEncoding()
Enabling it will automatically apply CRLF encoding to input data.
Further, disentangle signing from the encryption stream
2022-04-02 16:18:12 +02:00
6bef376992
Fix signature generation with all format and signature type combinations
This comes at the cost of that we no longer CR/LF encode literal data before encryption/signing.
That means that applications that rely on PGPainless to do the CR/LF encoding must manually
do the encoding before feeding the message to PGPainless.
The newly introduced CRLFGeneratorStream has documentation on how to do that.
Fixes #264
2022-03-30 16:13:08 +02:00
b0eb32d550
Fix checkstyle 2022-03-30 12:21:53 +02:00
82936c5499 Add investigative test for broken messages when using different data/sig encodings 2022-03-27 17:01:31 +02:00
e8b03834cb
Annotate fromId(code) methods with Nullable and add Nonnull requireFromId(code) methods 2022-03-22 15:09:09 +01:00
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