1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-15 17:02:06 +01:00
Commit graph

485 commits

Author SHA1 Message Date
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
e587fc46b8
SOP: Ignore marker packets in certificates 2021-06-10 16:56:36 +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
e297dfd3c1
EncryptionOptions: Consistent exceptions 2021-06-10 15:04:08 +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
cc8a7826fc
Add KeyIdUtil with method to convert from 16 digit hex key-id to long 2021-06-10 13:36:44 +02:00
f7525dde65
Add get{,Un}HashedNotationData(sig, notationName) to SignatureSubpacketUtils 2021-06-10 13:35:55 +02:00
bedfef49fe
Add getSignatureDigestPrefix utility method to SignatureUtils 2021-06-10 13:35:09 +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
ce4869e15a
UnlockSecretKey: Do not try to get decryptor for unencrypted keys 2021-05-31 15:38:47 +02:00
73f6c54fa2
More documentation 2021-05-31 15:33:42 +02:00
a871bc3a0c
Add documentation 2021-05-31 15:24:41 +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
ccdcd49c58
Remove deprecated method withMasterKey from KeyRingBuilderInterface 2021-05-30 18:05:09 +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
ea03c66400
Throw MissingDecryptionMethodException when missing decryption key or -passphrase 2021-05-28 23:20:25 +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
293442d699
Delete unused EvaluatedKeyRing class 2021-05-28 21:42:31 +02:00
826c761e69
Test invalid keys cannot sign behavior 2021-05-28 21:41:02 +02:00
6f0cf35e31
Delete redundant classes 2021-05-28 21:33:20 +02:00
b1deb75969
Deprecate PGPainless.encryptAndOrSign(purpose) 2021-05-27 15:57:21 +02:00
9883d1537b
Move EncryptionPurpose to own class 2021-05-27 15:52:43 +02:00
3edaa60b52
Make KeyRingInfo NPE-safe 2021-05-27 14:50:48 +02:00
e3749f5734
Add SigningOptions.add{Inline|Detached}Signatures(decryptor, pgpSecretKeyRingCollection, type) 2021-05-27 13:55:18 +02:00
8e6abe5d02
Add EncryptionOptions.addRecipients(PGPPublicKeyRingCollection) 2021-05-27 13:47:24 +02:00
e67854310d
Change visibilit of non-API methods to package 2021-05-27 13:47:04 +02:00
629ebbd46d
Add missing javadoc 2021-05-27 13:46:40 +02:00
80a6baf0b1
Move File-based MultiPassStrategy from factory method into own class 2021-05-25 22:23:08 +02:00
3cd64b61ca
Fix SOP encrypt-decrypt test 2021-05-25 16:25:22 +02:00
b0692b4dc5 Fix javadoc reference 2021-05-25 14:24:47 +02:00
5965742e5f Document DocumentSignatureType 2021-05-25 14:24:47 +02:00
412b0aa119 Add SymmetricKeyAlgorithmNegotiator 2021-05-25 14:24:47 +02:00
821a49576f AlgorithmSuite: Use LinkedHashSet instead of List 2021-05-25 14:24:47 +02:00
1550e4ff4e Delete SelectPublicKey 2021-05-25 14:24:47 +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
803e507ae7 Add some comments 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
87e5fe71e5
Fix javadoc warning 2021-05-17 13:50:34 +02:00
197cfab0d6
Respect symmetric algorithm policy during decryption and throw UnacceptableAlgorithmException if policy is violated 2021-05-17 13:47:46 +02:00
03fb81a77e
Create separate symmetric key algorithm policies for encryption/decryption 2021-05-15 20:43:56 +02:00
3be7f12887
Remove SignatureValidationDateProvider 2021-05-15 20:30:21 +02:00
11b67ea6d2
Add documentation to Policy 2021-05-15 20:27:43 +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
937ec2aa86
Add HashAlgorithm.getAlgorithmName() 2021-05-15 16:23:35 +02:00
b05f6887bd Better support for Armor headers 2021-05-15 15:57:42 +02:00
f2e89bae36 Remove deprecated/reserved hash algorithms and add algo names 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
32e1b0c838
KeyRingBuilder: Do not info-log exception when generated key has wrong length 2021-05-12 12:56:07 +02:00
892f452da8
Print fingerprint+user-id in comment headers of Armor 2021-05-08 14:02:44 +02:00
ec611d7c5f
OpenPgpV4Fingerprint: Support pretty print format 2021-05-08 14:01:42 +02:00
99be722875
Do not spaghetti 2021-05-03 14:11:59 +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
0b3511486c
Add documentation to DecryptionStream(Interface) 2021-04-25 13:34:30 +02:00
7916bf77d1
Add javadoc to enums 2021-04-25 13:28:33 +02:00
2c4a3fca6a
Introduce OpenPgpMetadata.FileInfo class for setting/getting file name, mod date, encoding... 2021-04-25 00:28:48 +02:00
Den
491ab93c41
Modified Passphrase.fromPassword() to fit Kotlin needs (#101)
* Added @Nonnull annotation to Passphrase.fromPassword()
2021-04-10 14:32:24 +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
6954c03f49
Fix checkstyle issue 2021-04-09 12:05:46 +02:00
cd19f91d77 Allow specification of file name and for-your-eyes-only flag 2021-04-07 21:31:12 +02:00
d082f126b3 Use more standards compliant way to determine if secret key is encrypted 2021-04-07 21:14:31 +02:00
ed43d3c6a9
Fix javadoc error 2021-03-23 01:26:51 +01: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
ce0bf970d6
KeyRingReader: Fix reading PGPKeyRingCollections 2021-03-23 01:05:45 +01:00
f427e3c7d0 Add documentation to SignatureSubpacket class 2021-03-21 20:15:18 +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
bfbb2ba31b
Fix checkstyle error 2021-03-05 12:32:21 +01:00
d5ac1301e0
Add primary key binding sigs to signing subkeys 2021-03-04 16:33:46 +01: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
8c041e6856
Fix equality check in CallbackBasedKeyringProtector 2021-02-25 23:11:17 +01:00
e661908c5f
Fix NPE when creating SecretKeyEncryptor for key without S2K spec 2021-02-25 23:10:25 +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
57f7440039 Code review 2021-02-21 16:18:42 +02: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
217609679d
Add SignatureValidationUtil and NotationRegistry classes 2021-02-19 21:22:25 +01:00
ce5f8990ef
Add HashAlgorithmPolicy and SymmetricKeyAlgorithmPolicy 2021-02-19 19:51:44 +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
506a8b18af
Reject NULL encryption algorithm when decrypting messages
Fixes #77
2021-02-17 20:07:54 +01:00
cb7f38f003
Do no emit an uncompressed compressed-data-packet
Fixes #74
2021-02-17 19:52:30 +01:00
d2202dcb0f
Retry key generation on invalid private key encoding length
Workaround for #70
2021-02-15 23:37:03 +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
10de44ebd3
Add modern key ring archetype 2021-02-11 17:10:22 +01:00
fbb4061164
Switch simpleEcKeyRing over to curve25519 2021-02-11 17:10:00 +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
ab39f0e2f3
UserID: prevent double angle brackets around email address 2021-02-07 03:12:35 +01:00
6386579376
De-deprecate SecretKeyRingProtector for now 2021-02-07 03:10:29 +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
567291ac17
Rename UserIdSelectionStrategy -> SelectUserId 2021-02-03 16:38:28 +01:00
138ea0d572
Add convenience method to delete userIds from the primary key 2021-02-03 16:31:45 +01:00
449881bd8d
Add deleteUserIds(keyId, userIdSelectionStrategy, protector) method to SecretKeyRingEditor 2021-02-03 16:26:15 +01:00
eaee5a27fc
Move selection strategies to util package and implement UserIdSelectionStrategy 2021-02-03 16:05:21 +01:00
ff1fb7e07f
Respect Policy when negotiating hash algorithm 2021-01-29 15:15:27 +01:00
d7ef05775d
Add getPrimaryUserId() 2021-01-29 15:08:11 +01:00
4ddbca4908
Expose keySpec.getSubpacketGenerator() and move setPrimaryUserId to builder 2021-01-29 14:51:24 +01:00
4e7c1c023c
Make fields final where possible 2021-01-29 14:48:02 +01:00
bilalashraf123
560effc7c6 Wrong primary user ID when setting withAdditionalUserId 2021-01-29 02:33:43 +05:00
bdae079515
Delete KeyRingCollection 2021-01-23 01:22:29 +01:00
59a14c2918
Make ImplementationFactory methods abstract 2021-01-23 01:09:55 +01:00
bec2fb5ce1
Increase test coverage by writing bunch of JUnit tests 2021-01-22 20:03:20 +01:00
ee1f90e850
Test and implement revocation of single userIDs 2021-01-22 18:28:48 +01:00
c4d670821f
Test if revoked userIds are no longer accepted as valid userIDs 2021-01-22 16:56:41 +01:00
85ed20cfae
Test if subpackets are being preserved when changing expiration time 2021-01-22 16:56:06 +01:00
9aae9ecc93
Add support for checking for revoked userIds 2021-01-22 16:52:09 +01:00
7864add645
Introduce Policy class for default algorithms 2021-01-22 16:50:08 +01:00
39ab6ebddf
Add test for SignatureSubpacketGeneratorUtil 2021-01-22 16:48:30 +01:00
93df791700
Test revocation reason related code 2021-01-21 14:59:55 +01:00
87eab2fb9a
More UserID tests 2021-01-21 14:52:11 +01:00
2880e0bed0
Test SecretKeySelectionStrategy.selectKeysFromKeyRing() 2021-01-21 14:46:28 +01:00
ccae32ca3f
Test getSecretKey() 2021-01-21 14:38:25 +01:00
c35154813a
More code cleanup and tests 2021-01-21 14:35:33 +01:00
bd9a580600
Remove unused BCUtil.publicKeyRingFromSecretKeyRing method
Use KeyRingUtils.publicKeyRingFrom(secertKeys) instead
2021-01-21 14:33:52 +01:00
74c0c8a32e
Fix signature creation using keys without preferred algorithms 2021-01-21 13:47:43 +01:00
3e5ff1fe70
PGPainless 0.2.0-alpha6 2021-01-20 00:51:59 +01:00
21dae7541c
Add test to verify that key with generic certification can be revoked properly 2021-01-19 15:36:31 +01:00
2009f7f7e3
Accept GENERIC_CERTIFICATION signatures when negotiating algorithms 2021-01-19 15:36:06 +01:00
1ce28a09af
Make UserId constructor private in favor of factory methods 2021-01-18 18:12:53 +01:00
b25a78bc29
Fix changing of expiration dates for keys and subkeys 2021-01-18 17:09:57 +01:00
bf8e29caa4
Add KeyRingInfo.getExpirationDate(fingerprint) to get subkey exp dates 2021-01-18 17:09:34 +01:00
21ba97c598
Add SubpacketInspector and SignatureSubpacketGeneratorUtil classes 2021-01-18 17:08:52 +01:00
7ad1cb4169
Add SignatureSubpacket enum 2021-01-18 17:08:20 +01:00
7303c9b47d
Improve logging and verify purpose of signing keys 2021-01-09 21:03:24 +01:00
c89558a01b
Split KeyFlagSelectionStrategies up into Has{Any|All}KeyFlagsSelectionStrategy 2021-01-09 20:55:19 +01:00
83362816d0
toRecipients(): Throw IllegalArgumentException instead of IllegalStateException 2021-01-09 20:44:33 +01:00
4f0493bce7
Test that the encryptionStreamBuilder will not encrypt to keys with missing flags 2021-01-09 20:40:10 +01:00
11c41e7ba7
Allow the user to specify a purpose for encryption 2021-01-09 20:30:34 +01:00
8df752e995
Add HasKeyFlagsSelectionStrategy 2021-01-09 20:16:13 +01:00
83bd157a78
Get rid of generics in selection strategies 2021-01-09 19:23:50 +01:00
e53a21ff77
Add some weird keys and test for multi sub key encryption 2021-01-09 18:57:48 +01:00
63bf5a8e69
Add support for decryption with hidden recipients 2021-01-09 16:16:17 +01:00
f5338e13e7
Get rid of ElGamal_GENERAL and rename ElGamal_ENCRYPT to ElGamal 2021-01-03 17:06:38 +01:00
5143da1311
Verify that keys can carry certain key flags 2021-01-03 17:01:08 +01:00
2378162953
Remove withDefaultKeyFlags method 2021-01-03 16:26:53 +01:00
d014c00aaa
Refactor implementationfactory 2021-01-03 15:52:33 +01:00
82014ef6e5
Fix checkstyle issues 2021-01-03 15:52:18 +01:00
1c1f9d49ab
Introduce ImplementationFactory 2020-12-27 01:56:18 +01:00
c7ede0fc8a
Add junit test for symmetric decryption 2020-12-26 23:36:33 +01:00
7d374f10a7
Allow encryption and decryption using symmetric passphrases in the main API 2020-12-26 19:04:27 +01:00
ff8c6d8b6d Fix NPE when signing key is not found during signature verification 2020-12-16 20:11:45 +01:00
4870bda4f2 Allow specification of signature type 2020-12-16 20:11:28 +01:00
aeed8bf705 SignatureType: Reuse BC signature type codes 2020-12-16 20:11:04 +01:00
ca6089eeac
Add test to verify that primary key can certify§ 2020-12-11 22:54:27 +01:00
5a04669661
Add missing package.info 2020-12-11 22:54:11 +01:00
0194bd5924
Add documentation to PublicKeyAlgorithms 2020-12-11 22:52:28 +01:00
d65646efc6
Add XDH keytype factory method 2020-12-11 22:09:49 +01:00
aff2e6b9f0
Verify that certification key has signing capable algorithm 2020-12-11 22:09:21 +01:00
c38477f277
Add more javadoc 2020-12-11 18:53:10 +01:00
ac08827f91
Move ECDSA and ECDH to ecc subpackage 2020-12-11 18:16:31 +01:00
799265f332
mark RSA_ENCRYPT and RSA_SIGN as deprecated 2020-12-11 18:15:54 +01:00
5f289f4fe1
ElGamal: Deprecate GENERAL 2020-12-11 18:14:36 +01:00
3c88bdde9b
Refactor keytype related classes 2020-12-08 20:02:41 +01:00
4550425609 Wip: Add more elliptic curves, support for {X,Ed}25519 2020-12-08 19:26:57 +01:00
980782e629
Remove deprecated class PGPKeyRing 2020-12-08 19:14:52 +01:00
db2e97b449
Fix some javadoc issues 2020-12-05 00:17:32 +01:00