1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-06-30 07:24:49 +02:00
Commit graph

894 commits

Author SHA1 Message Date
Paul Schaub 8d1794544a
Fix indentation 2022-06-21 19:48:38 +02:00
Paul Schaub 82ff62b4e6
Remove unused NotYetImplementedException 2022-06-20 17:58:27 +02:00
Paul Schaub a944d2a6b9
Fix build errors 2022-06-20 15:09:02 +02:00
Paul Schaub 7223b40b23 Add javadoc and indentation 2022-06-20 12:44:40 +02:00
Paul Schaub 8d2afdf3b6 Make certify() methods public 2022-06-20 12:44:40 +02:00
Paul Schaub bbd94c6c9a More documentation 2022-06-20 12:44:40 +02:00
Paul Schaub 870af0e005 Add javadoc documentation to Trustworthiness class 2022-06-20 12:44:40 +02:00
Paul Schaub d2b48e83d9 Implement certifying of certifications 2022-06-20 12:44:40 +02:00
Paul Schaub fa5ddfd112 WIP: Implement delegations
THERE ARE THINGS BROKEN NOW. DO NOT MERGE!
2022-06-20 12:44:40 +02:00
Paul Schaub c1170773bc Implement certification of third party keys 2022-06-20 12:44:40 +02:00
Paul Schaub 75455f1a3c
Add OpenPgpMetadata.isCleartextSigned and use it in sop to determine if message was cleartext signed 2022-06-19 17:31:48 +02:00
Paul Schaub 2d60650cc6 Progress on SOP04 support 2022-06-19 16:59:42 +02:00
Paul Schaub 53df487e59 Adopt changes from SOP-Java and add test for using incapable keys 2022-06-19 16:59:42 +02:00
Paul Schaub 9a545a2936 Wip: SOP 4 2022-06-19 16:59:42 +02:00
Paul Schaub 57fbb469ea Fix performance issue of encrypt and sign operations by buffering 2022-06-16 11:22:35 +02:00
Paul Schaub 444ec6d593
Add documentation to enforceBounds() 2022-06-01 13:40:07 +02:00
Paul Schaub 44c32d0620
When setting expiration dates: Prevent integer overflow 2022-06-01 13:36:00 +02:00
Paul Schaub 70a861611c
Improve SignatureUtils.wasIssuedBy() by adding support for v5 fingerprints 2022-05-18 14:21:22 +02:00
Paul Schaub 9921fc6ff6
Add and test OpenPgpFingerprint.parseFromBinary(bytes) 2022-05-18 14:19:08 +02:00
Paul Schaub 1a37058c66 Add SignatureUtils.getSignaturesForUserIdBy(key, userId, keyId) 2022-05-17 18:38:48 +02:00
Paul Schaub 77d010ec94 Add CollectionUtils.addAll(iterator, collection) 2022-05-17 18:38:48 +02:00
Paul Schaub 51baa0e5cb Add modernKeyRing(userId) shortcut method 2022-05-17 18:38:48 +02:00
Paul Schaub 8fd67da973
Add comment about readSignatures skipping compressed data packets 2022-05-08 11:34:56 +02:00
Paul Schaub 12e62d381c
Make readSignatures skip over compressed data packets without decompression. 2022-05-08 11:24:34 +02:00
Paul Schaub 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
Paul Schaub d3f412873b
Fix checkstyle issues 2022-05-07 21:44:52 +02:00
Paul Schaub 374e6452f0
Add RevokedKeyException 2022-05-07 14:12:18 +02:00
Paul Schaub 3e7e6df3f9
Disallow stripping of primary secret keys 2022-05-07 14:11:39 +02:00
Paul Schaub 64a50266f1
Test for detection of uncompressed, signed messages, and improve decryption of seip messages 2022-05-05 12:43:44 +02:00
Paul Schaub 826331917f
Add comments to unexhaustive parsing method 2022-05-05 11:15:19 +02:00
Paul Schaub 69f84f24b6
Implement heavy duty packet inspection to figure out nature of data 2022-05-04 20:55:29 +02:00
Paul Schaub 288f1b414b
Fix javadoc links 2022-05-03 11:31:19 +02:00
Paul Schaub 2b37c4c9cb
Deprecate Policy.*.default*Policy() methods in favor of methods with more expressive names
You cannot tell, what defaultHashAlgorithmPolicy() really means.
Therefore the default methods were deprecated in favor for more expressive methods
2022-05-03 11:23:40 +02:00
Paul Schaub b980fcd7b1
EncryptionOptions.addRecipients(collection): Disallow empty collections
Fixes #281
2022-04-29 22:49:45 +02:00
Paul Schaub 4698b68015
Fix javadoc generation 2022-04-23 01:47:44 +02:00
Paul Schaub 9b8cf37dd1
Use smart hash algorithm policy as default revocation hash policy 2022-04-22 23:06:40 +02:00
Paul Schaub 6c983d66e0
Take hash algorithm usage date into account when checking algorithm acceptance 2022-04-22 22:45:39 +02:00
Paul Schaub 4764202ac9
Change visibility of BcPGPHashContextContentSignerBuilder constructor 2022-04-22 22:43:19 +02:00
Paul Schaub 6c442e9568 Merge remote-tracking branch 'origin/hashContextSigner' 2022-04-22 21:36:47 +02:00
Paul Schaub 230725f6ff
Add option to force handling of data as non-openpgp 2022-04-22 21:33:13 +02:00
Paul Schaub 8172aa1083
Update documentation of #96 workaround 2022-04-22 20:56:02 +02:00
Paul Schaub 46f69b9fa5
Introduce OpenPgpInputStream to distinguish between armored, binary and non-OpenPGP data 2022-04-22 20:53:44 +02:00
Paul Schaub 73b7f1b9bb
Refactoring 2022-04-19 21:07:46 +02:00
Paul Schaub c3dfb254b1
Experimental implementation of signing of existing hash contexts (MessageDigest instances) 2022-04-16 00:23:20 +02:00
Paul Schaub b64d6e8e55
Stabilize HashAlgorithm.fromName() 2022-04-16 00:22:41 +02:00
Paul Schaub 05022fcbb5
Fix whitespace error 2022-04-07 21:17:00 +02:00
Paul Schaub e4bccaf58d
Add support for RegularExpression subpackets (fixes #246) 2022-04-07 20:47:47 +02:00
Paul Schaub 7710845454
Simplify setPolicyUrl implementation 2022-04-07 20:46:21 +02:00
Paul Schaub d4c56f655f
Add support for PolicyURI subpackets (fixes #248) 2022-04-07 20:41:21 +02:00
Paul Schaub 5f65ca4437
Remove workaround for BC not properly parsing RevocationKey subpacket 2022-04-07 20:28:45 +02:00
Paul Schaub d0544e690e
Fix KeyRingUtils.keysPlusPublicKey() 2022-04-07 20:24:36 +02:00
Paul Schaub 361d2376f5
Update documentation on curve oid workaround 2022-04-07 20:21:07 +02:00
Paul Schaub 73fa46895e
Implement merging of certificates
Fixes #211
2022-04-07 19:51:42 +02:00
Paul Schaub a22336a795 Create dedicated KeyException class for key-related exceptions. 2022-04-07 19:42:58 +02:00
Paul Schaub a7d56e3461
PGPainless 1.1.5 2022-04-05 14:48:44 +02:00
Péter Barabás 30c9ea254a Fix XML comment 2022-04-05 14:36:58 +02:00
Péter Barabás 8c6813ce56 #266 Handle ClassCastException in signature.init calls 2022-04-05 14:36:58 +02:00
Paul Schaub f6c6b9aded
Do not attempt to verify signatures made by external keys using primary key.
This aims at fixing #266 in combination with #267.
2022-04-05 14:10:04 +02:00
Paul Schaub 0bce68d6ee
Add shortcut SigningOptions.addSignature() method 2022-04-04 20:18:15 +02:00
Paul Schaub d0b070f0f3
Fix javadoc 2022-04-04 20:17:57 +02:00
Paul Schaub 2065b4e4ed
Document planned removal of BCUtil.constantTimeAreEquals(char[], char[]) 2022-04-04 13:08:24 +02:00
Paul Schaub 2c86d8dfe4
Document various KeyRingSelectionStrategies 2022-04-04 12:49:00 +02:00
Paul Schaub 7ca9934cbe
Document KeyRingSelectionStrategy 2022-04-04 12:32:37 +02:00
Paul Schaub bfbe03f9e0
Document SelectUserIds 2022-04-04 12:19:07 +02:00
Paul Schaub 4aaa242d64
Add javadoc to SignatureSubpacketsUtil 2022-04-04 10:40:57 +02:00
Paul Schaub 58dee0d970
Fix javadoc warnings 2022-04-02 18:56:05 +02:00
Paul Schaub 4bd01578fb
Fix javadoc generation 2022-04-02 18:14:17 +02:00
Paul Schaub 6869c66937
Add TODOs to remove deprecated methods in 1.2.X 2022-04-02 17:12:12 +02:00
Paul Schaub 8ec86e6464
Rename KeyRingUtil.removeSecretKey() to stripSecretKey() 2022-04-02 17:03:38 +02:00
Paul Schaub 50bcb6a135 Fix changelog and change method signature 2022-04-02 16:18:12 +02:00
Paul Schaub 39382c7de6 Add annotations to SignatureGenerationStream constructor 2022-04-02 16:18:12 +02:00
Paul Schaub 131c0c6d03 Add javadoc header to SignatureGenerationStream 2022-04-02 16:18:12 +02:00
Paul Schaub 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
Paul Schaub 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
Paul Schaub 87e6b044d9
Add EncryptionStream class description 2022-03-30 12:18:03 +02:00
Paul Schaub 620deaa1f9
Deprecate ProducerOptions.setEncoding()
The reason is that values other than BINARY oftentimes cause issues
(see https://github.com/pgpainless/pgpainless/issues/264), and further
experts recommended to ignore the metadata of the LiteralData packet
and only produce with ('b'/0/) as metadata values.
2022-03-27 17:34:24 +02:00
Paul Schaub 1cb3e559b5
Eliminate removed 'm' StreamEncoding 2022-03-27 17:29:42 +02:00
Paul Schaub 80d97b1bc0 Fix malformed signature packets 2022-03-27 17:01:31 +02:00
Paul Schaub 8ff405d6ad
Add toString() to SessionKey 2022-03-24 14:16:13 +01:00
Paul Schaub 405c7225f6
Deprecate ProducerOptions.setForYourEyesOnly()
Use of this special file name is deprecated since at least crypto-refresh-05
2022-03-23 15:17:29 +01:00
Paul Schaub e8b03834cb
Annotate fromId(code) methods with Nullable and add Nonnull requireFromId(code) methods 2022-03-22 15:09:09 +01:00
Paul Schaub 16b0d0730e
Annotate and document ArmorUtils class 2022-03-22 14:17:35 +01:00
Paul Schaub e89e0f216c
Annotate KeyRingUtils methods with Nullable and Nonnull 2022-03-22 13:20:36 +01:00
Paul Schaub 4bae2e74c4
Add documentation for further KeyRingUtils methods 2022-03-22 13:05:27 +01:00
Paul Schaub b5ccb23a62
Add documentation for KeyRingUtils.removeSecretKey() 2022-03-22 12:49:30 +01:00
Paul Schaub 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
Paul Schaub 29dc20d0bc Add EncryptionResult.isEncryptedFor(certificate) 2022-03-15 17:02:02 +01:00
Paul Schaub ecfa3823fb Add utility method to remove secret subkey from key ring
This might be useful for offline primary keys
2022-03-15 17:01:50 +01:00
Paul Schaub 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
Paul Schaub 661c043cdc
DFix KeyRingInfo.getValidAndExpiredUserIds considering unbound user-ids as valid 2022-03-13 16:52:57 +01:00
Paul Schaub 26c804b2dd
Add comment about hash algorithm header 2022-03-13 15:12:38 +01:00
Paul Schaub 6b9b956c2c
Add OpenPgpFingerprint.parse(String) 2022-03-10 12:22:02 +01:00
Paul Schaub 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
Paul Schaub 26d79679f0
Fix crash when validating unmatched signer's user-id subpacket
TODO: We might want to deprecate Signer's UserID subpackets completely and ignore them.
See results of sequoias test suite once PR below gets merged.
https://gitlab.com/sequoia-pgp/openpgp-interoperability-test-suite/-/merge_requests/28
2022-03-09 21:05:00 +01:00
Paul Schaub b34866b012
Make SigningOptions.getSigningMethods package visible 2022-03-09 21:03:31 +01:00
Paul Schaub db02106518
Fix typo 2022-03-07 14:57:00 +01:00
Paul Schaub 3fe78ab12a
Fix NPE when validating broken signature 2022-03-07 14:56:56 +01:00
Paul Schaub f1f7dec8b6
Fix accidental verification of thirdparty user-id revocations using primary key 2022-03-07 14:56:37 +01:00
Paul Schaub fc65bb4496
Raise readable error message when trying to encrypt for key without acceptable self-sigs 2022-03-07 14:55:45 +01:00
Paul Schaub 9d160ef047
Reject subkeys with predating binding signatures 2022-03-07 12:17:45 +01:00
Paul Schaub 5d3646cd36
Add missing @throws documentation 2022-03-07 11:27:21 +01:00
Paul Schaub 10e72f6773
Allow custom key creation dates during generation 2022-03-07 11:08:59 +01:00
Paul Schaub a6dcf027c0
Add and document PGPainless.inspectKeyRing(key, date) 2022-03-07 10:36:20 +01:00
Paul Schaub a7d1f09b5c
Document SimpleDateFormat not thread-safe 2022-03-07 10:26:24 +01:00
Paul Schaub 126cc9df70
Make toSecondsPrecision() more readable and improv performance 2022-03-07 10:24:08 +01:00
Paul Schaub 5b9e72d42c
Add KeyRingInfo.isUsableForEncryption() 2022-03-06 14:58:36 +01:00
Paul Schaub 1949cc5eea
Fix generics of CertificationSubpackets callback 2022-03-02 11:15:07 +01:00
Paul Schaub 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 a1deb531a4 trim comment lines. 2022-02-24 17:46:45 +01:00
feri 7a77d0847a Support multiline comments in ProducerOption.setComment(). 2022-02-24 17:46:45 +01:00
Paul Schaub fc33e56ad8
Some clarifications in javadoc 2022-02-24 01:08:23 +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
Paul Schaub 1753cef10e Simplify handling of cleartext-signed data 2022-02-23 18:45:29 +01:00
Paul Schaub db58280db6
Change default criticality of signature subpackets to mirror those of sequoia 2022-02-19 17:07:56 +01:00
Paul Schaub 41ed056165
By default emit IssuerFingerprint signature subpackets as non-critical 2022-02-19 16:05:02 +01:00
Paul Schaub a3f9311d9a
Add some comments to messy DecryptionStreamFactory code 2022-02-19 14:48:17 +01:00
Paul Schaub e8da3b30d8 Yet another patch for ASCII armor detection -.- 2022-02-15 14:23:03 +01:00
Paul Schaub f3cf3456ab ConsumerOptions.setIsCleartextSigned -> return this 2022-02-15 14:22:57 +01:00
Paul Schaub b33885c268 Remove accidental marking of buffered stream in PGPUtilWrapper 2022-02-15 14:22:49 +01:00
Paul Schaub 458b4f1f78 Fix detection of unarmored data in detached signature verification 2022-02-11 14:07:29 +01:00
Paul Schaub 9b270197c2 Add MIME StreamEncoding enum val 2022-01-15 02:46:42 +01:00
Paul Schaub bbc42fd8e4 Document workaround for BCs ECUtil.getCurveName() returning null for ed25519 keys
See https://github.com/bcgit/bc-java/issues/1087
2022-01-15 02:46:42 +01:00
Paul Schaub 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
Paul Schaub e374951ed0 Remove ProofUtil.
This does not belong here.
2022-01-15 02:46:41 +01:00
Paul Schaub 5e0ca369bf Document workaround for https://github.com/bcgit/bc-java/pull/1085 2022-01-15 02:46:41 +01:00
Paul Schaub fa0e208c98 Workaround for BC not correctly parsing RevocationKey packets 2022-01-15 02:46:41 +01:00
Paul Schaub 88e3c61b20 RevocationSignatureBuilder: Allow for generation of external revocation signatures 2022-01-15 02:46:41 +01:00
Paul Schaub 5884c4afcd ArmorUtils: Add method to print single public keys 2022-01-15 02:46:41 +01:00
Paul Schaub 1447dfc642 Add SignatureUtils.wasIssuedBy 2022-01-15 02:46:41 +01:00
Paul Schaub 99496f80f5 Hex decode data in OpenPgpV4Fingerprint constructor 2022-01-15 02:46:41 +01:00
Paul Schaub e7f583c1af Fix KeyRingInfo.get*Algorithm(keyId) 2022-01-15 02:45:21 +01:00
Paul Schaub b58bdf8ff1 Fix KeyAccessor.ViaKeyId sourcing primary user-id signature 2022-01-15 00:59:54 +01:00
Paul Schaub b1bde161b4
Fix typos and wording 2021-12-28 13:53:25 +01:00
Paul Schaub ce7b69269b
Various code cleanup 2021-12-28 13:32:50 +01:00
Paul Schaub 59f1a85887
Fix more code issues 2021-12-28 12:30:52 +01:00
Paul Schaub e96d668ee2 Clean up code 2021-12-28 12:18:51 +01:00
Paul Schaub 6eac50c5b5 Add documentation to SessionKey 2021-12-28 01:42:12 +01:00
Paul Schaub f3b7286eaf Introduce and use DateUtil.toSecondsPrecision 2021-12-28 01:42:12 +01:00
Paul Schaub 2f44621657 Add documentation to CollectionUtils methods 2021-12-28 01:42:12 +01:00
Paul Schaub 376e234baf
Add documentation to SecretKeyRingEditor 2021-12-28 01:23:47 +01:00
Paul Schaub a0e9c1f555
Add SelectUserId.byEmail() 2021-12-27 13:36:13 +01:00
Paul Schaub 245376d7d0
Remove KeyRingUtils.deleteUserId() in favor of revoking SecretKeyRingEditor.removeUserId() methods 2021-12-27 13:35:58 +01:00
Paul Schaub 31b7d18183
Properly resolve earliest expiration date when primary user-id + direct-key sig have expiraiton
Rename getPossiblyExpiredPrimaryUserId() method
2021-12-23 17:10:44 +01:00
Paul Schaub 6c9c683c85
Rename method to getValidAndExpiredUserIds() 2021-12-22 12:42:31 +01:00
Paul Schaub 56e60e88f4
When no user-id is marked as primary: return first user-id 2021-12-22 12:40:40 +01:00
Paul Schaub 3aa9e2915a
Re-certify expired user-ids when changing key expiration date 2021-12-20 13:28:16 +01:00
Paul Schaub 710f961984 Rework key modification API.
Fixes #225
2021-12-20 13:01:58 +01:00
Paul Schaub a66b45c3d2
Further sourcing of PGPObjectFactory from ImplementationProvider 2021-12-14 15:03:45 +01:00
Paul Schaub 60f7a9d9ec
Source PGPObjectFactory from ImplementationProvider 2021-12-14 14:43:16 +01:00
Paul Schaub 1681f3934f
Fix method name getCommentHeader 2021-12-14 14:42:53 +01:00
Paul Schaub bff2b3fbfe
Clarify nesting depth exceeded error message 2021-12-14 13:14:56 +01:00
Paul Schaub c4e3e27821
Fix replacePassphrase(secretKeys, passphrase) 2021-12-13 13:28:34 +01:00
Paul Schaub 5108b81252
Add test to ensure PGPainless will refuse to decrypt message with incapable key 2021-12-13 12:43:08 +01:00
Paul Schaub 80e12db8b6
Prevent message decryption using non-encryption key 2021-12-13 12:27:32 +01:00
Paul Schaub e59a8884c1 SigningOptions: Replace arguments PGPSecretKeyRingCollection with Iterable<PGPSecretKeyRing> 2021-12-13 01:14:55 +01:00
Paul Schaub ba9de4b44a EncryptionOptions: replace arguments of type PGPPublicKeyRingCollection with Iterable<PGPPublicKeyRing> 2021-12-13 01:14:24 +01:00
Paul Schaub 710f676dc3 Rename MAX_RECURSION_DEPTH constant to avoid confusion 2021-12-13 01:03:20 +01:00
Paul Schaub 35462ab539
Add tests for PublicKeyParameterValidation 2021-12-09 13:25:23 +01:00
Paul Schaub 296f811b7f Merge branch 'KO' 2021-12-07 19:08:03 +01:00
Paul Schaub b3ec3333ce
CachingSecretKeyRingProtector: Prevent accidental passphrase override via addPassphrase() 2021-12-07 14:42:03 +01:00
Paul Schaub 82cbe467f2
Introduce iteration limit to prevent resource exhaustion when reading keys 2021-12-06 17:11:42 +01:00
Paul Schaub c4618617f6
Introduce iteration limit to prevent resource exhaustion when reading signatures 2021-12-06 17:11:23 +01:00
Paul Schaub af1d4f3e5b
Add ElGamal validation ported from openpgpjs 2021-12-06 16:43:27 +01:00
Paul Schaub 073cf870d2
Fix NPE when attempting to decrypt GNU_DUMMY_S2K keys 2021-12-06 15:07:34 +01:00
Paul Schaub d54a40196b
Fix NPE when attempting to decrypt GNU_DUMMY_S2K keys 2021-12-06 15:01:37 +01:00
Paul Schaub fae5cd0efe
SOP: Fix signing using key with missing signing key 2021-12-02 15:10:53 +01:00
Paul Schaub e7d0cf9c00
Fix BaseSecretKeyRingProtector misinterpreting empty passphrases 2021-12-02 14:44:03 +01:00
Paul Schaub 8b1bdb98f1
Adding subkeys, generating keys: Verify subkeys comply to public key algorithm policy 2021-12-02 14:18:21 +01:00
Paul Schaub f5c3e7b23f
Remove Blowfish from default symmetric decryption/encryption algorithm policies 2021-12-02 13:09:35 +01:00
Paul Schaub cd9e7611ac Remove workaround for invalid signature processing 2021-12-02 12:42:02 +01:00
Paul Schaub c55fd2e552 Implement decryption with - and access of session keys 2021-12-02 12:42:02 +01:00
Paul Schaub 03f13ee4a7 Add StreamGeneratorWrapper which uses new PGPCanonicalizedDataGenerator if required 2021-12-02 12:40:20 +01:00
Paul Schaub 176ad09d19
Make Passphrase comparison constant time 2021-11-29 21:55:35 +01:00
Paul Schaub aef9ebfd7b Incorporate feedback 2021-11-28 14:56:24 +01:00
Paul Schaub 635de19fb8
Add tests for KeyRingUtils.injectCertification and render keysPlusPublicKey unusable 2021-11-28 14:15:01 +01:00
Paul Schaub 03912f9dc1
Fix typos 2021-11-28 13:22:08 +01:00
Paul Schaub e133434888
Remove unused methods from SignatureSubpacketGeneratorUtil 2021-11-28 13:09:21 +01:00
Paul Schaub b874aee6bb
Move getKeyLifetimeInSeconds to SignatureSubpacketsUtil and make public 2021-11-28 13:09:10 +01:00
Paul Schaub b09858e186
Add basic test for DirectKeySignatureBuilder 2021-11-27 17:14:45 +01:00
Paul Schaub 06a4b4cf5e Add basic test for SubkeyBindingSignatureBuilder 2021-11-27 16:14:28 +01:00
Paul Schaub c7dc7f755c KeyAccessor.ViaKeyId: Differentiate between primary key (direct-key sig) and subkey 2021-11-27 16:14:28 +01:00
Paul Schaub c229562573
Rename CertificationSignatureBuilder to ThirdPartyCertificationSignatureBuilder
Also add javadoc
2021-11-27 15:22:33 +01:00
Paul Schaub 936ea55cee Add explanation of revocation reason hard-ness to RevocationAttributes 2021-11-27 15:11:44 +01:00
Paul Schaub c9c84a2dc5 Add revocation certificate test 2021-11-27 15:11:44 +01:00
Paul Schaub 151d3c7b96 SecretKeyRingEditor: Restructure arguments of modification methods 2021-11-27 15:00:19 +01:00
Paul Schaub 5376a289b3 Add documentation to revocation attributes class 2021-11-27 15:00:04 +01:00
Paul Schaub 5364e21b5e
WiP implementation of public key parameter validation 2021-11-24 18:46:29 +01:00
Paul Schaub 3b49840c9c
Reuse GNUObjectIdentifiers.Ed25519 2021-11-24 18:32:50 +01:00
Paul Schaub cc16a3da88
Add overloaded method for user-id revocation using SelectUserId 2021-11-24 15:07:54 +01:00
Paul Schaub 16e283f3a6
Fix unvalid cursor mark for large cleartext signed messages
Fixes #219, #220
2021-11-24 14:51:16 +01:00
Paul Schaub 50f565dd8c
Add methods to sign messages with custom subpackets 2021-11-22 19:20:04 +01:00
Paul Schaub 4b2089b42b Fix key ring builder adding additional user-ids as primary 2021-11-21 23:07:00 +01:00
Paul Schaub 9e715aabfe
Test signature subpackets and fix bug for missing user-id sig 2021-11-21 22:25:45 +01:00
Paul Schaub 6a137698c4
Wip: Add test for signature structure, set fingerprint on primary user-id self sig 2021-11-20 21:12:12 +01:00
Paul Schaub 76e19359b4
Replace subpacket generator in key spec classes 2021-11-20 20:27:36 +01:00
Paul Schaub 91080f411d
Rework secret key protection 2021-11-20 20:19:22 +01:00
Paul Schaub 176574df50
Wip 2021-11-20 16:07:27 +01:00
Paul Schaub 25c95804ce
Rework user-id revocation to use subpackets callback API 2021-11-16 15:35:17 +01:00
Paul Schaub 24aebfaf63
Rework subkey-revocation using new signature subpackets api 2021-11-16 15:18:51 +01:00
Paul Schaub ab3ae15719 Ensure keyflags are set when adding userid 2021-11-16 13:45:35 +01:00
Paul Schaub a6181218a2 Convert KeyRingBuilder fields to local variables 2021-11-16 13:45:35 +01:00
Paul Schaub 3d5a005ec7 Make SignatureSubpackets more procedural 2021-11-16 13:45:35 +01:00
Paul Schaub 3f09fa0cc7 Progress 2021-11-16 13:45:34 +01:00
Paul Schaub 04ada88188 Fix errors 2021-11-16 13:44:10 +01:00
Paul Schaub c31fda95f9 Start reusing new signature builder in SecretKeyRingEditor 2021-11-16 13:40:33 +01:00
Paul Schaub 44169ecf64 More progress! 2021-11-16 13:40:33 +01:00
Paul Schaub 8c49d37e1f Change return values of signature subpackets subclasses 2021-11-16 13:40:33 +01:00
Paul Schaub ed96bcd109 Checkstyle fix 2021-11-16 13:40:33 +01:00
Paul Schaub eb9ea23514 Add UniversalSignatureBuilder 2021-11-16 13:40:33 +01:00
Paul Schaub 8212fe1cc7 Create applyCallback util methods 2021-11-16 13:40:33 +01:00
Paul Schaub 352f099d8a Refactoring: Move signature verification stuff to consumer subpacket 2021-11-16 13:40:33 +01:00
Paul Schaub 3438b7259a Restructured API 2021-11-16 13:40:33 +01:00
Paul Schaub b8a376f86a Create signature creator methods and fix compilation issues 2021-11-16 13:40:33 +01:00
Paul Schaub de926e022f More signature builder experimentations 2021-11-16 13:40:33 +01:00
Paul Schaub e9dc26b1da Started working on proofs 2021-11-16 13:40:33 +01:00
Paul Schaub 8b5ffedd29 More checkstyle issues 2021-11-16 13:40:33 +01:00
Paul Schaub f0bc19b0da WIP: Work on SignatureBuilders 2021-11-16 13:40:33 +01:00
Paul Schaub 19b1a0238d
Fix API for accessing preferred algorithms 2021-11-15 13:02:26 +01:00
Paul Schaub 021fd7846e
Rename user-id deletion methods 2021-11-13 16:05:55 +01:00
Paul Schaub d036cf2593 Add tests for KeyRingUtils.deleteUserIdFrom*KeyRing methods 2021-11-12 16:56:27 +01:00
Paul Schaub 0f77d81bd1 Add deprecated utility methods for deleting user-ids from keys/certificates 2021-11-12 16:56:27 +01:00
Paul Schaub e4d1aa7edf Remove support for deleting user-ids and subkeys. Use revoke* instead. 2021-11-12 16:56:27 +01:00
Paul Schaub 2ac10e7bc7
Rename method to set'Key'ExpirationDateInSubpacketGenerator() 2021-11-06 17:39:04 +01:00
Paul Schaub 03a350d279
Separate key generation from scratch and from templates in to buildKeyRing() and generateKeyRing() 2021-11-02 12:23:05 +01:00
Paul Schaub 59c9ec341e
Hide distinction between clearsigned and inline signed message verification 2021-11-02 12:12:29 +01:00
Paul Schaub bd67d9c0fa
Rename EncryptionPurpose.STORAGE_AND_COMMUNICATION -> ANY 2021-11-02 11:30:44 +01:00
Paul Schaub cf1881a140
Fix detection of non-armored data 2021-10-30 15:00:04 +02:00
Paul Schaub 3a9473ad6c
V5 Key-readyness: Replace usages of OpenPgpV4Fingerprint with abstract super class 2021-10-27 17:38:25 +02:00
Paul Schaub 383f51277e
Prepare for V5 keys: Extract abstract super class OpenPgpFingerprint from OpenPgpV4Fingerprint 2021-10-27 17:12:06 +02:00
Paul Schaub bc2afea7ed
Add toString() methods for SignatureVerification & failure 2021-10-27 17:11:40 +02:00
Paul Schaub aed06fc832
Add MessageInspector.determineEncryptionInfo(String) 2021-10-27 15:54:34 +02:00
Paul Schaub 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
Paul Schaub 3fd929916d
EncryptionOptions: Change return val of overrideEncryptionAlgorithm to EncryptionOptions 2021-10-26 23:06:41 +02:00
Paul Schaub 963a8170da
Fix decryption of signed messages created with PGPainless < 0.2.10 2021-10-23 16:44:40 +02:00
Paul Schaub 2b2639bde7
Fix checkstyle issues 2021-10-20 21:37:48 +02:00
Paul Schaub a8998f27ad
Introduce HashAlgorithmNegotiator 2021-10-20 21:26:47 +02:00
Paul Schaub f05be3dc30
Fix prematurely throwing of MissingPassphraseException 2021-10-19 18:13:23 +02:00
Paul Schaub dc0b96278e
Add javadoc 2021-10-18 16:19:12 +02:00
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 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 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 bccf384dbf
Add feature-related utilities and tests 2021-10-04 13:32:04 +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 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 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 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 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 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 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 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