1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-12-27 21:37:58 +01:00
Commit graph

642 commits

Author SHA1 Message Date
5108b81252
Add test to ensure PGPainless will refuse to decrypt message with incapable key 2021-12-13 12:43:08 +01:00
80e12db8b6
Prevent message decryption using non-encryption key 2021-12-13 12:27:32 +01:00
e59a8884c1 SigningOptions: Replace arguments PGPSecretKeyRingCollection with Iterable<PGPSecretKeyRing> 2021-12-13 01:14:55 +01:00
ba9de4b44a EncryptionOptions: replace arguments of type PGPPublicKeyRingCollection with Iterable<PGPPublicKeyRing> 2021-12-13 01:14:24 +01:00
710f676dc3 Rename MAX_RECURSION_DEPTH constant to avoid confusion 2021-12-13 01:03:20 +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
b3ec3333ce
CachingSecretKeyRingProtector: Prevent accidental passphrase override via addPassphrase() 2021-12-07 14:42:03 +01:00
82cbe467f2
Introduce iteration limit to prevent resource exhaustion when reading keys 2021-12-06 17:11:42 +01:00
c4618617f6
Introduce iteration limit to prevent resource exhaustion when reading signatures 2021-12-06 17:11:23 +01:00
af1d4f3e5b
Add ElGamal validation ported from openpgpjs 2021-12-06 16:43:27 +01:00
073cf870d2
Fix NPE when attempting to decrypt GNU_DUMMY_S2K keys 2021-12-06 15:07:34 +01:00
d54a40196b
Fix NPE when attempting to decrypt GNU_DUMMY_S2K keys 2021-12-06 15:01:37 +01:00
fae5cd0efe
SOP: Fix signing using key with missing signing key 2021-12-02 15:10:53 +01:00
e7d0cf9c00
Fix BaseSecretKeyRingProtector misinterpreting empty passphrases 2021-12-02 14:44:03 +01:00
8b1bdb98f1
Adding subkeys, generating keys: Verify subkeys comply to public key algorithm policy 2021-12-02 14:18:21 +01:00
f5c3e7b23f
Remove Blowfish from default symmetric decryption/encryption algorithm policies 2021-12-02 13:09:35 +01:00
cd9e7611ac Remove workaround for invalid signature processing 2021-12-02 12:42:02 +01:00
c55fd2e552 Implement decryption with - and access of session keys 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
176ad09d19
Make Passphrase comparison constant time 2021-11-29 21:55:35 +01:00
aef9ebfd7b Incorporate feedback 2021-11-28 14:56:24 +01:00
635de19fb8
Add tests for KeyRingUtils.injectCertification and render keysPlusPublicKey unusable 2021-11-28 14:15:01 +01:00
03912f9dc1
Fix typos 2021-11-28 13:22:08 +01:00
e133434888
Remove unused methods from SignatureSubpacketGeneratorUtil 2021-11-28 13:09:21 +01:00
b874aee6bb
Move getKeyLifetimeInSeconds to SignatureSubpacketsUtil and make public 2021-11-28 13:09:10 +01:00
b09858e186
Add basic test for DirectKeySignatureBuilder 2021-11-27 17:14:45 +01:00
06a4b4cf5e Add basic test for SubkeyBindingSignatureBuilder 2021-11-27 16:14:28 +01:00
c7dc7f755c KeyAccessor.ViaKeyId: Differentiate between primary key (direct-key sig) and subkey 2021-11-27 16:14:28 +01:00
c229562573
Rename CertificationSignatureBuilder to ThirdPartyCertificationSignatureBuilder
Also add javadoc
2021-11-27 15:22:33 +01:00
936ea55cee Add explanation of revocation reason hard-ness to RevocationAttributes 2021-11-27 15:11:44 +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
5376a289b3 Add documentation to revocation attributes class 2021-11-27 15:00:04 +01:00
5364e21b5e
WiP implementation of public key parameter validation 2021-11-24 18:46:29 +01:00
3b49840c9c
Reuse GNUObjectIdentifiers.Ed25519 2021-11-24 18:32:50 +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
50f565dd8c
Add methods to sign messages with custom subpackets 2021-11-22 19:20:04 +01:00
4b2089b42b Fix key ring builder adding additional user-ids as primary 2021-11-21 23:07:00 +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
76e19359b4
Replace subpacket generator in key spec classes 2021-11-20 20:27:36 +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
25c95804ce
Rework user-id revocation to use subpackets callback API 2021-11-16 15:35:17 +01:00
24aebfaf63
Rework subkey-revocation using new signature subpackets api 2021-11-16 15:18:51 +01:00
ab3ae15719 Ensure keyflags are set when adding userid 2021-11-16 13:45:35 +01:00
a6181218a2 Convert KeyRingBuilder fields to local variables 2021-11-16 13:45:35 +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
c31fda95f9 Start reusing new signature builder in SecretKeyRingEditor 2021-11-16 13:40:33 +01:00
44169ecf64 More progress! 2021-11-16 13:40:33 +01:00
8c49d37e1f Change return values of signature subpackets subclasses 2021-11-16 13:40:33 +01:00
ed96bcd109 Checkstyle fix 2021-11-16 13:40:33 +01:00
eb9ea23514 Add UniversalSignatureBuilder 2021-11-16 13:40:33 +01:00
8212fe1cc7 Create applyCallback util methods 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
8b5ffedd29 More checkstyle issues 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
d036cf2593 Add tests for KeyRingUtils.deleteUserIdFrom*KeyRing methods 2021-11-12 16:56:27 +01:00
0f77d81bd1 Add deprecated utility methods for deleting user-ids from keys/certificates 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
2ac10e7bc7
Rename method to set'Key'ExpirationDateInSubpacketGenerator() 2021-11-06 17:39:04 +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
cf1881a140
Fix detection of non-armored data 2021-10-30 15:00:04 +02: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
3a9473ad6c
V5 Key-readyness: Replace usages of OpenPgpV4Fingerprint with abstract super class 2021-10-27 17:38:25 +02:00
383f51277e
Prepare for V5 keys: Extract abstract super class OpenPgpFingerprint from OpenPgpV4Fingerprint 2021-10-27 17:12:06 +02:00
bc2afea7ed
Add toString() methods for SignatureVerification & failure 2021-10-27 17:11:40 +02:00
aed06fc832
Add MessageInspector.determineEncryptionInfo(String) 2021-10-27 15:54:34 +02:00
5c3fa28946 Fix Kleopatra Interoperability
The cause of this issue was that we skipped the first (proper) PKESK and instead tried to decrypt
the wildcard PKESKs.

Furthermore, we had an issue in MessageInspector which read past the PKESK packets
2021-10-27 13:26:49 +02:00
3fd929916d
EncryptionOptions: Change return val of overrideEncryptionAlgorithm to EncryptionOptions 2021-10-26 23:06:41 +02:00
963a8170da
Fix decryption of signed messages created with PGPainless < 0.2.10 2021-10-23 16:44:40 +02:00
2b2639bde7
Fix checkstyle issues 2021-10-20 21:37:48 +02:00
a8998f27ad
Introduce HashAlgorithmNegotiator 2021-10-20 21:26:47 +02:00
f05be3dc30
Fix prematurely throwing of MissingPassphraseException 2021-10-19 18:13:23 +02:00
dc0b96278e
Add javadoc 2021-10-18 16:19:12 +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
23b714f61b
Only consider validly bound subkeys when determining latest key creation date 2021-10-14 16:15:42 +02:00
aef213a672
Fix AssertionError when determining encryption subkeys from set containing unbound key 2021-10-14 15:53:49 +02:00
5ea8294a60
Improve javadoc of Feature class 2021-10-14 15:27:01 +02:00
4e16cf13c5
Remove unused subclass 2021-10-12 15:31:38 +02:00
bbc68e9803
Fix Picking of Subkey Revocation Signatures 2021-10-12 14:04:23 +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
bccf384dbf
Add feature-related utilities and tests 2021-10-04 13:32:04 +02:00
76a0a6479a
Remove unused OPS methods 2021-10-03 14:12:26 +02:00
0e1d6cb5a1
Rename DetachedSignature -> DetachedSignatureCheck 2021-10-03 13:47:20 +02:00
910bae58c0
Remove unused methods in DetachedSignature 2021-10-03 13:46:15 +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
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
387b2b4b43
Ensure that KeySpecBuilder gets at least one key flag 2021-09-20 11:26:00 +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
11ad6361f8 Reformat arguments 2021-09-13 19:46:18 +02:00
21f424551b Simplify KeySpecBuilder 2021-09-13 19:46:18 +02:00
0a45f4de9e
Add documentation to SignatureVerification class 2021-09-13 18:18:50 +02:00
f28232893c
Refactoring: Move cleartext signed message processing to decryption_verification 2021-09-13 18:09:53 +02:00
9a8bb7d3ef
Add missing break statement to loop 2021-09-10 21:04:36 +02:00
194e4d7631
Automatically 'repair' keys with S2K usage CHECKSUM to use SHA1 when changing passphrases 2021-09-10 20:14:12 +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
17ba3c3879
SecretKeyRingEditor: Take not only positive, but also generic,casual certifications into consideration 2021-09-08 11:59:28 +02:00
c942238b40
Add tests for CachingSecretKeyRingProtector 2021-09-07 18:19:34 +02:00
ab3f20ea54
VerifyCleartextSignatures: Remove deprecated methods 2021-09-07 17:44:03 +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
ba0e5eb3fe
Improve readability of DecryptionStreamFactory 2021-09-06 17:15:17 +02:00
e81ee648d8
Clean DecryptionStream: We only ever have one IntegrityProtectedInputStream at most 2021-09-06 15:14:13 +02:00
e5ae09b79c
Change default compression algorithm from UNCOMPRESSED to ZIP 2021-09-06 15:13:41 +02:00
f68779d8a5
Add tests for pgpainless-sop 2021-08-30 17:15:11 +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
943360aa65
Document OpenPgpMetadata class 2021-08-26 19:53:15 +02:00
e19acb667c
Add SignatureUtils.readSignatures(byte[]) 2021-08-26 19:35:25 +02:00
1124c6fd15 Wip: Configure logback logging 2021-08-26 15:03:20 +02:00
4d6ca80e25 Debug signature verification using debug build of bcpg 2021-08-26 15:03:20 +02:00
200e00990b Remove unused class and move detached sig initialization in own method 2021-08-23 14:27:02 +02:00
772f69788b Refactor CleartextSignatureProcessor to allow reuse in DetachInbandSignatureAndMessage 2021-08-23 14:26:17 +02:00
829068d5a8 Switch from JUL logging to SLF4J 2021-08-23 14:20:25 +02:00
03efb5e14c
Rename verifySignatureCreationTimeIsInBounds method 2021-08-18 14:50:01 +02:00
3bee3e5916
Add README for signature package 2021-08-18 14:49:31 +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
099b160656
Native support for notBefore and notAfter signature creation time constraints 2021-08-17 14:47:07 +02:00
6a108cb8c0 SignatureValidityComparator: Remove member order 2021-08-15 15:46:41 +02:00
452ee3fb30 Do not hide member has with local variable 2021-08-15 15:46:41 +02:00
e368a8b16a Reduce complexity of statements 2021-08-15 15:46:41 +02:00
6467217bd1 Make defaultDigestHashAlgorithm static 2021-08-15 15:46:41 +02:00
dd941fb293 Merge nested if-statements 2021-08-15 15:46:41 +02:00
28f6664b29 Change order of modifiers 2021-08-15 15:46:41 +02:00
09ffd527b5 Change constructor visibility of KeyAccessor 2021-08-15 15:46:41 +02:00
9ac0ee4043 Avoid hiding member with local variable 2021-08-15 15:46:41 +02:00
672acd38d0 ProviderFactory: Avoid accessing subclass in parent class initialization 2021-08-15 15:46:41 +02:00
adc69caa51 ImplementationFactory: Avoid accessing subclass in parent class initialization 2021-08-15 15:46:41 +02:00
8539157405 Move builder() method above Builder class 2021-08-15 15:46:41 +02:00
54a4625fed fix comments and javadoc 2021-08-15 15:46:41 +02:00
c11f334fa4 Policy: Use EnumMap for improved performance 2021-08-15 15:46:41 +02:00
e5b15fe0c2 Use String-formatting in Logger statements 2021-08-15 15:46:41 +02:00
485666c72a Change static variable names 2021-08-15 15:46:41 +02:00
20b3080e94 getBitStrenght: Throw NoSuchAlgorithmException for unknown curves 2021-08-15 15:46:41 +02:00
ccc62e090c Make DateUtil thread-safe 2021-08-15 15:46:41 +02:00
bb27fddc89 Remove default constructor of NotationRegistry 2021-08-15 15:46:41 +02:00
ab951fcf03 InputStreams: overwrite read(b, off, len) for improved performance 2021-08-15 15:46:41 +02:00
5eb470862e Remove OpenPgpMetadata.FileInfo subclass 2021-08-15 15:46:41 +02:00
2bd71617bd PGPException is not thrown during secret key reading 2021-08-15 15:46:41 +02:00
6251e01d57 Make classes final where sensible 2021-08-15 15:46:41 +02:00
1ce6632f18 Rename KeyValidationException -> KeyValidationError 2021-08-15 15:46:41 +02:00
66293bf333
Add documentation to ArmoredOutputStreamFactory 2021-08-15 13:41:07 +02:00
fd867bbfbe
Allow customization of ASCII armor comment and version headers 2021-08-14 13:56:16 +02:00
a678ff1b6e
Add documentation to classes related to verification of cleartext signed data 2021-08-14 11:39:13 +02:00
468159b2ad
Add documentation to SignatureSubpacketsUtil 2021-08-14 11:19:40 +02:00
3c68840a29
Add documentation to SignatureUtils methods 2021-08-14 11:09:51 +02:00
50e7fd96b8
Fix javadoc issues 2021-08-08 18:13:48 +02:00
cae099eabe
Properly evaluate key expiration dates 2021-08-08 16:58:32 +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
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
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
16c3116518
Fix order and nested-ness of one-pass-signatures
Fixes #164
2021-08-04 15:42:25 +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
99ff6d537b
Prevent IllegalArgumentException for non-v4 issuer fingerprints 2021-08-01 16:11:47 +02:00
b674a412b5
Reformat issuer-fingerprint inclusion code 2021-08-01 16:03:30 +02:00
6a11e39d76
Add issuer-fingerprint to message signatures 2021-08-01 15:53:51 +02:00
5422468d73
Check key flags on binding sig to determine if backsig is required 2021-07-31 22:25:55 +02:00
e7ed0f76a3
Properly ignore marker packets when reading keys/sigs 2021-07-31 22:25:12 +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
3e9979240b Add javadoc to the SignatureValidator class 2021-07-22 15:28:24 +02:00
1f08815633 Explicitly reject non-self signatures when picking user-id self sigs 2021-07-22 15:28:24 +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
be4962c531 Fix KeyRingReader methods not ignoring marker packets 2021-07-10 11:48:39 +02:00
6a90c4303e
OpenPgpMetadat: identify verified sigs by SubkeyIdentifier 2021-07-04 13:08:24 +02:00
b4b84badc0
ImplementationFactory: override toString() 2021-07-03 12:44:21 +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
c8a281d6a4
Move UTC timestamp methods to DateUtil class 2021-07-03 12:23:24 +02:00