Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8298420: PEM API: Implementation (Preview) #17543

Open
wants to merge 61 commits into
base: master
Choose a base branch
from
+3,250 −318
Open

8298420: PEM API: Implementation (Preview) #17543

Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
03e2088
publish pem
ascarpino Jan 23, 2024
ceb233f
Merge branch 'master' into pem
ascarpino Jan 23, 2024
4b8bff1
cleanup of copyrights and other commented out code
ascarpino Jan 23, 2024
2f4e8cf
try MIMEEncoder again
ascarpino Jan 25, 2024
8fcc466
Decodes PKCS1
ascarpino Feb 24, 2024
659fbb4
Decodes PKCS1
ascarpino Feb 24, 2024
fca32e5
KeySpec
ascarpino Feb 26, 2024
faaea5b
cleanup, added @since, added KeyPair pub/private key decode (untested)
ascarpino Mar 8, 2024
25eb842
implement of()
ascarpino Mar 9, 2024
c5eb599
Add KeySpec check for KeyPair during decode.
ascarpino Mar 9, 2024
5670c9e
Remove default constructor
ascarpino Mar 9, 2024
10c2918
Update javadoc
ascarpino Apr 1, 2024
7bcab97
Update javadoc. Sealed SO.
ascarpino Apr 5, 2024
4f64a0e
Merge branch 'master' into pem
ascarpino Apr 9, 2024
b220432
clean up for this-escape lint change
ascarpino Apr 10, 2024
e76d310
Results of API discussion and cleanup
ascarpino Apr 18, 2024
a215874
Switch from EPS to P8EPS & X509EPS
ascarpino Apr 22, 2024
3f8881f
comment changes
ascarpino Apr 22, 2024
954ad9d
Merge branch 'master' into pem
ascarpino Apr 22, 2024
6f3fd2d
comment/exception updates
ascarpino Apr 24, 2024
24eed10
Doc changes
ascarpino May 1, 2024
05729e6
update
ascarpino May 9, 2024
e0a4c3c
Updating and review
ascarpino Jul 23, 2024
88b6a18
merge
ascarpino Jul 23, 2024
6b1b779
updates
ascarpino Jul 24, 2024
4f688a4
PEMRecord initial, tests pass
ascarpino Jul 25, 2024
9c7bc2b
internal PEMRecord optimization
ascarpino Jul 26, 2024
719ba35
bad test check
ascarpino Jul 26, 2024
49b7291
review comments and optimizations
ascarpino Aug 1, 2024
de154af
pemrecord whitespace
ascarpino Aug 1, 2024
ca53d3d
Merge branch 'pem' into pem-record
ascarpino Aug 3, 2024
e18785e
merge from pem branch
ascarpino Aug 3, 2024
ec608fd
Reorg tests data
ascarpino Aug 6, 2024
8146419
review comments part 2
ascarpino Aug 8, 2024
ec04656
test merge with futures
ascarpino Aug 9, 2024
c8dce84
Implement stream decoding
ascarpino Aug 14, 2024
1000786
fix StringBuffer/Builder
ascarpino Aug 14, 2024
cd53a0d
Merge branch 'master' into pem
ascarpino Aug 15, 2024
b7661a8
test fixes
ascarpino Aug 15, 2024
5812370
test fixes & cleanup
ascarpino Aug 16, 2024
804e73d
comments updates and getPBEID
ascarpino Sep 18, 2024
f1c1b11
fix decoding non-encrypted types
ascarpino Sep 25, 2024
6de472e
partial code review update
ascarpino Oct 16, 2024
cc2c482
Merge branch 'master' into pem
ascarpino Oct 16, 2024
4b3aae0
merge with master & updates
ascarpino Oct 17, 2024
f811452
apparently <p> can't be before a @implNote.. Who know.
ascarpino Oct 21, 2024
9e59cf1
code review comments
ascarpino Nov 3, 2024
23d89ba
Add SEC1-v2 for EC
ascarpino Nov 7, 2024
54e6f7f
Merge branch 'master' into pem
ascarpino Nov 7, 2024
56ec3e7
merge
ascarpino Nov 13, 2024
4c69d04
Merge branch 'master' into pem
ascarpino Nov 23, 2024
7a81824
Factory updates. SEC1v2 updates
ascarpino Nov 25, 2024
f1ae36c
Merge branch 'master' into pem-record
ascarpino Nov 25, 2024
97aa757
Merge branch 'pem-record' into pem-merge
ascarpino Nov 25, 2024
dfaff40
Merge in PEMRecord as part of the API.
ascarpino Dec 12, 2024
58e9402
merge
ascarpino Dec 12, 2024
34aed02
merge
ascarpino Dec 12, 2024
cc952c0
Merge branch 'pem-merge' into pem
ascarpino Dec 12, 2024
99294b7
Merge branch 'master' into pem
ascarpino Jan 7, 2025
cffec97
better comment and remove commented out code
ascarpino Mar 12, 2025
106788e
merge with master
ascarpino Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
View file
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New encrypt and decrypt methods are all password-based and work on keys directly. Old methods uses a decryption key and works on key specs. For completeness; have you thought about more combinations? Maybe at least encryption with a key? I assume an EncryptedPrivateKeyInfo is not only encrypted with a password.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could add some Key related methods.

Original file line number Diff line number Diff line change
@@ -392,7 +392,7 @@ public static EncryptedPrivateKeyInfo encryptKey(PrivateKey key,
/**
* Creates and encrypts an `EncryptedPrivateKeyInfo` from a given PrivateKey
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, you should use {@code} here. Same in @impNote below. Also, there are some other class names that should be in enclosed in {@code}.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

* and password.
* <p>
*
* @implNote The encryption uses the algorithm set by `jdk.epkcs8.defaultAlgorithm`
* Security Property by the default provider and default the
* AlgorithmParameterSpec of that provider.