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

339 commits

Author SHA1 Message Date
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
Paul Schaub bfbb2ba31b
Fix checkstyle error 2021-03-05 12:32:21 +01:00
Paul Schaub d5ac1301e0
Add primary key binding sigs to signing subkeys 2021-03-04 16:33:46 +01:00
Paul Schaub c5fbdbbc9b
Disable MultiPassphraseEncryptionTest until https://github.com/pgpainless/pgpainless/issues/72 is fixed 2021-02-27 15:22:29 +01:00
Paul Schaub bfab4b60f0
Introduce parametrized tests to also test the JceImplementationFactory 2021-02-25 23:27:08 +01:00
Paul Schaub 8c041e6856
Fix equality check in CallbackBasedKeyringProtector 2021-02-25 23:11:17 +01:00
Paul Schaub e661908c5f
Fix NPE when creating SecretKeyEncryptor for key without S2K spec 2021-02-25 23:10:25 +01:00
Paul Schaub 9587d52f29
Add test for Feature class 2021-02-25 20:02:42 +01:00
Paul Schaub 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
Paul Schaub 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
Paul Schaub 81393a7285
Abort decryption process at a depth of 16 nested packets 2021-02-19 21:37:54 +01:00
Paul Schaub 217609679d
Add SignatureValidationUtil and NotationRegistry classes 2021-02-19 21:22:25 +01:00
Paul Schaub ce5f8990ef
Add HashAlgorithmPolicy and SymmetricKeyAlgorithmPolicy 2021-02-19 19:51:44 +01:00
Paul Schaub c75a192513
Use ArmoredOutputStreamFactory to hide version string in ascii armor
Partially fixes #82
2021-02-19 19:50:36 +01:00
Paul Schaub ea89289852
Check MDC when stream is closed 2021-02-17 21:04:05 +01:00
Paul Schaub d2a581de9b
Fix decryption of messages with Wildcard recipient
Fixes #76
2021-02-17 20:20:10 +01:00
Paul Schaub 506a8b18af
Reject NULL encryption algorithm when decrypting messages
Fixes #77
2021-02-17 20:07:54 +01:00
Paul Schaub cb7f38f003
Do no emit an uncompressed compressed-data-packet
Fixes #74
2021-02-17 19:52:30 +01:00
Paul Schaub d2202dcb0f
Retry key generation on invalid private key encoding length
Workaround for #70
2021-02-15 23:37:03 +01:00
Paul Schaub f2f7305fec
Allow for setting of expiration date during key generation 2021-02-13 12:22:28 +01:00
Paul Schaub 83117c99cb
Add two more tests 2021-02-12 01:23:32 +01:00
Paul Schaub 651bb63175
Deprecate withMasterKey(spec) in favor of withPrimaryKey(spec) 2021-02-11 17:18:59 +01:00
Paul Schaub 10de44ebd3
Add modern key ring archetype 2021-02-11 17:10:22 +01:00
Paul Schaub fbb4061164
Switch simpleEcKeyRing over to curve25519 2021-02-11 17:10:00 +01:00
Paul Schaub 79b2d42f9c
Add support for more elliptic curves and start implementing KeyInfo class 2021-02-11 16:58:00 +01:00
Paul Schaub ebf46fa05e
Add tests for SelectUserId 2021-02-07 03:12:59 +01:00
Paul Schaub ab39f0e2f3
UserID: prevent double angle brackets around email address 2021-02-07 03:12:35 +01:00
Paul Schaub 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
Paul Schaub 567291ac17
Rename UserIdSelectionStrategy -> SelectUserId 2021-02-03 16:38:28 +01:00
Paul Schaub 138ea0d572
Add convenience method to delete userIds from the primary key 2021-02-03 16:31:45 +01:00
Paul Schaub 449881bd8d
Add deleteUserIds(keyId, userIdSelectionStrategy, protector) method to SecretKeyRingEditor 2021-02-03 16:26:15 +01:00
Paul Schaub eaee5a27fc
Move selection strategies to util package and implement UserIdSelectionStrategy 2021-02-03 16:05:21 +01:00
Paul Schaub ff1fb7e07f
Respect Policy when negotiating hash algorithm 2021-01-29 15:15:27 +01:00
Paul Schaub d7ef05775d
Add getPrimaryUserId() 2021-01-29 15:08:11 +01:00
Paul Schaub 4ddbca4908
Expose keySpec.getSubpacketGenerator() and move setPrimaryUserId to builder 2021-01-29 14:51:24 +01:00
Paul Schaub 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
Paul Schaub bdae079515
Delete KeyRingCollection 2021-01-23 01:22:29 +01:00
Paul Schaub 59a14c2918
Make ImplementationFactory methods abstract 2021-01-23 01:09:55 +01:00
Paul Schaub bec2fb5ce1
Increase test coverage by writing bunch of JUnit tests 2021-01-22 20:03:20 +01:00
Paul Schaub ee1f90e850
Test and implement revocation of single userIDs 2021-01-22 18:28:48 +01:00
Paul Schaub c4d670821f
Test if revoked userIds are no longer accepted as valid userIDs 2021-01-22 16:56:41 +01:00
Paul Schaub 85ed20cfae
Test if subpackets are being preserved when changing expiration time 2021-01-22 16:56:06 +01:00
Paul Schaub 9aae9ecc93
Add support for checking for revoked userIds 2021-01-22 16:52:09 +01:00
Paul Schaub 7864add645
Introduce Policy class for default algorithms 2021-01-22 16:50:08 +01:00
Paul Schaub 39ab6ebddf
Add test for SignatureSubpacketGeneratorUtil 2021-01-22 16:48:30 +01:00
Paul Schaub 93df791700
Test revocation reason related code 2021-01-21 14:59:55 +01:00
Paul Schaub 87eab2fb9a
More UserID tests 2021-01-21 14:52:11 +01:00
Paul Schaub 2880e0bed0
Test SecretKeySelectionStrategy.selectKeysFromKeyRing() 2021-01-21 14:46:28 +01:00
Paul Schaub ccae32ca3f
Test getSecretKey() 2021-01-21 14:38:25 +01:00
Paul Schaub c35154813a
More code cleanup and tests 2021-01-21 14:35:33 +01:00
Paul Schaub bd9a580600
Remove unused BCUtil.publicKeyRingFromSecretKeyRing method
Use KeyRingUtils.publicKeyRingFrom(secertKeys) instead
2021-01-21 14:33:52 +01:00
Paul Schaub 74c0c8a32e
Fix signature creation using keys without preferred algorithms 2021-01-21 13:47:43 +01:00
Paul Schaub 3e5ff1fe70
PGPainless 0.2.0-alpha6 2021-01-20 00:51:59 +01:00
Paul Schaub 21dae7541c
Add test to verify that key with generic certification can be revoked properly 2021-01-19 15:36:31 +01:00
Paul Schaub 2009f7f7e3
Accept GENERIC_CERTIFICATION signatures when negotiating algorithms 2021-01-19 15:36:06 +01:00
Paul Schaub 1ce28a09af
Make UserId constructor private in favor of factory methods 2021-01-18 18:12:53 +01:00
Paul Schaub b25a78bc29
Fix changing of expiration dates for keys and subkeys 2021-01-18 17:09:57 +01:00
Paul Schaub bf8e29caa4
Add KeyRingInfo.getExpirationDate(fingerprint) to get subkey exp dates 2021-01-18 17:09:34 +01:00
Paul Schaub 21ba97c598
Add SubpacketInspector and SignatureSubpacketGeneratorUtil classes 2021-01-18 17:08:52 +01:00
Paul Schaub 7ad1cb4169
Add SignatureSubpacket enum 2021-01-18 17:08:20 +01:00
Paul Schaub 7303c9b47d
Improve logging and verify purpose of signing keys 2021-01-09 21:03:24 +01:00
Paul Schaub c89558a01b
Split KeyFlagSelectionStrategies up into Has{Any|All}KeyFlagsSelectionStrategy 2021-01-09 20:55:19 +01:00
Paul Schaub 83362816d0
toRecipients(): Throw IllegalArgumentException instead of IllegalStateException 2021-01-09 20:44:33 +01:00
Paul Schaub 4f0493bce7
Test that the encryptionStreamBuilder will not encrypt to keys with missing flags 2021-01-09 20:40:10 +01:00
Paul Schaub 11c41e7ba7
Allow the user to specify a purpose for encryption 2021-01-09 20:30:34 +01:00
Paul Schaub 8df752e995
Add HasKeyFlagsSelectionStrategy 2021-01-09 20:16:13 +01:00
Paul Schaub 83bd157a78
Get rid of generics in selection strategies 2021-01-09 19:23:50 +01:00
Paul Schaub e53a21ff77
Add some weird keys and test for multi sub key encryption 2021-01-09 18:57:48 +01:00
Paul Schaub 63bf5a8e69
Add support for decryption with hidden recipients 2021-01-09 16:16:17 +01:00
Paul Schaub f5338e13e7
Get rid of ElGamal_GENERAL and rename ElGamal_ENCRYPT to ElGamal 2021-01-03 17:06:38 +01:00
Paul Schaub 5143da1311
Verify that keys can carry certain key flags 2021-01-03 17:01:08 +01:00
Paul Schaub 2378162953
Remove withDefaultKeyFlags method 2021-01-03 16:26:53 +01:00
Paul Schaub d014c00aaa
Refactor implementationfactory 2021-01-03 15:52:33 +01:00
Paul Schaub 82014ef6e5
Fix checkstyle issues 2021-01-03 15:52:18 +01:00
Paul Schaub 1c1f9d49ab
Introduce ImplementationFactory 2020-12-27 01:56:18 +01:00
Paul Schaub c7ede0fc8a
Add junit test for symmetric decryption 2020-12-26 23:36:33 +01:00
Paul Schaub 7d374f10a7
Allow encryption and decryption using symmetric passphrases in the main API 2020-12-26 19:04:27 +01:00
Paul Schaub ff8c6d8b6d Fix NPE when signing key is not found during signature verification 2020-12-16 20:11:45 +01:00
Paul Schaub 4870bda4f2 Allow specification of signature type 2020-12-16 20:11:28 +01:00
Paul Schaub aeed8bf705 SignatureType: Reuse BC signature type codes 2020-12-16 20:11:04 +01:00
Paul Schaub ca6089eeac
Add test to verify that primary key can certify§ 2020-12-11 22:54:27 +01:00
Paul Schaub 5a04669661
Add missing package.info 2020-12-11 22:54:11 +01:00
Paul Schaub 0194bd5924
Add documentation to PublicKeyAlgorithms 2020-12-11 22:52:28 +01:00
Paul Schaub d65646efc6
Add XDH keytype factory method 2020-12-11 22:09:49 +01:00
Paul Schaub aff2e6b9f0
Verify that certification key has signing capable algorithm 2020-12-11 22:09:21 +01:00
Paul Schaub c38477f277
Add more javadoc 2020-12-11 18:53:10 +01:00
Paul Schaub ac08827f91
Move ECDSA and ECDH to ecc subpackage 2020-12-11 18:16:31 +01:00
Paul Schaub 799265f332
mark RSA_ENCRYPT and RSA_SIGN as deprecated 2020-12-11 18:15:54 +01:00
Paul Schaub 5f289f4fe1
ElGamal: Deprecate GENERAL 2020-12-11 18:14:36 +01:00
Paul Schaub 3c88bdde9b
Refactor keytype related classes 2020-12-08 20:02:41 +01:00
Paul Schaub 4550425609 Wip: Add more elliptic curves, support for {X,Ed}25519 2020-12-08 19:26:57 +01:00
Paul Schaub 980782e629
Remove deprecated class PGPKeyRing 2020-12-08 19:14:52 +01:00
Paul Schaub db2e97b449
Fix some javadoc issues 2020-12-05 00:17:32 +01:00
Paul Schaub 451313d945
Fix checkstyle issues 2020-12-05 00:01:12 +01:00
Paul Schaub 1be3d4d7d8
Add documentation to KeyRingUtils 2020-12-03 22:46:59 +01:00
Paul Schaub 3173ddbc45
Add static factory methods for SecretKeyRingProtector implementations 2020-11-29 19:08:52 +01:00
Paul Schaub 935af80d14
Add some more utility methods 2020-11-29 19:06:49 +01:00
Paul Schaub e1be34e007
Fix checkstyle issues 2020-11-29 16:18:17 +01:00
Paul Schaub 145fa8c83c
Move unlockSecretKey method to KeyRingUtils 2020-11-29 16:04:15 +01:00
Paul Schaub d9d25ed6fb
Merge pull request #31 from wiktor-k/add-expiration
Add ability to modify expiration dates for keys
2020-11-29 15:45:10 +01:00
Paul Schaub fa2615b434
Forgot to deprecate encryptor method 2020-11-29 15:35:34 +01:00
Paul Schaub cc1e4601e3
replace create{Encryptor,Decryptor} methods with encryptAndOrSign,decryptAndOrVerify 2020-11-29 15:33:54 +01:00
Wiktor Kwapisiewicz 2a672aaf03
Add ability to change expiration date for the primary key 2020-11-27 17:11:56 +01:00
Paul Schaub 93abfd5517
SecretKeyRingEditor: Add revoke() shortcut method 2020-11-22 21:25:52 +01:00
Paul Schaub d7aea4b0f7
Add test for KeyRingInfo class 2020-11-22 21:19:10 +01:00
Paul Schaub 1174a7f787
Add expiration date of emil test key as constant 2020-11-22 21:07:31 +01:00
Paul Schaub c266adb5a5
Fix getExpirationDate method for keys without expiration 2020-11-22 21:07:14 +01:00
Paul Schaub 5ee17fac69
Deprecate PGPainless's PGPKeyRing 2020-11-22 20:49:07 +01:00
Paul Schaub cae93022ad
Add KeyRingInfo class that helps to extract information about key rings 2020-11-22 20:48:09 +01:00
Paul Schaub 8305fcf0ee
Allow for revocation attributes to be passed in when revoking subkey directly 2020-11-20 12:19:45 +01:00
Paul Schaub 0edd8b616f
Add support for creating detached revocation certificates 2020-11-20 12:01:39 +01:00
Paul Schaub 5cdbb125b0
Refactoring: move KeyRingEditor to SecretKeyRingEditor in prep for more editor classes 2020-11-19 17:51:57 +01:00
Paul Schaub 9f95e7925b De-duplicate KeyPrinter class 2020-11-18 12:20:59 +01:00
Paul Schaub 4dd2b2f71a
Implement revoking subkeys for key-ids as well 2020-11-13 16:59:55 +01:00
Paul Schaub aafc9be888
Switch to Jupiter JUnit for tests 2020-11-13 16:31:59 +01:00
Paul Schaub 4ed2cdaed9
Introduce UserId utility class 2020-11-13 15:59:28 +01:00
Paul Schaub 31844c5212
break for-loop of addUserId method when finding key 2020-11-13 15:11:33 +01:00
Paul Schaub 86c3487ad4
Some code cleanup 2020-11-13 15:08:37 +01:00
Paul Schaub 9b2ad24bda
Implement revocation of subkeys 2020-11-13 14:32:29 +01:00
Paul Schaub b4967db1a2
Implement adding subkeys to keyrings 2020-11-10 17:25:35 +01:00
Paul Schaub 99a2fcf1c0
Simplify KeyType API 2020-11-07 18:24:12 +01:00
Paul Schaub cb3190a0fc
Add JUnit tests for user-id addition/deletion 2020-11-06 18:32:44 +01:00
Paul Schaub 6159428c9a
Add support for deleting user-ids (untested) 2020-11-03 19:56:35 +01:00
Paul Schaub 92e2828885
Add support for deleting subKeys (untested) 2020-11-03 19:32:01 +01:00
Paul Schaub 2d899e0a3b
Allow adding user-ids to sub keys 2020-11-03 19:29:15 +01:00
Paul Schaub 47b1ccc071
More rigurous testing of key re-encryption 2020-10-30 13:30:21 +01:00
Paul Schaub 7c102334ed
expand expression to simplify debugging 2020-10-30 13:30:04 +01:00
Paul Schaub 70ad4a274e
Change method name to toNoPassphrase() 2020-10-30 13:29:18 +01:00
Paul Schaub d0580918fa
Fix checkstyle issues 2020-10-30 12:38:59 +01:00
Paul Schaub 8097a9d964
Passphrase.isEmpty: also check for validity 2020-10-30 12:31:52 +01:00
Paul Schaub 423a3f1354
Merge pull request #18 from wiktor-k/fix-empty-passphrase
Fix creating keys with `Passphrase.emptyPassphrase()`
2020-10-30 12:31:06 +01:00
Paul Schaub 04420f8dac
Extract secret key checksum algorithm into constant 2020-10-30 12:28:11 +01:00
Wiktor Kwapisiewicz 59fe53c594
Fix creating keys with Passphrase.emptyPassphrase()
Previously the code supplied `null` to BouncyCastle's
encryptor/decryptor builder's build method and that caused
NullPointerException to be thrown.

The fix checks if the passphrase is empty and omits the BouncyCastle
builder in that case.

Fixes #16.
2020-10-30 12:22:05 +01:00
Wiktor Kwapisiewicz e30d0f6293
Remove RSA_SIGN and RSA_ENCRYPT as they are deprecated
This change removes two mechanisms that are deprecated in RFC 4880. The
spec explicitly mentions that "RSA Encrypt-Only (2) and RSA Sign-Only
are deprecated and SHOULD NOT be generated" [0].

The remaining RSA_GENERAL key type was renamed to just RSA for ease of
use for developers.

[0]: https://tools.ietf.org/html/rfc4880#section-9.1
2020-10-30 11:48:28 +01:00
Paul Schaub cdd1bf4198
Add documentation and throw NotYetImplementedException in stubs 2020-10-29 15:15:13 +01:00
Paul Schaub 99af9e0171
Re-encrypting whole keyring successful 2020-10-25 20:43:09 +01:00
Paul Schaub 623c4c930d
Adding user-ids works 2020-10-25 19:54:03 +01:00
Paul Schaub 651a69c118
Work on the editing api 2020-10-23 16:44:21 +02:00
Paul Schaub 207c41d411
Add initial draft interface for a key editor API 2020-10-22 01:20:43 +02:00
Paul Schaub f21231ad53
Trim user-ids 2020-10-20 23:23:25 +02:00
Paul Schaub c06bedd656
Introduce SignatureType enum 2020-10-20 22:59:06 +02:00
Paul Schaub 1b389f678a
Fix checkstyle issues 2020-10-20 22:58:45 +02:00