Commit 3301ca2
#13 isn't a perfect revert of 0af22dc limited to SSLContextImpl.java and
SunJSSE.java, since it doesn't remove the SharedSecrets import. This was
already in this way in rh2020290-support_tls_1_3_in_fips.v1.patch, I'm
now realizing this when doing the OpenJDK 11 backport and retrying the
same approach in OpenJDK 17:
~~~
# Revert #13
git show 0bd5ca9 | git apply -R
# Redo #13 by reverting 0af22dc in SSLContextImpl.java and SunJSSE.java
git show 0af22dc |
git apply -R --include=src/java.base/share/classes/sun/security/ssl/*
~~~
In #14, I forgot to delete the DHKF and DHKFLock static
variables from FIPSKeyImporter, which are no longer used,
see #14 (comment).
Reviewed-by: @gnu-andrew
1 parent 779f6ce commit 3301ca2
File tree
2 files changed
+1
-6
lines changed- src
2 files changed
+1
-6
lines changedLines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
36 | 35 | | |
37 | 36 | | |
38 | 37 | | |
| |||
Lines changed: 1 addition & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | 75 | | |
79 | 76 | | |
80 | 77 | | |
| |||
319 | 316 | | |
320 | 317 | | |
321 | 318 | | |
322 | | - | |
323 | | - | |
| 319 | + | |
324 | 320 | | |
325 | 321 | | |
326 | 322 | | |
| |||
0 commit comments