1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-23 12:52:07 +01:00
Commit graph

1346 commits

Author SHA1 Message Date
b95568f30a Rename IgnoreMarkerPacketsTest 2022-11-23 20:42:17 +01:00
8faec25ecf Enable previously disabled test for marker+seipd packet processing 2022-11-23 20:42:17 +01:00
fd2f6523ec More specific exception message for when nesting depth is exceeded 2022-11-23 20:42:17 +01:00
1437604836 Add documentation to DecryptionStream 2022-11-23 20:42:17 +01:00
70cca563d7 Add javadoc to getMetadata() and getResult() 2022-11-23 20:42:17 +01:00
33d9a784bb Add javadoc to MEssageMetadata class 2022-11-23 20:42:17 +01:00
3023d532e3 Make DecryptionStream.getMetadata() first-class, deprecate getResult() 2022-11-23 20:42:17 +01:00
e976cc6dd2 Move getResult() method around 2022-11-23 20:42:17 +01:00
03d04fb324 Tests: Replace usages of default algorithm policies with specific policies 2022-11-23 20:42:17 +01:00
d7e4fcaec6 OpenPgpMessageInputStream: Source verification certs from ConsumerOptions.getCertificateSource() 2022-11-23 20:42:17 +01:00
a792952845 Remove code to manually throw NSEE for missing certs
This is now done further down in the store itself
2022-11-23 20:42:17 +01:00
c19b8297a3 Add TODO for when bumping cert-d-java 2022-11-23 20:42:17 +01:00
4594b494a9 Implement signature verification with certificate stores as cert source 2022-11-23 20:42:17 +01:00
22abb62443 Add test for encryption to cert from certificate store 2022-11-23 20:42:17 +01:00
d0277fbbec Bump cert-d-java to 0.2.0 2022-11-23 20:42:17 +01:00
6dc5b84d66 Depend on pgp-certificate-store again 2022-11-23 20:42:17 +01:00
d486a17cf1 Implement EncryptionOptions.addRecipient(store, fingerprint) 2022-11-23 20:42:17 +01:00
b287d28a28 Depend on pgp-certificate-store 2022-11-23 20:42:17 +01:00
963b678a9e Enable test for decryption of messages without ESKs 2022-11-23 20:42:17 +01:00
59e81dc514 Use BCs PGPEncryptedDataList.extractSessionKeyEncryptedData() for decryption with session key 2022-11-23 20:42:17 +01:00
f80b3e0cdb Use BCs PGPEncryptedDataList.isIntegrityProtected() 2022-11-23 20:42:17 +01:00
b1f9a1398a Add comment for ArmorUtils method 2022-11-23 20:40:40 +01:00
f86aae4997 Implement efficient read(buf,off,len) for DelayedInputStream 2022-11-23 20:40:40 +01:00
ca49ed087b Small clean-ups in OpenPgpMessageInputStream 2022-11-23 20:40:40 +01:00
58195c19b1 Properly handle failed decryption caused by removed private keys 2022-11-23 20:40:40 +01:00
58aa9f5712 Move classes related to GNU dummy keys to gnupg package 2022-11-23 20:40:40 +01:00
df4fc94ce7 Add test for decryption with removed private key 2022-11-23 20:40:40 +01:00
3af6ab1b85 Rename GnuPGDummyExtension + GnuPGDummyKeyUtil 2022-11-23 20:40:40 +01:00
033beaa8f2 Use S2K usage SHA1 in GnuDummyKeyUtil 2022-11-23 20:40:40 +01:00
a8d2319d63 Add documentation to GnuDummyKeyUtil 2022-11-23 20:40:40 +01:00
2487e3300a Add and test GnuDummyKeyUtil 2022-11-23 20:40:40 +01:00
7467170bcc Move CachingBcPublicKeyDataDecryptorFactoryTest to correct package 2022-11-23 20:40:40 +01:00
07320ed3cf Fix HardwareSecurity.getIdsOfHardwareBackedKeys() 2022-11-23 20:40:40 +01:00
8c0d096fc6 Fix CachingBcPublicKeyDataDecryptorFactory 2022-11-23 20:40:40 +01:00
705e36080c Implement caching PublicKeyDataDecryptorFactory 2022-11-23 20:40:40 +01:00
8fafb6aa56 Add comments 2022-11-23 20:40:40 +01:00
208612ab56 Add (commented-out) read(buf, off, len) implementation for DelayedTeeInputStream 2022-11-23 20:40:40 +01:00
8cb7d19487 Allow injection of different syntax into PDA 2022-11-23 20:40:40 +01:00
161ce57711 Clean up old unused code 2022-11-23 20:40:40 +01:00
ec793c66ff More cleanup and better error reporting 2022-11-23 20:40:40 +01:00
8ca0cfd3ae Rename *Alphabet to *Symbol and add javadoc 2022-11-23 20:40:40 +01:00
b3d61b0494 Separate out syntax logic 2022-11-23 20:40:40 +01:00
798e68e87f Improve syntax error reporting 2022-11-23 20:40:40 +01:00
a2a5c9223e Remove debugging fields 2022-11-23 20:40:40 +01:00
a0ba6828c9 Remove superfluous states 2022-11-23 20:40:40 +01:00
7e8841abf3 Handle unknown packet versions gracefully 2022-11-23 20:40:40 +01:00
192aa98326 Add missing REUSE license headers 2022-11-23 20:40:40 +01:00
a013ab4ebb Wrap MalformedOpenPgpMessageException in BadData 2022-11-23 20:40:40 +01:00
8097c87b7f Fix last two broken tests 2022-11-23 20:40:40 +01:00
e0b2145793 Fix more tests 2022-11-23 20:40:40 +01:00
aa398f9963 Only check message integrity once 2022-11-23 20:40:40 +01:00
e281143d48 Delete old DecryptionStreamFactory 2022-11-23 20:40:40 +01:00
3f8653cf2e Fix CRCing test and fully depend on new stream for decryption 2022-11-23 20:40:40 +01:00
54cb9dad71 Further increase coverage of PDA class 2022-11-23 20:40:40 +01:00
3977d1f407 Add more direct PDA tests 2022-11-23 20:40:40 +01:00
977f8c4101 Rename automaton package to syntax_check 2022-11-23 20:40:40 +01:00
a27c0ff36e Add detailled logging to OpenPgpMessageInputStream 2022-11-23 20:40:40 +01:00
b7acb2a59c Enable logging in tests 2022-11-23 20:40:40 +01:00
a9993fd866 Throw UnacceptableAlgEx for unencrypted encData 2022-11-23 20:40:40 +01:00
3d5916c545 Implement custom decryptor factories in pda 2022-11-23 20:40:40 +01:00
a39c6bc881 Identify custom decryptor factories by subkey id 2022-11-23 20:40:40 +01:00
cfd3f77491 Make map final 2022-11-23 20:40:40 +01:00
228918f96b Change HardwareSecurity DecryptionCallback to emit key-id 2022-11-23 20:40:40 +01:00
529c64cf43 Implement exploratory support for custom decryption factories
This may enable decryption of messages with hardware-backed keys
2022-11-23 20:40:40 +01:00
d39d062a0d WIP: Explore Hardware Decryption 2022-11-23 20:40:40 +01:00
7da34c8329 Work on postponed keys 2022-11-23 20:40:40 +01:00
d3f07a2250 Reuse *SignatureCheck class 2022-11-23 20:40:40 +01:00
dfbb01d61c Enfore max recursion depth and fix CRC test 2022-11-23 20:40:40 +01:00
7097d44916 Fix NPEs and expose decryption keys 2022-11-23 20:40:40 +01:00
6fd705b1dc Fix checkstyle issues 2022-11-23 20:40:40 +01:00
fbcde13df3 Reinstate integrity-protection and fix tests
Integrity Protection is now checked when reading from the stream,
not only when closing.
2022-11-23 20:40:40 +01:00
654493dfcc Properly expose signatures 2022-11-23 20:40:40 +01:00
a9f77ea100 Cleaning up and collect signature verifications 2022-11-23 20:40:40 +01:00
43c369f1f9 It was the buffering. 2022-11-23 20:40:40 +01:00
bdc968dd43 Create TeeBCPGInputStream to move teeing logic out of OpenPgpMessageInputStream 2022-11-23 20:40:40 +01:00
e420678076 2/3 the way to working sig verification 2022-11-23 20:40:40 +01:00
5e37d8038a WIP: So close to working notarizations 2022-11-23 20:40:39 +01:00
5288fb81c3 Reformat KeyRingReader 2022-11-23 20:40:03 +01:00
18b1fadeb6 Suppress DefaultCharset warning 2022-11-23 20:40:03 +01:00
2ce4486e89 Convert links in javadoc to html 2022-11-23 20:40:03 +01:00
babd1542e3 DO NOT MERGE: Disable broken test 2022-11-23 20:40:03 +01:00
09f94944b3 Remove unnecessary throws declarations 2022-11-23 20:40:03 +01:00
81bb8cba54 Use BCs Arrays.constantTimeAreEqual(char[], char[]) 2022-11-23 20:40:03 +01:00
527aab922e Fix ModificationDetectionException by not calling PGPUtil.getDecoderStream() 2022-11-23 20:40:03 +01:00
ec28ba2924 SIGNATURE VERIFICATION IN OPENPGP SUCKS BIG TIME 2022-11-23 20:40:03 +01:00
4e44691ef6 Wip 2022-11-23 20:40:03 +01:00
45555bf82d Wip: Work on OPS verification 2022-11-23 20:40:03 +01:00
e25f6e1712 Fix checkstyle issues 2022-11-23 20:40:03 +01:00
5c93eb3705 Wip: Introduce MessageMetadata class 2022-11-23 20:40:03 +01:00
efdf2bca0d WIP: Play around with TeeInputStreams 2022-11-23 20:40:03 +01:00
7537c9520c WIP: Add LayerMetadata class 2022-11-23 20:40:03 +01:00
54d7d0c7ae Implement experimental signature verification (correctness only) 2022-11-23 20:40:03 +01:00
9366700895 Add read(b,off,len) 2022-11-23 20:40:03 +01:00
7b9db97212 Clean close() method 2022-11-23 20:40:03 +01:00
0753f4d38a Work on getting signature verification to function again 2022-11-23 20:40:03 +01:00
d81c0d4400 Fix tests 2022-11-23 20:40:02 +01:00
e86062c427 WIP: Replace nesting with independent instancing 2022-11-23 20:40:02 +01:00
bf8949d7f4 WIP: Implement custom PGPDecryptionStream 2022-11-23 20:40:02 +01:00
bc73d26118 Add Pushdown Automaton for checking OpenPGP message syntax
The automaton implements what is described in
https://github.com/pgpainless/pgpainless/blob/main/misc/OpenPGPMessageFormat.md

However, some differences exist to adopt it to BouncyCastle

Part of #237
2022-11-23 20:40:02 +01:00
ae88fdf4ab
Document ArmoredOutputStreamFactory.setVersionInfo(null) 2022-11-11 13:49:28 +01:00
86b06ee5e3 SOP: Hide armor version header by default 2022-11-11 13:46:43 +01:00
c253732ad9 Do not reject bnacksig signatures when they predate subkey binding date
Fixes #334
2022-11-09 15:44:20 +01:00
50d18a4581 Fix NPE when validating signature made by key without keyflags on direct key sigature
(Presumably) fixes #332
2022-11-07 15:34:18 +01:00
b02ae86ff6 Annotate SignatureSubpacketsUtil methods with @Nullable and @Nonnull 2022-11-07 15:34:18 +01:00
f5e4c7571c
Bump BC to 1.72, BCPG to 1.72.1 2022-11-02 10:53:53 +01:00
754fcf72a1
Implement ProducerOptions.setHideArmorHeaders()
Fixes #328
2022-10-31 11:43:24 +01:00
8834d8ad10
Increase timeframe for some tests which check expiration dates 2022-10-18 15:13:49 +02:00
f94917d01f
Fix checkstyle issue 2022-09-28 13:18:34 +02:00
6a2a604ba4
Update TODO for BC 173 2022-09-27 16:47:23 +02:00
d74a8d0408
Add PGPainless.asciiArmor(PGPSignature) 2022-09-27 16:28:31 +02:00
dac059c702
Add test for PGPainless.asciiArmor(key, stream) 2022-09-27 16:17:22 +02:00
5bccc1960e Add PGPainless.asciiArmor(key, outputStream) 2022-09-27 16:12:26 +02:00
639d2a19f8
Remove unused provideSessionKeyDataDecryptorFactory() methods 2022-09-13 20:27:16 +02:00
609bb4556a
Use ImplementationFactory.getSessionKeyDataDecryptorFactory() method 2022-09-13 20:26:13 +02:00
0e45de9b4a Formatting 2022-09-13 20:23:06 +02:00
9e403c1124 Add ImplementationFactory.getSessionKeyDataDecryptorFactory() and impls 2022-09-13 20:22:53 +02:00
8dfabf1842 Test decryption of messages using Session Key 2022-09-12 15:26:06 +02:00
7480c47fa7
Add behavior test to ensure that ArmoredInputStream cuts away any data outside of the armor 2022-09-08 18:15:52 +02:00
31c4570d10
Move finalization of signatures into own method 2022-09-07 13:48:59 +02:00
0dd54f27b7
Add test for processing message byte by byte 2022-09-05 15:43:32 +02:00
0bafc410a0
Add missing parseAndCombineSignatures call
For some reason this was missing from the single-byte read() method
of the SignatureInputStream, causing issues if draining the stream
byte by byte
2022-09-05 15:41:58 +02:00
9106d98449
Add tests for Certificate merging 2022-09-05 15:25:29 +02:00
cd0b9603e7
Add KeyRingUtils.injectCertification(keys, certification) 2022-09-05 15:15:58 +02:00
5be42b22bd
Add test for KeyRingUtils.keysPlusPublicKey 2022-09-05 14:45:22 +02:00
4ec38bb63b
Add tests for ArmoredInputStreamFactory 2022-09-05 14:37:23 +02:00
70ce4d45f4
Remove unused CRCinArmoredInputStreamWrapper.possiblyWrap() 2022-09-05 14:20:11 +02:00
3a33bb126a
Add RNGPerformanceTest to help diagnose performance bottlenecks
Related to https://github.com/pgpainless/pgpainless/issues/309
2022-09-03 14:24:37 +02:00
3cd5a95d89
Rename inspectionDate to referenceTime 2022-09-03 13:48:02 +02:00
7189516dd4
Add documentation for modifyKeyRing(keys, date) 2022-09-03 13:46:32 +02:00
c3dc3c9d87 Allow modification of keys with custom reference date
Also, bind subkeys using SubkeyBindingSignatureBuilder
2022-09-03 13:42:58 +02:00
15046cdc32
Switch default S2K for secret key protection over to use SHA256 and add documentation 2022-08-31 21:37:31 +02:00
c6676d3c91
Add support for generating keys without user-ids
Fixes #296
2022-08-29 14:12:02 +02:00
bc24c4626a
Add ConsumerOptions.get() factory method 2022-08-29 13:00:50 +02:00
5746985bb7
Add EncryptionOptions.get() factory method 2022-08-29 12:46:36 +02:00
d1001412a1
Add SigningOptions.addDetachedSignature(protector, key) shortcut method 2022-08-29 12:36:16 +02:00
39ff2bca73
Fix javadoc of SigningOptions methods 2022-08-29 12:35:51 +02:00
1b04d67e1a
Remove unused SignatureSubpacketGeneratorUtil class and tests 2022-08-29 11:30:26 +02:00
0cc884523c
Integrate RevocationState into KeyRingInfo class 2022-08-29 11:30:10 +02:00
c73905d179
Import RevocationStateTest from wot branch 2022-08-29 11:12:42 +02:00
d019c0d5db
Add RevocationState implementation from wot branch 2022-08-29 11:09:32 +02:00
405e67c0cb
Add documentation to AlgorithmNegotiator classes 2022-08-29 11:06:17 +02:00
7faa6c580a
Remove deprecated ArmorUtils.createArmoredOutputStream() 2022-08-29 10:38:44 +02:00
054828ef8c
Remove deprecated EncryptionResult.getSymmetricKeyAlgorithm()
Use getEncryptionAlgorithm() instead
2022-08-29 10:37:55 +02:00
bc5dc50b78
Add KeyRingInfo.isSigningCapable()
Fixes #307
2022-08-09 15:08:59 +02:00
b9845912ee
Add tests for readKeyRing() 2022-08-08 13:20:28 +02:00
e6b89e2c3b Add KeyRingReader.keyRing(*) mnethods to read either a public or secret key ring 2022-08-08 13:15:03 +02:00
ca09ac62ca
KeyRingInfo.isUsableFor*(): Check if primary key is revoked 2022-08-03 13:37:18 +02:00
c1de66e1d7
Fix javadoc lying about only encrypting to single subkeys
Fixes #305
2022-08-02 16:53:01 +02:00
895fcced9a
Add gradle CI action 2022-07-22 20:21:02 +02:00
cb23cad625
Fix checkstyle issues and java API compatibility 2022-07-22 13:59:15 +02:00
Jérôme Charaoui
5a86d9db62 Fix tests that read from jar-embedded resources
It seems that none of the functions used here actually require a File
object as arguments, and will happily work on InputStream objects.
This also changes readFromResource() to use InputStream.readAllBytes()
instead of File.readAllBytes(), which is available from Java 9.
2022-07-22 13:55:05 +02:00
c4bffad478
Abort (skip) tests reading from resources 2022-07-21 21:34:44 +02:00
f966c1ed07
Explicitly cast Long to long to fix ambiguity in debian tests 2022-07-20 18:07:42 +02:00
e67d5b405c
Add javadoc to ProducerOptions.noEncryptionNoSigning() 2022-07-18 14:50:53 +02:00
9b6d08f3c5
Add MODIFICATION_DETECTION_2 feature constant 2022-07-18 12:03:16 +02:00
cd5982cd47
Add AEADAlgorithm class and test 2022-07-18 11:30:37 +02:00
59adbe1d0a
Add SHA3 hash algorithms to HashAlgorithm class 2022-07-18 11:30:25 +02:00
fe913172d5
Add missing javadoc 2022-07-16 12:58:22 +02:00
6fc1d25db8 Merge branch 'fix298' 2022-07-16 12:37:20 +02:00
ba191a1d0f
Prevent adding NULL to symmetric algorithm preference when generating key
Fixes #301
2022-07-15 14:19:45 +02:00
dec3c8be60
Add SecretKeyRingEditor.replaceUserId(old,new,protector) 2022-07-15 14:00:41 +02:00
32e1f1234b
Add KeyRingUtils.publicKeyRingCollectionFrom(PGPSecretKeyRingCollection) 2022-07-15 13:21:59 +02:00
2ad67a85fb
Add test to make sure we do not allow unencrypted as sym alg preference 2022-07-15 13:20:23 +02:00
4730ac427b
Add test for #298 2022-07-13 14:54:16 +02:00
223cf009fc
Fix User-ID format in documentation and note invalid user-id formats in tests 2022-07-12 10:33:43 +02:00
50d31eb463
KeyRingTemplates: Add methods taking Passphrase as argument 2022-07-11 14:15:54 +02:00
52c8439da5
Prevent third-party assigned user-ids from being accidentally returned as primary user-id
Fixes #293
2022-07-10 23:02:00 +02:00
3842aa9ced
Add test to explore behavior when dealing with V3 keys 2022-07-08 15:08:45 +02:00
170aaaa0c5
Document KO protection utility class 2022-07-04 11:05:16 +02:00
8b66b3527e
Add tests for pet name certification and scoped delegation 2022-06-30 13:16:15 +02:00
a99ce15969
Forward userIdOnCertificate() method call 2022-06-30 13:11:27 +02:00
b8f4cc3935 Merge branch 'certification' 2022-06-29 16:01:03 +02:00
b2a5351cc3
Delete unused KeyRingValidator class 2022-06-29 16:00:21 +02:00
7e0b1b344c
s/{validation|evaluation}Date/referenceTime/g 2022-06-24 12:47:35 +02:00
0c0f82ce2e Add KeyRingInfo constructor that takes Policy instance 2022-06-24 12:29:03 +02:00
3f40fb99ef Add RevocationState enum 2022-06-24 12:28:56 +02:00
0c28c7a389
symmetrically encrypted messages are still encrypted 2022-06-23 11:46:19 +02:00
e5ba4f9933
Add buffer to improve encryption performance 2022-06-21 19:48:49 +02:00
8d1794544a
Fix indentation 2022-06-21 19:48:38 +02:00
b6975b38f1
Add tests for KeyFlag bitmask methods 2022-06-20 19:03:52 +02:00
0690a21360
Increase coverage of Policy class 2022-06-20 18:48:27 +02:00
37441a81e8
Add OpenPgpV5Fingerprint constructor tests using mocked v5 keys 2022-06-20 18:35:48 +02:00
2873de0d05
Include mockito as test dependency 2022-06-20 18:35:31 +02:00
fed3080ae8
Add tests to increase coverage of v5 fingerprint class 2022-06-20 18:19:24 +02:00
ca39efda99
Add test for CleartextSignedMessageUtil 2022-06-20 18:10:44 +02:00
82ff62b4e6
Remove unused NotYetImplementedException 2022-06-20 17:58:27 +02:00
a944d2a6b9
Fix build errors 2022-06-20 15:09:02 +02:00
7223b40b23 Add javadoc and indentation 2022-06-20 12:44:40 +02:00
8d2afdf3b6 Make certify() methods public 2022-06-20 12:44:40 +02:00
bbd94c6c9a More documentation 2022-06-20 12:44:40 +02:00
1483ff9e24 Add another test for Trustworthiness 2022-06-20 12:44:40 +02:00
870af0e005 Add javadoc documentation to Trustworthiness class 2022-06-20 12:44:40 +02:00
d2b48e83d9 Implement certifying of certifications 2022-06-20 12:44:40 +02:00
fa5ddfd112 WIP: Implement delegations
THERE ARE THINGS BROKEN NOW. DO NOT MERGE!
2022-06-20 12:44:40 +02:00
c1170773bc Implement certification of third party keys 2022-06-20 12:44:40 +02:00
75455f1a3c
Add OpenPgpMetadata.isCleartextSigned and use it in sop to determine if message was cleartext signed 2022-06-19 17:31:48 +02:00
2d60650cc6 Progress on SOP04 support 2022-06-19 16:59:42 +02:00
53df487e59 Adopt changes from SOP-Java and add test for using incapable keys 2022-06-19 16:59:42 +02:00
dd26b5230d Use newly introduced modernKeyRing(userId) method 2022-06-19 16:59:42 +02:00
9a545a2936 Wip: SOP 4 2022-06-19 16:59:42 +02:00
57fbb469ea Fix performance issue of encrypt and sign operations by buffering 2022-06-16 11:22:35 +02:00
444ec6d593
Add documentation to enforceBounds() 2022-06-01 13:40:07 +02:00
44c32d0620
When setting expiration dates: Prevent integer overflow 2022-06-01 13:36:00 +02:00
70a861611c
Improve SignatureUtils.wasIssuedBy() by adding support for v5 fingerprints 2022-05-18 14:21:22 +02:00
9921fc6ff6
Add and test OpenPgpFingerprint.parseFromBinary(bytes) 2022-05-18 14:19:08 +02:00
3a9bfd57ac Add test for SignatureUtils.getSignaturesForUserIdBy() 2022-05-17 18:38:48 +02:00
1a37058c66 Add SignatureUtils.getSignaturesForUserIdBy(key, userId, keyId) 2022-05-17 18:38:48 +02:00
77d010ec94 Add CollectionUtils.addAll(iterator, collection) 2022-05-17 18:38:48 +02:00
51baa0e5cb Add modernKeyRing(userId) shortcut method 2022-05-17 18:38:48 +02:00
8fd67da973
Add comment about readSignatures skipping compressed data packets 2022-05-08 11:34:56 +02:00
12e62d381c
Make readSignatures skip over compressed data packets without decompression. 2022-05-08 11:24:34 +02:00
49d65788b4 Remove support for processing compressed detached signatures
Signatures are indistinguishable from randomness, so there is no point in
compressing them, apart from attempting to exploit flaws in compression
algorithms.
Thanks to @DemiMarie for pointing this out

Fixes #286
2022-05-07 21:46:12 +02:00
d3f412873b
Fix checkstyle issues 2022-05-07 21:44:52 +02:00
374e6452f0
Add RevokedKeyException 2022-05-07 14:12:18 +02:00
3e7e6df3f9
Disallow stripping of primary secret keys 2022-05-07 14:11:39 +02:00
64a50266f1
Test for detection of uncompressed, signed messages, and improve decryption of seip messages 2022-05-05 12:43:44 +02:00
826331917f
Add comments to unexhaustive parsing method 2022-05-05 11:15:19 +02:00
69f84f24b6
Implement heavy duty packet inspection to figure out nature of data 2022-05-04 20:55:29 +02:00
288f1b414b
Fix javadoc links 2022-05-03 11:31:19 +02:00
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
b980fcd7b1
EncryptionOptions.addRecipients(collection): Disallow empty collections
Fixes #281
2022-04-29 22:49:45 +02:00
4698b68015
Fix javadoc generation 2022-04-23 01:47:44 +02:00
9b8cf37dd1
Use smart hash algorithm policy as default revocation hash policy 2022-04-22 23:06:40 +02:00
6c983d66e0
Take hash algorithm usage date into account when checking algorithm acceptance 2022-04-22 22:45:39 +02:00
4764202ac9
Change visibility of BcPGPHashContextContentSignerBuilder constructor 2022-04-22 22:43:19 +02:00
6c442e9568 Merge remote-tracking branch 'origin/hashContextSigner' 2022-04-22 21:36:47 +02:00
230725f6ff
Add option to force handling of data as non-openpgp 2022-04-22 21:33:13 +02:00
8172aa1083
Update documentation of #96 workaround 2022-04-22 20:56:02 +02:00
46f69b9fa5
Introduce OpenPgpInputStream to distinguish between armored, binary and non-OpenPGP data 2022-04-22 20:53:44 +02:00
73b7f1b9bb
Refactoring 2022-04-19 21:07:46 +02:00
c3dfb254b1
Experimental implementation of signing of existing hash contexts (MessageDigest instances) 2022-04-16 00:23:20 +02:00
b64d6e8e55
Stabilize HashAlgorithm.fromName() 2022-04-16 00:22:41 +02:00
05022fcbb5
Fix whitespace error 2022-04-07 21:17:00 +02:00
e4bccaf58d
Add support for RegularExpression subpackets (fixes #246) 2022-04-07 20:47:47 +02:00
7710845454
Simplify setPolicyUrl implementation 2022-04-07 20:46:21 +02:00
d4c56f655f
Add support for PolicyURI subpackets (fixes #248) 2022-04-07 20:41:21 +02:00
5f65ca4437
Remove workaround for BC not properly parsing RevocationKey subpacket 2022-04-07 20:28:45 +02:00
d0544e690e
Fix KeyRingUtils.keysPlusPublicKey() 2022-04-07 20:24:36 +02:00
361d2376f5
Update documentation on curve oid workaround 2022-04-07 20:21:07 +02:00
73fa46895e
Implement merging of certificates
Fixes #211
2022-04-07 19:51:42 +02:00
864bfad80c Add test for encryption / decryption, signing with missing secret subkey 2022-04-07 19:42:58 +02:00
a22336a795 Create dedicated KeyException class for key-related exceptions. 2022-04-07 19:42:58 +02:00
6b3f37796c
Restructure dependencies and version.gradle 2022-04-07 19:40:56 +02:00
53017d2d38
Bump BC to 1.71 2022-04-07 19:40:39 +02:00
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
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
0bce68d6ee
Add shortcut SigningOptions.addSignature() method 2022-04-04 20:18:15 +02:00
d0b070f0f3
Fix javadoc 2022-04-04 20:17:57 +02:00
e601f8dbda
In Encrypt example: Read keys from string 2022-04-04 19:49:28 +02:00
2065b4e4ed
Document planned removal of BCUtil.constantTimeAreEquals(char[], char[]) 2022-04-04 13:08:24 +02:00
c8a1ca5b29
Make use of DateUtil.now() in test 2022-04-04 12:53:47 +02:00
2c86d8dfe4
Document various KeyRingSelectionStrategies 2022-04-04 12:49:00 +02:00
7ca9934cbe
Document KeyRingSelectionStrategy 2022-04-04 12:32:37 +02:00
bfbe03f9e0
Document SelectUserIds 2022-04-04 12:19:07 +02:00
4aaa242d64
Add javadoc to SignatureSubpacketsUtil 2022-04-04 10:40:57 +02:00
58dee0d970
Fix javadoc warnings 2022-04-02 18:56:05 +02:00
4bd01578fb
Fix javadoc generation 2022-04-02 18:14:17 +02:00
6869c66937
Add TODOs to remove deprecated methods in 1.2.X 2022-04-02 17:12:12 +02:00
8ec86e6464
Rename KeyRingUtil.removeSecretKey() to stripSecretKey() 2022-04-02 17:03:38 +02:00
50bcb6a135 Fix changelog and change method signature 2022-04-02 16:18:12 +02:00
39382c7de6 Add annotations to SignatureGenerationStream constructor 2022-04-02 16:18:12 +02:00
131c0c6d03 Add javadoc header to SignatureGenerationStream 2022-04-02 16:18:12 +02:00
f8e66f4d61 Add ProducerOptions.applyCRLFEncoding()
Enabling it will automatically apply CRLF encoding to input data.
Further, disentangle signing from the encryption stream
2022-04-02 16:18:12 +02:00
6bef376992
Fix signature generation with all format and signature type combinations
This comes at the cost of that we no longer CR/LF encode literal data before encryption/signing.
That means that applications that rely on PGPainless to do the CR/LF encoding must manually
do the encoding before feeding the message to PGPainless.
The newly introduced CRLFGeneratorStream has documentation on how to do that.
Fixes #264
2022-03-30 16:13:08 +02:00
b0eb32d550
Fix checkstyle 2022-03-30 12:21:53 +02:00
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
63b39c56bd
Fix README 2022-03-01 17:18:20 +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
36c5ec8a28 Host javadoc on javadoc.io 2022-02-15 14:29:07 +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
af8d04c66f
Threat Model: add remark about secure key storage 2021-12-13 13:21:18 +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
601efd94f2
Fix typo 2021-12-03 14:20:36 +01:00
5485d490e2
Add threat model sketch to pgpainless-core/README 2021-12-03 13:07:38 +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