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
87e6b044d9
Add EncryptionStream class description
2022-03-30 12:18:03 +02:00
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
1cb3e559b5
Eliminate removed 'm' StreamEncoding
2022-03-27 17:29:42 +02:00
82936c5499
Add investigative test for broken messages when using different data/sig encodings
2022-03-27 17:01:31 +02:00
80d97b1bc0
Fix malformed signature packets
2022-03-27 17:01:31 +02:00
8ff405d6ad
Add toString() to SessionKey
2022-03-24 14:16:13 +01:00
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
e8b03834cb
Annotate fromId(code) methods with Nullable and add Nonnull requireFromId(code) methods
2022-03-22 15:09:09 +01:00
16b0d0730e
Annotate and document ArmorUtils class
2022-03-22 14:17:35 +01:00
e89e0f216c
Annotate KeyRingUtils methods with Nullable and Nonnull
2022-03-22 13:20:36 +01:00
4bae2e74c4
Add documentation for further KeyRingUtils methods
2022-03-22 13:05:27 +01:00
b5ccb23a62
Add documentation for KeyRingUtils.removeSecretKey()
2022-03-22 12:49:30 +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
29dc20d0bc
Add EncryptionResult.isEncryptedFor(certificate)
2022-03-15 17:02:02 +01:00
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
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
661c043cdc
DFix KeyRingInfo.getValidAndExpiredUserIds considering unbound user-ids as valid
2022-03-13 16:52:57 +01:00
26c804b2dd
Add comment about hash algorithm header
2022-03-13 15:12:38 +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
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
b34866b012
Make SigningOptions.getSigningMethods package visible
2022-03-09 21:03:31 +01:00
db02106518
Fix typo
2022-03-07 14:57:00 +01:00
3fe78ab12a
Fix NPE when validating broken signature
2022-03-07 14:56:56 +01:00
f1f7dec8b6
Fix accidental verification of thirdparty user-id revocations using primary key
2022-03-07 14:56:37 +01:00
fc65bb4496
Raise readable error message when trying to encrypt for key without acceptable self-sigs
2022-03-07 14:55:45 +01:00
9d160ef047
Reject subkeys with predating binding signatures
2022-03-07 12:17:45 +01:00
5d3646cd36
Add missing @throws documentation
2022-03-07 11:27:21 +01:00
10e72f6773
Allow custom key creation dates during generation
2022-03-07 11:08:59 +01:00
a6dcf027c0
Add and document PGPainless.inspectKeyRing(key, date)
2022-03-07 10:36:20 +01:00
a7d1f09b5c
Document SimpleDateFormat not thread-safe
2022-03-07 10:26:24 +01:00
126cc9df70
Make toSecondsPrecision() more readable and improv performance
2022-03-07 10:24:08 +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
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
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
1753cef10e
Simplify handling of cleartext-signed data
2022-02-23 18:45:29 +01:00
db58280db6
Change default criticality of signature subpackets to mirror those of sequoia
2022-02-19 17:07:56 +01:00
41ed056165
By default emit IssuerFingerprint signature subpackets as non-critical
2022-02-19 16:05:02 +01:00
a3f9311d9a
Add some comments to messy DecryptionStreamFactory code
2022-02-19 14:48:17 +01:00
e8da3b30d8
Yet another patch for ASCII armor detection -.-
2022-02-15 14:23:03 +01:00
f3cf3456ab
ConsumerOptions.setIsCleartextSigned -> return this
2022-02-15 14:22:57 +01:00
b33885c268
Remove accidental marking of buffered stream in PGPUtilWrapper
2022-02-15 14:22:49 +01:00
458b4f1f78
Fix detection of unarmored data in detached signature verification
2022-02-11 14:07:29 +01:00
9b270197c2
Add MIME StreamEncoding enum val
2022-01-15 02:46:42 +01:00
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
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
5e0ca369bf
Document workaround for https://github.com/bcgit/bc-java/pull/1085
2022-01-15 02:46:41 +01:00
fa0e208c98
Workaround for BC not correctly parsing RevocationKey packets
2022-01-15 02:46:41 +01:00
88e3c61b20
RevocationSignatureBuilder: Allow for generation of external revocation signatures
2022-01-15 02:46:41 +01:00
5884c4afcd
ArmorUtils: Add method to print single public keys
2022-01-15 02:46:41 +01:00
1447dfc642
Add SignatureUtils.wasIssuedBy
2022-01-15 02:46:41 +01:00
99496f80f5
Hex decode data in OpenPgpV4Fingerprint constructor
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
b58bdf8ff1
Fix KeyAccessor.ViaKeyId sourcing primary user-id signature
2022-01-15 00:59:54 +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
e96d668ee2
Clean up code
2021-12-28 12:18:51 +01:00
6eac50c5b5
Add documentation to SessionKey
2021-12-28 01:42:12 +01:00
f3b7286eaf
Introduce and use DateUtil.toSecondsPrecision
2021-12-28 01:42:12 +01:00
2f44621657
Add documentation to CollectionUtils methods
2021-12-28 01:42:12 +01:00
376e234baf
Add documentation to SecretKeyRingEditor
2021-12-28 01:23:47 +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
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
6c9c683c85
Rename method to getValidAndExpiredUserIds()
2021-12-22 12:42:31 +01:00
56e60e88f4
When no user-id is marked as primary: return first user-id
2021-12-22 12:40:40 +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
bff2b3fbfe
Clarify nesting depth exceeded error message
2021-12-14 13:14:56 +01:00
f8968fc075
Add test for CachingSecretKeyRingProtector.replacePassphrase(*)
2021-12-13 13:28:53 +01:00
c4e3e27821
Fix replacePassphrase(secretKeys, passphrase)
2021-12-13 13:28:34 +01:00
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
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
fae5cd0efe
SOP: Fix signing using key with missing signing key
2021-12-02 15:10:53 +01:00
8d6aca0d04
Test modifyKeyRing().addSubkey() respects pk algorithm policy
2021-12-02 14:45:54 +01:00
e7d0cf9c00
Fix BaseSecretKeyRingProtector misinterpreting empty passphrases
2021-12-02 14:44:03 +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
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
ddc071374c
Add invalid signature version processing regression test
2021-12-02 12:42:02 +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
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
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
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
c7dc7f755c
KeyAccessor.ViaKeyId: Differentiate between primary key (direct-key sig) and subkey
2021-11-27 16:14:28 +01:00
b44a97760a
Add test for ThirdPartyCertificationBuilder
2021-11-27 15:36:45 +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
5e85e975cd
Add RevocationAttributesTest
2021-11-27 15:00:12 +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
15d42c294e
Add tests for SignatureSubpacketGeneratorWrapper
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
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
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
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
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
e8bf2ea9e7
Add tests for message inspection
2021-10-27 15:54:50 +02:00
aed06fc832
Add MessageInspector.determineEncryptionInfo(String)
2021-10-27 15:54:34 +02:00
abdc5c8fdd
Fix license of KleopatraCompatibilityTest
2021-10-27 14:29:05 +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
4857056986
Add failing Kleopatra interoperability test
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
bebb9709ac
Add tests for how unbound subkeys are handled in KeyRingInfo
2021-10-14 16:16:06 +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