1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-19 10:52:05 +01:00
Commit graph

453 commits

Author SHA1 Message Date
a9a61bc799
Improve library usage of slf4j and logback.
Logback-classic is now a test dependency and is additionally declared as OPTIONAL runtime dependency.
Applications that don't want to use logback can now easily disable it by not explicitly depending on it.
2021-10-29 20:28:14 +02:00
2d364d0939
Replace OpenPgpV4Fingerprint with OpenPgpFingerprint in examples 2021-10-29 20:08:11 +02:00
3a9473ad6c
V5 Key-readyness: Replace usages of OpenPgpV4Fingerprint with abstract super class 2021-10-27 17:38:25 +02:00
e8bf2ea9e7
Add tests for message inspection 2021-10-27 15:54:50 +02:00
abdc5c8fdd
Fix license of KleopatraCompatibilityTest 2021-10-27 14:29:05 +02:00
4857056986 Add failing Kleopatra interoperability test 2021-10-27 13:26:49 +02:00
963a8170da
Fix decryption of signed messages created with PGPainless < 0.2.10 2021-10-23 16:44:40 +02:00
f05be3dc30
Fix prematurely throwing of MissingPassphraseException 2021-10-19 18:13:23 +02:00
2ad917d27c
Add ConsumerOptions.setMissingKeyPassphraseStrategy()
This allows switching missing passphrase handling from interactive mode
(fire callbacks to prompt user for missing key passphrases) to non-interactive mode
(throw MissingPassphraseException with all keys with missing passphrase in it).

Fixes #193
2021-10-18 16:01:19 +02:00
bebb9709ac
Add tests for how unbound subkeys are handled in KeyRingInfo 2021-10-14 16:16:06 +02:00
b04ecc4eef
Further increase coverage of KeyRingInfo 2021-10-12 14:56:24 +02:00
ee1d38a38a
Increase test coverage for KeyRingInfo 2021-10-12 14:18:59 +02:00
33f516efe8
Fix detection of signed messages when verification keys are missing
Fixes #187, supersedes #189
2021-10-08 14:03:12 +02:00
e390389c0a Reuse compliance 2021-10-07 16:28:31 +02:00
18a6090f0e
Add tests for user-attribute validation 2021-10-04 15:53:58 +02:00
c0ae6d75ba
Add tests for UserAttribute certification/revocation 2021-10-04 14:47:16 +02:00
5d28823c80
Add more signing tests 2021-10-04 14:21:06 +02:00
96755a82a5
More SignatureSubpacketsUtilTest methods 2021-10-04 14:00:23 +02:00
bccf384dbf
Add feature-related utilities and tests 2021-10-04 13:32:04 +02:00
7113dd1d7e
Add test for SignatureUtils 2021-10-03 14:32:32 +02:00
7bc35dcba3
Add regression test for PGPUtil.getDecoderStream mistaking plaintext for base64 encoded data 2021-10-01 15:21:42 +02:00
f7a7035059
Workaround for PGPUtil accidentally mistaking plain data for base64 encoded data. 2021-10-01 15:04:37 +02:00
5869996059
Add isSignedOnly() to MessageInspector
This method can be used to determine, whether the message was created using gpg --sign --armor.
It will return false if the message is signed and encrypted, since we cannot determine signed status while the message is encrypted.
Fixes #188
2021-10-01 14:12:10 +02:00
8ec8a55f10
Add ConsumerOptions.setIgnoreMDCErrors()
This method can be used to make PGPainless ignore certain MDC related errors or mishabits.
Use of this options is discouraged, but may come in handy in some situations.

Fixes #190
2021-10-01 13:54:51 +02:00
526dc0caac
Add support for creating cleartext signed messages and add tests 2021-09-27 17:10:00 +02:00
ece5897bae
CleartextSignedMessage processing: Reuse normal processing API 2021-09-27 11:47:54 +02:00
f15f3a4e2a
Fix example use of ascii armoring 2021-09-23 18:06:54 +02:00
1aa6541766 Merge branch 'key_generator_rework' 2021-09-20 14:50:02 +02:00
be47a96030
Further simplify the KeyRingBuilder API 2021-09-20 12:30:03 +02:00
ce645fc429
Postpone decryption of PKESK if secret key passphrase is missing and try next PKESK first before passphrase retrieval using callback
Fixes #186
2021-09-15 16:33:03 +02:00
81379a5176
Add MessageInspector utility class which can be used to determine encryption keys for a message 2021-09-14 21:49:02 +02:00
fedf7c0cf8 Make AlgorithmSuite members final and remove setters 2021-09-13 19:46:18 +02:00
21f424551b Simplify KeySpecBuilder 2021-09-13 19:46:18 +02:00
f28232893c
Refactoring: Move cleartext signed message processing to decryption_verification 2021-09-13 18:09:53 +02:00
194e4d7631
Automatically 'repair' keys with S2K usage CHECKSUM to use SHA1 when changing passphrases 2021-09-10 20:14:12 +02:00
7e71af973b
Add JUnit tests for modification of keys with different sig classes 2021-09-10 19:57:05 +02:00
c851457ef8
Add S2KUsageFix class and tests to switch secret keys encrypted with USAGE_CHECKSUM over to USAGE_SHA1 2021-09-09 20:31:02 +02:00
c942238b40
Add tests for CachingSecretKeyRingProtector 2021-09-07 18:19:34 +02:00
3994f87c78 Cleartext Signature Framework: Return OpenPgpMetadata 2021-09-07 14:02:07 +02:00
90a00e0541 Move signature verification to dedicated streams 2021-09-07 14:02:07 +02:00
90e0f74aea
Stabilize expiration dates in revocation tests 2021-09-06 15:23:10 +02:00
e5ae09b79c
Change default compression algorithm from UNCOMPRESSED to ZIP 2021-09-06 15:13:41 +02:00
97c8ff8312
Throw WrongConsumingMethodException when processing Cleartext Signed Messages with Inband Signature verification API and vice versa 2021-08-29 13:35:27 +02:00
2885ff7a14
Cleartext signature framework: Reuse ConsumerOptions 2021-08-28 11:39:50 +02:00
e19acb667c
Add SignatureUtils.readSignatures(byte[]) 2021-08-26 19:35:25 +02:00
ac469ff5d7
Make non-test method a main method 2021-08-26 15:07:48 +02:00
4d6ca80e25 Debug signature verification using debug build of bcpg 2021-08-26 15:03:20 +02:00
3573115a60 Add investigation test for cleartext signature verification 2021-08-23 14:27:03 +02:00
829068d5a8 Switch from JUL logging to SLF4J 2021-08-23 14:20:25 +02:00
ae1539fa24
Add test to check, how messages with multiple SEIP packets are handled 2021-08-23 00:48:38 +02:00
3abb796220
Separate Signature verification methods out of SignatureValidator into SignatureVerifier 2021-08-18 14:28:36 +02:00
8c3b694a71
Refactoring 2021-08-18 13:19:43 +02:00
5a9b8a2c50
Verify notBefore and notAfter on any message signatures 2021-08-18 12:55:24 +02:00
2bd71617bd PGPException is not thrown during secret key reading 2021-08-15 15:46:41 +02:00
1ce6632f18 Rename KeyValidationException -> KeyValidationError 2021-08-15 15:46:41 +02:00
fd867bbfbe
Allow customization of ASCII armor comment and version headers 2021-08-14 13:56:16 +02:00
8256cd3a5b
Test some methods of KeyRingInfo 2021-08-08 18:26:38 +02:00
08a5ce73dc
Test SignatureValidator.verifyWasPossiblyMadeByKey() 2021-08-08 17:55:57 +02:00
aa0aaf134d
Bundle ASCII-Armor CRC related tests 2021-08-08 17:39:36 +02:00
cae099eabe
Properly evaluate key expiration dates 2021-08-08 16:58:32 +02:00
a0be510fc2
Update test key to have no key-expiration date 2021-08-08 16:57:37 +02:00
944d79b009
Rearrange armored input stream workaround code 2021-08-08 15:58:12 +02:00
1983cfb4ac
ArmoredInputStreams: Properly catch ignorable IOExceptions caused by missing CRC sums 2021-08-08 15:35:05 +02:00
245e4a380d
Add JUnit test to ensure proper bracketing and nested-ness of multiple OnePassSignatures 2021-08-05 13:12:12 +02:00
9a485a3354
Encrypt to all capable subkeys by default 2021-08-04 16:38:17 +02:00
2d76cb5c82
Fix partial length encoding of some messages
Fixes #160

I'm not yet sure, why this issue only happened with some keys and not others,
but this fix works for now.
2021-08-04 16:02:35 +02:00
e4fdc3bc1e
SubkeyIdentifier: Throw NoSuchElementException for non-existent subkey 2021-08-01 17:23:17 +02:00
1327e08ac3
Add tests for SubkeyIdentifier 2021-08-01 17:19:04 +02:00
b674a412b5
Reformat issuer-fingerprint inclusion code 2021-08-01 16:03:30 +02:00
bd04e35a53
Commit investigation code for #160 (Thunderbird interop issues) 2021-08-01 15:54:19 +02:00
fb16db5db4
Improve handling of signatures with missing issuerKeyId packets 2021-07-31 22:24:39 +02:00
311c842196
Revert introduction of StreamUtil 2021-07-31 20:40:31 +02:00
107e53c03e
Fully drain ArmoredInputStreams to verify CRC checksum.
Fixes #159 (for real this time)
2021-07-27 15:09:59 +02:00
fc311fe781
Workaround for #159: Avoid to prevent swallowing IOExceptions 2021-07-26 16:19:30 +02:00
726d22b8d6 Change passphrase: Skip GNU_DUMMY_S2K keys 2021-07-19 15:05:03 +02:00
8cf5347b52 Base PGPainlessCLI on new sop-java module
* Rename pgpainless-sop -> pgpainless-cli
* Introduce sop-java (implementation-independent SOP API)
* Introduce sop-java-picocli (CLI frontend for sop-java)
* Introduce pgpainless-sop (implementation of sop-java using PGPainless)
* Rework pgpainless-cli (plugs pgpainless-sop into sop-java-picocli)
2021-07-15 17:03:56 +02:00
2ba782c451
Move file-related encryption-info into ProducerOptions 2021-07-10 12:22:47 +02:00
447c08b446 Add tests for ignoring marker packets when reading keys 2021-07-10 11:48:56 +02:00
0330d3cfa3 Add getMarkerPacket() test method 2021-07-10 11:48:46 +02:00
6a90c4303e
OpenPgpMetadat: identify verified sigs by SubkeyIdentifier 2021-07-04 13:08:24 +02:00
48314fde40
Assign sensible names to test() methods 2021-07-03 13:23:11 +02:00
70666d276b
Rework MultiMapTest 2021-07-03 13:20:25 +02:00
43a21de53a
Delete useless GenerateKeyTest 2021-07-03 12:59:33 +02:00
0321a6170c
Execute signature related tests on all implementations 2021-07-03 12:56:42 +02:00
a5dba7a368
Enable MultiPassphraseSymEncTest 2021-07-03 12:56:30 +02:00
7c612dd2ef
Parametrize BindingSignatureSubpacketsTest to run on all implementations 2021-07-03 12:50:44 +02:00
84ff6ce015
Improve tests 2021-07-03 12:42:17 +02:00
63c75f1f86
Rename TestUtil -> TestImplementationFactoryProvider 2021-07-03 12:42:12 +02:00
9ac4b30ec7
Delete unused NonEmptyList class 2021-07-03 12:24:08 +02:00
863d443052
Request deletion of temp test files upon exit 2021-07-03 12:23:40 +02:00
c8a281d6a4
Move UTC timestamp methods to DateUtil class 2021-07-03 12:23:24 +02:00
9b046a0cf1
Change SymmetricEncryptionAlgorithmNegotiator to return the 'best' avail. alg 2021-07-01 21:33:38 +02:00
30740aba4f
Add SymAlgoNegotiatorTest 2021-07-01 19:24:17 +02:00
3cb014e3f6
Add TestUtils.now() to have stable 'rounded' UTC dates in tests 2021-07-01 19:12:23 +02:00
9f76d16a34
Execute more tests on both implementation providers 2021-07-01 19:11:55 +02:00
c234e38ae2
Add key extraction and ascii armor examples 2021-07-01 17:37:30 +02:00
b6eed91f47
Remove deprecated encryption API 2021-06-29 16:43:37 +02:00
42aed70719
Add SignatureTypeTest 2021-06-29 15:10:22 +02:00
fee3041bcb
Add test for SignatureSubpacket.fromCodes() 2021-06-29 15:03:37 +02:00
4947f17842
JUnit test the AlgorithmSuite class 2021-06-29 14:58:50 +02:00
9637ef5d35
Increase test coverage 2021-06-29 14:42:22 +02:00
dff47d17d1
Remove more unused methods and fix method name 2021-06-28 21:14:40 +02:00
60cbcac58b
Fix test and use new decryption API 2021-06-26 18:41:02 +02:00
715ae707ed Merge branch 'decryptionAPI2' 2021-06-26 18:36:04 +02:00
fc14a86d9c Add user-id revocation example 2021-06-26 18:33:41 +02:00
f6ffc4c28d Add examples for encryption and decryption of messages 2021-06-26 18:33:41 +02:00
9b34664ba2 Add example for unlocking secret keys 2021-06-26 18:33:41 +02:00
8d05eea92d Add documentation to ManagePolicy 2021-06-26 18:33:41 +02:00
ac8fb5ad6b Add ManagePolicy example 2021-06-26 18:33:41 +02:00
4a0ef1ac6b Add ConvertKeys example 2021-06-26 18:33:41 +02:00
3de076eb31 Add modify keys tests 2021-06-26 18:33:41 +02:00
5c2910f6c1 Wip 2021-06-26 18:33:41 +02:00
0958915b4c Add examples for key generation and parsing 2021-06-26 18:33:41 +02:00
dae5288456
Add KeyRingInfo.getVersion() 2021-06-26 16:30:54 +02:00
8a4908d29d TestUtils: Set UTC timezone and add formatUTCDate() 2021-06-24 15:10:13 +02:00
548bfff93f
Fix: Respect user requested keyflags when adding a subkey. 2021-06-24 14:11:18 +02:00
259f629b3c
Further deletion of unused selection classes 2021-06-23 19:39:10 +02:00
3c37072774
Remove unused Selection classes 2021-06-23 19:33:13 +02:00
e7f685e63b
Tests: Make use of KeyRingInfo to determine encryption subkeys 2021-06-23 19:20:47 +02:00
88891e1337
Remove usage of deprecated decryption/verification API in tests 2021-06-16 15:38:02 +02:00
70c4dcd1d2
Begin introducing new Decryption API 2021-06-15 17:08:40 +02:00
a65ea26181
Add tests for PublicKeyAlgorithmPolicy 2021-06-11 16:47:22 +02:00
5bb4fd3687
Add PublicKeyAlgorithmPolicy to reject weak public keys
BCs PGPPublicKey.getBitStrenght() appears to fail to recognize some elliptic curves.
In such cases, bitStrength is reported as -1.
I added BCUtil.getBitStrength(publicKey) to manually determine the bit strenght by OID.
See https://github.com/bcgit/bc-java/issues/972 for an upstream bug report.
2021-06-11 16:20:29 +02:00
6b99f0aadc
Add tests for PGPKeyRingCollection 2021-06-10 16:21:04 +02:00
ed8584df95
Add policy tests 2021-06-10 15:41:44 +02:00
7696f120e6
Even more EncryptionOptions tests 2021-06-10 15:18:31 +02:00
762d9d4803
More EncryptionOptions tests 2021-06-10 15:04:21 +02:00
512825aad4
Add test for EncryptionOptions 2021-06-10 14:25:00 +02:00
a2d0a75d42
Add SignatureStructureTest to test various signature field accessors 2021-06-10 13:37:10 +02:00
9b9064beae
Small code style fixes and optimizations 2021-06-10 12:42:48 +02:00
845779d40b
Avoid deprecated methods 2021-06-10 12:42:03 +02:00
27370fa925
Bump Bouncycastle to 1.69 2021-06-10 12:41:12 +02:00
1ad23366a7
Implement KeyRingInfo.getKeysWithFlag() and KeyRingInfo.getExpirationDateForUse() 2021-05-31 15:13:28 +02:00
8618d1faea
More tests 2021-05-31 13:59:56 +02:00
b07cb2467b
Alter tests to cover untested KeyRingBuilderInterface methods 2021-05-30 18:05:38 +02:00
8e02df9a3e
Test FileBasedMultiPassStrategy 2021-05-29 14:13:08 +02:00
82536eaa77
Improve support for PGP[Secret|Public]KeyRingCollections 2021-05-29 13:52:29 +02:00
1a5baa0fa4
Clean up BCUtils class 2021-05-29 12:43:31 +02:00
13c7572c8c
Restore functionality of MissingPublicKeyCallback + JUnit test it 2021-05-29 12:19:12 +02:00
7bbc23d826
Test MissingDecryptionMethodException 2021-05-28 23:29:41 +02:00
fd0734b247
Remove legacy symmetric encryption code 2021-05-28 23:22:11 +02:00
77800f26e8
SecretKeyRingEditor: UserIDs only reside on primary keys 2021-05-28 23:14:20 +02:00
57c11a63e5
Remove unused throws declarations 2021-05-28 22:39:27 +02:00
c255439ee2
Cleanse duplicated code 2021-05-28 22:37:16 +02:00
a23f2c4401
Delete SelectSignatureFromKey class 2021-05-28 22:21:03 +02:00
826c761e69
Test invalid keys cannot sign behavior 2021-05-28 21:41:02 +02:00
9883d1537b
Move EncryptionPurpose to own class 2021-05-27 15:52:43 +02:00
4e63313c91 Do some first prototype algorithm negotiation 2021-05-25 14:24:38 +02:00
909f0e7be3 Work on KeyRingInfo 2021-05-25 14:24:26 +02:00
6cb9091b2a Work on signaturePicker 2021-05-25 14:24:16 +02:00
a30767eb91 Fix tests 2021-05-25 14:24:10 +02:00
d70ee86468 Prevent plaintext encryption 2021-05-25 14:23:58 +02:00
89a0adddd8 Reworking encryption/decryption API. 2021-05-25 14:23:42 +02:00
7e2c89b1b3 Trim passphrases 2021-05-20 12:41:51 +02:00
a72cff28d8
Improve user-id revocation tests 2021-05-17 18:28:37 +02:00
197cfab0d6
Respect symmetric algorithm policy during decryption and throw UnacceptableAlgorithmException if policy is violated 2021-05-17 13:47:46 +02:00
225bc78ee1
Implement signature verification of cleartext-signatures 2021-05-15 18:44:03 +02:00
14ff0e9cc5
ArmorUtils: Add support for messageIds 2021-05-15 16:24:01 +02:00
b05f6887bd Better support for Armor headers 2021-05-15 15:57:42 +02:00
9358e58fb3
Improve CachingSecretKeyRingProtector 2021-05-14 18:55:26 +02:00
95121e2a55
Get rid of redundant SecretKeyRingProtector implementations. 2021-05-14 18:37:47 +02:00
8313895f26
Remove redundant exceptions 2021-05-14 13:20:16 +02:00
5a56949dd7
Throw WrongPassphraseException when wrong passphrase is provided to unlock secret key 2021-05-14 13:18:34 +02:00
ec611d7c5f
OpenPgpV4Fingerprint: Support pretty print format 2021-05-08 14:01:42 +02:00
431a65517e
Add documentation to signature related classes 2021-05-03 13:37:47 +02:00
ec85f53bb6
Incorporate feedback from @IvanPizhenko. Thanks! 2021-04-30 10:23:12 +02:00
64cc9ecca4 Proper Signature Verification 2021-04-30 09:49:19 +02:00
6ee8a9416f
Prevent decryption of messages using SED instead of SEIP packets and create dedicated exceptions for MDC related errors 2021-04-27 12:27:25 +02:00
Ivan Pizhenko
eb47e5caa3
issue #107 Add method KeyRingInfo.isFullyEncrypted() (#110)
Add method KeyRingInfo.isFullyEncrypted()

Fixes #107 

Co-authored-by: Ivan Pizhenko <IvanPizhenko@users.noreply.github.com>
2021-04-27 11:06:04 +02:00
2c4a3fca6a
Introduce OpenPgpMetadata.FileInfo class for setting/getting file name, mod date, encoding... 2021-04-25 00:28:48 +02:00
39e87f9ce4
Fix checkstyle issues 2021-04-10 13:09:32 +02:00
DenBond7
43647f3145 Added PGPKeyRingCollection. Added tests to KeyRingReaderTest to cover parsing of private/pub keys combinations. 2021-04-10 13:08:04 +02:00
DenBond7
8e569e7931 Added tests to KeyRingReaderTest to cover different cases of the source. 2021-04-10 13:08:04 +02:00
d0a162ce74 Merge branch 'parse_public_key_ring_collection_from_armored_source' 2021-03-23 01:06:37 +01:00
46140e6561
Fix checkstyle issues in tests and make small adjustments 2021-03-23 01:06:15 +01:00
883c819536
GenerateKeyTest: Print public key instead of secret key 2021-03-18 21:33:39 +01:00
8c97b6ead1
In PasswordBasedSecretKeyRingProtector.forKey(ring, passphrase): Return passphrase also for subkeys
Fixes #97, thanks @DenBond7
2021-03-18 21:28:08 +01:00
DenBond7
fb82f711d8
Updated KeyRingReaderTest. Added publicKeyRingCollectionFromNotArmoredStream() 2021-03-17 14:55:05 +02:00
DenBond7
f34c787a4d
Added working tests(string, bytes) to EncryptDecryptTest 2021-03-17 13:49:31 +02:00
DenBond7
447593a65d
Added tests for PGPainless.readKeyRing().publicKeyRingCollection()(different resources) 2021-03-17 12:51:02 +02:00
c5fbdbbc9b
Disable MultiPassphraseEncryptionTest until https://github.com/pgpainless/pgpainless/issues/72 is fixed 2021-02-27 15:22:29 +01:00
bfab4b60f0
Introduce parametrized tests to also test the JceImplementationFactory 2021-02-25 23:27:08 +01:00
9587d52f29
Add test for Feature class 2021-02-25 20:02:42 +01:00
577ee143b5
Add NotationRegistryTest 2021-02-25 19:57:18 +01:00
Ivan Pizhenko
e5aaebe174 issue #91 Improve class UserId 2021-02-21 15:11:09 +02:00
3e75d325a8 Stabilize test
The test was sometimes failing, as generating RSA keys can take longer than 1 second, which would result in the delta in the check being exceeded
2021-02-20 01:08:51 +01:00
81393a7285
Abort decryption process at a depth of 16 nested packets 2021-02-19 21:37:54 +01:00
c75a192513
Use ArmoredOutputStreamFactory to hide version string in ascii armor
Partially fixes #82
2021-02-19 19:50:36 +01:00
ea89289852
Check MDC when stream is closed 2021-02-17 21:04:05 +01:00
d2a581de9b
Fix decryption of messages with Wildcard recipient
Fixes #76
2021-02-17 20:20:10 +01:00
f2f7305fec
Allow for setting of expiration date during key generation 2021-02-13 12:22:28 +01:00
83117c99cb
Add two more tests 2021-02-12 01:23:32 +01:00
651bb63175
Deprecate withMasterKey(spec) in favor of withPrimaryKey(spec) 2021-02-11 17:18:59 +01:00
79b2d42f9c
Add support for more elliptic curves and start implementing KeyInfo class 2021-02-11 16:58:00 +01:00
ebf46fa05e
Add tests for SelectUserId 2021-02-07 03:12:59 +01:00
Ivan Pizhenko
72e0dea20f remove unused imports 2021-02-04 09:56:08 +02:00
Ivan Pizhenko
a807ddbb4e use PGPainless.readKeyRing().secretKeyRing() 2021-02-04 09:45:08 +02:00
Ivan Pizhenko
c9982ccfe6 Additional user id manipulation test 2021-02-03 23:09:02 +02:00
eaee5a27fc
Move selection strategies to util package and implement UserIdSelectionStrategy 2021-02-03 16:05:21 +01:00
d7ef05775d
Add getPrimaryUserId() 2021-01-29 15:08:11 +01:00