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.

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

FIPS work Integration #30557

Open
wants to merge 138 commits into
base: integration
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
6f1eb56
Supporting FIPS work
mshah0722 Sep 12, 2024
7efb1ad
Minor bug fixes
mshah0722 Sep 13, 2024
5f4264e
Minor changes
mshah0722 Sep 16, 2024
9530112
Use the common crypto bundle
utle Sep 18, 2024
67ca4cb
Create the Provider class
utle Sep 18, 2024
3b6d858
clean up
utle Sep 18, 2024
a671f21
Adding support to client and server for java 17
mshah0722 Sep 19, 2024
a90e9bf
Rename generate3DESKey method to generateSharedKey
utle Sep 19, 2024
85c2c57
Merge branch 'OpenLiberty:integration' into FIPSwork
mshah0722 Sep 24, 2024
a4fa8ba
Fixing some test bugs
mshah0722 Sep 24, 2024
e1cbd56
Merge branch 'FIPSwork' of github.com:mshah0722/open-liberty into HEAD
mshah0722 Sep 24, 2024
cf9acf4
Merge pull request #1 from utle/FIPSwork
mshah0722 Sep 24, 2024
d65866e
Minor bugs
mshah0722 Sep 24, 2024
c04b999
Added debug msgs
utle Sep 26, 2024
2123cf5
SSL to use crypto common code
utle Oct 1, 2024
af2fe51
Merge pull request #2 from utle/FIPSwork
mshah0722 Oct 2, 2024
7df6665
Merge branch 'OpenLiberty:integration' into FIPSwork
mshah0722 Oct 2, 2024
cde667d
Restrict TLS versions for FIPS
mshah0722 Oct 2, 2024
2f16885
Merge branch 'FIPSwork' of github.com:mshah0722/open-liberty into FIP…
mshah0722 Oct 2, 2024
dea7785
Restrict TLS versions for FIPS
mshah0722 Oct 3, 2024
ebaadc1
Handle Semeru
utle Oct 8, 2024
0d67b38
Merging Ut's code
mshah0722 Oct 8, 2024
1692ecf
add common crypto to ssl feature
utle Oct 9, 2024
d15c6d4
Merge pull request #4 from utle/FIPSwork
mshah0722 Oct 9, 2024
ed707fa
enable openJCEPlusFips
utle Oct 9, 2024
6186795
clean up
utle Oct 10, 2024
11f08a2
Merge pull request #5 from utle/FIPSwork
mshah0722 Oct 10, 2024
3bc4615
enable openJCEPlusFips
utle Oct 9, 2024
3bcc438
Merge remote-tracking branch 'ut_branch/FIPSwork' into FIPSwork
mshah0722 Oct 10, 2024
a1994c1
Merge branch 'OpenLiberty:integration' into FIPSwork
mshah0722 Oct 11, 2024
970a6b0
Unit Test fixes
mshah0722 Oct 15, 2024
8c7c751
Creating a new key when fips is enabled for testing
mshah0722 Oct 15, 2024
4945dd0
Creating a new key when fips is enabled for testing
mshah0722 Oct 15, 2024
e8b065f
Create and place the CryptoUtils in the kernel
utle Oct 16, 2024
9ee1666
Merge pull request #6 from utle/FIPSwork
mshah0722 Oct 17, 2024
34bec6f
Merge branch 'OpenLiberty:integration' into FIPSwork
mshah0722 Oct 17, 2024
7ed4cdc
missing package rename
utle Oct 18, 2024
9dac988
Merge pull request #7 from utle/FIPSwork
mshah0722 Oct 18, 2024
9050a1e
FIPS enabled FAT fixes
mshah0722 Oct 18, 2024
4451b60
Fixing pre-generated keys
mshah0722 Oct 24, 2024
9105bfa
testing
utle Oct 23, 2024
e4b0eee
Fixing FAT Failures
mshah0722 Oct 24, 2024
4669aa6
Fixing FAT Failures
mshah0722 Oct 25, 2024
22985dd
Merge branch 'OpenLiberty:integration' into FIPSwork
mshah0722 Oct 25, 2024
8ee0b37
Merge pull request #8 from utle/FIPSwork
mshah0722 Oct 28, 2024
d2b896b
Fixing FAT failures
mshah0722 Oct 28, 2024
645cea3
Merge branch 'OpenLiberty:integration' into FIPSwork
mshah0722 Oct 28, 2024
93fc275
import the missing package
utle Oct 23, 2024
96c8027
Merge pull request #9 from utle/FIPSwork
mshah0722 Oct 29, 2024
33b726c
Fixing FAT issues
mshah0722 Oct 29, 2024
8aff894
import the missing package
utle Oct 23, 2024
9ed093a
Fixing FAT errors
mshah0722 Oct 29, 2024
0a5c5cd
Minor bug with loading pre-generated keys
mshah0722 Oct 30, 2024
542a8c6
FAT fixes
mshah0722 Oct 30, 2024
93354d7
Merge branch 'FIPSwork' into FIPSwork
mshah0722 Oct 30, 2024
28aacf9
Merge pull request #10 from utle/FIPSwork
mshah0722 Oct 30, 2024
86573ad
FAT fixes
mshah0722 Oct 31, 2024
486a7e7
Removve com.ibm.ws.common.crypto
utle Oct 31, 2024
d79151d
Support FIPS140-3
utle Feb 6, 2024
777e255
clean up
utle Feb 28, 2024
2f5705d
audit to use the common crypto code
utle Oct 17, 2024
3575aab
get the right jdk provider
utle Oct 22, 2024
6560196
Refactor encrypt and decrypt methods
utle Oct 23, 2024
09d399a
add trivial
utle Oct 23, 2024
4fe7b25
Increase log max allow
utle Oct 23, 2024
4747b5f
Clean up
utle Nov 1, 2024
11f92b9
comments out the @Trivial
utle Nov 2, 2024
a518788
add debug msg
utle Nov 2, 2024
3958c32
Merge branch 'FIPSwork' into FIPSwork
mshah0722 Nov 4, 2024
d6c428f
Merge pull request #11 from utle/FIPSwork
mshah0722 Nov 4, 2024
43f02a0
Fixing FAT Failures
mshah0722 Nov 4, 2024
e2c89c2
Adding the last few missing FIPS keys
mshah0722 Nov 4, 2024
2a7132f
Remove comments code
utle Nov 5, 2024
e18ce98
Going through LTPA FAT Failures
mshah0722 Nov 7, 2024
7279b4e
Updating leftover buildpaths
mshah0722 Nov 7, 2024
7ce5c8a
Merge branch 'OpenLiberty:integration' into FIPSwork
mshah0722 Nov 7, 2024
efcd6d7
Updating leftover buildpaths
mshah0722 Nov 11, 2024
4938465
Merge branch 'OpenLiberty:integration' into FIPSwork
mshah0722 Nov 11, 2024
d51fe74
Fixing FAT Failures
mshah0722 Nov 12, 2024
eb774fe
Merge branch 'OpenLiberty:integration' into FIPSwork
mshah0722 Nov 12, 2024
5946a39
Compile error
mshah0722 Nov 13, 2024
45259ba
Using RSA algorithm
utle Nov 8, 2024
8d27f64
Merge pull request #12 from utle/FIPSwork-audit
mshah0722 Nov 13, 2024
7272e84
Merge branch 'OpenLiberty:integration' into FIPSwork
mshah0722 Nov 13, 2024
71b39fb
Remove check for the provider class available
utle Nov 13, 2024
742fc4a
Merge pull request #13 from utle/FIPSwork-audit
mshah0722 Nov 13, 2024
788ba59
Move messageDigest getInstance to CryptoUtil
utle Nov 13, 2024
948746f
Merge branch 'FIPSwork' into FIPSwork-audit
mshah0722 Nov 14, 2024
21c5233
Merge pull request #14 from utle/FIPSwork-audit
mshah0722 Nov 14, 2024
1f830a9
Resolving BVT issue
mshah0722 Nov 15, 2024
d66af10
Testing new LibertyServer code
mshah0722 Nov 19, 2024
62e0fee
Merge branch 'OpenLiberty:integration' into FIPSwork
mshah0722 Nov 19, 2024
bc356e8
Remove duplicate change
mshah0722 Nov 19, 2024
be73698
Minor modifications
mshah0722 Nov 19, 2024
3882f79
Reading ltpaFIPS keys in fattest simplicity
mshah0722 Nov 21, 2024
0e44da4
Undo changes for LogPolice
utle Nov 21, 2024
1a9e43e
Merge pull request #15 from utle/FIPSwork
mshah0722 Nov 21, 2024
f463d8d
Merge branch 'OpenLiberty:integration' into FIPSwork
mshah0722 Nov 21, 2024
2d41210
Avoid null issue in message digest initialization
mshah0722 Nov 22, 2024
3ef613f
Working through FAT Failures
mshah0722 Nov 27, 2024
a1af68e
Merge branch 'OpenLiberty:integration' into FIPSwork
mshah0722 Nov 27, 2024
28144eb
Working through FAT Failures
mshah0722 Nov 27, 2024
7ffa5ea
Merge branch 'OpenLiberty:integration' into FIPSwork
mshah0722 Nov 29, 2024
fdc3bdc
Fixing md1 null issue
mshah0722 Dec 3, 2024
2bf5548
Removing whiteshpace changes
mshah0722 Dec 3, 2024
e1710ed
Fixed code review comments
utle Dec 5, 2024
bce29d1
Merge branch 'release' of github.com:OpenLiberty/open-liberty into FI…
mshah0722 Dec 5, 2024
3ad7449
add com.ibm.ws.common.crypto trace
jimmy1wu Dec 6, 2024
993e11d
add com.ibm.ws.common.crypto trace
jimmy1wu Dec 6, 2024
f3c0461
add com.ibm.ws.common.crypto trace
jimmy1wu Dec 6, 2024
5724017
add com.ibm.ws.common.crypto trace
jimmy1wu Dec 6, 2024
97519eb
add com.ibm.ws.common.crypto trace
jimmy1wu Dec 6, 2024
7cba0b1
fix up some traces
jimmy1wu Dec 6, 2024
e3a2701
Merge pull request #17 from jimmy1wu/FIPSwork
jimmy1wu Dec 6, 2024
ce47641
Updating LibertyServer class so that other tests can configure LTPA k…
jacobwdv Dec 7, 2024
13ef519
Merge branch 'release' of github.com:OpenLiberty/open-liberty into FI…
mshah0722 Dec 9, 2024
2cc2473
Fixing SSL and beta mode issue for Java 8
mshah0722 Dec 9, 2024
b94e4cf
Fixed the issue with IBMJCEPlusFIPSprovider not loading properly
mshah0722 Dec 10, 2024
cfa215e
Merge branch 'release' of github.com:OpenLiberty/open-liberty into FI…
mshah0722 Dec 10, 2024
29dbbba
Merge branch 'FIPSwork' of github.com:mshah0722/open-liberty into FIP…
utle Dec 13, 2024
914ebe7
Fixed 140-2 check and adding more debug
utle Dec 13, 2024
dd20353
adding more check
utle Dec 13, 2024
48badd8
Merge branch 'release' of github.com:OpenLiberty/open-liberty into FI…
mshah0722 Dec 13, 2024
73c9080
adding more check
utle Dec 13, 2024
4569d99
Merge branch 'FIPSwork' of github.com:utle/open-liberty into FIPSwork
mshah0722 Dec 13, 2024
b66c91c
Merge branch 'release' of github.com:OpenLiberty/open-liberty into FI…
mshah0722 Dec 14, 2024
adda4f7
updating server xml's with appropriate passwords, renaming serverFIPS…
jacobwdv Dec 12, 2024
15c328a
wip
jacobwdv Dec 16, 2024
c3d2bc5
Merge branch 'release' of github.com:OpenLiberty/open-liberty into FI…
mshah0722 Dec 18, 2024
f9d5812
Merge pull request #18 from jacobwdv/JD_LTPAKeyTest
mshah0722 Dec 18, 2024
3253d05
Merge branch 'FIPSwork' of github.com:mshah0722/open-liberty into FIP…
mshah0722 Dec 18, 2024
3221f8e
Merge remote-tracking branch 'origin/release' into FIPSwork_01072025
jimmy1wu Jan 7, 2025
4689e3d
Handle FIPS 140-2 and 140-3 separated to keep the current behavior
utle Jan 8, 2025
58df82d
Merge remote-tracking branch 'ut_fork/FIPSwork' into FIPSwork_01072025
jimmy1wu Jan 8, 2025
d39aee3
Fixed FIPS140-2 enabled
utle Jan 10, 2025
9fa333d
remove duplicate ltpa config in nonFIPS case
jimmy1wu Jan 10, 2025
e3eb7a1
comment out common.crypto trace
jimmy1wu Jan 13, 2025
80990c0
Merge branch 'FIPSwork_01072025' of github.com:jimmy1wu/open-liberty …
mshah0722 Jan 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#Fri Sep 13 14:24:02 PDT 2024
com.ibm.websphere.CreationDate=Fri Sep 13 14\:23\:52 PDT 2024
com.ibm.websphere.ltpa.version=1.0
com.ibm.websphere.ltpa.3DESKey=9KfdS15V4ujMTvaYSYEnESiQaiPIQEN9lZFH+w5EpJ07FkUM+sPxiF83QqOSdinQ
com.ibm.websphere.CreationHost=localhost
com.ibm.websphere.ltpa.PrivateKey=NweYlrwEnk7++//sSn6DVF+RRegEnryv67yZ5y6NeIqP0TFkkszUqVWoh58n87dm4UTgP5CRJcHv7p79yEgpVkTJjfW7cUTujtGXUO9JGcdVFqS6kE37fHhWwpDLaCCln9M1/ef0ZjyC+ciZWScgoVGLpaJTcX7i9hsAM/1xUl2mKoWMVNEPecnUBsz4+8rZRWQD0i2QjOLmKQKljcOWw+11byOZZwyKgiqWN/S3q/ILLdhQMFfCnwWCHxsbqKsp5lKvX48LFHk2d7Ig1DtpdIMdRjTT0qeMfFSMtmeMBPAZMwpLFOsn0IZCzwUFeXmwH15NIFt4WwOpo4kVFOgn0wxqgii787+/l79XLT+Gq2tJpMP5HQbXrNDByp+ZdXoIsHWGM9jKC61BJlLX/WZ5GwND4yRQRhPx15K48XYxpTn6PZc7oK924HxWY6tJF3wjrGKE7l5PNdVTo39ZO3tTrHXxVAxiT0GS2Ct/Ikq8qIfPV0SvOOyWpAef4Oq2LXD9S2vyLC4OmECeXmGpEHkksZEN39Pfxiv3CCf3ImDdPQhKr79GcjUjimGeMTBQUxNLNltQwYImtBjL8yUSLwEpUn+cPSOLznKtrVtundbQL22aMKkg9z1n7hsY/0KkDliSWtAhxFukiKrlNZBxFtsmmF8ehj+PjOaRTJwEqvpoYLvNyAW5F80xpMBBt0580yG6nhm2scSonmShJg\=\=
com.ibm.websphere.ltpa.Realm=BasicRealm
com.ibm.websphere.ltpa.PublicKey=AKibrRdG/x9EW1aW6wXya0oGmis22cdZniIX4Z2Tyb1y7c/9CeRLJqIFbSPe+MAVTjvFSuUFLj2vfL9ih+QcsWW/t5ZJjVJL2zkve5aUaPLIqSRe+727o0TEHNMW8/odQq+zYdj4yZahgJp5YpuCgR9bs7wMVpDaKxCRD37fQao96HgaFCCl0s2iqJaOD5L/EQX51MMlV3zxUQgsbT5ItbnzWAW57AQ4hGi6v4L+y1fIm2mpA/xvB8GugOZv3TGU3W8QPIFjnsIH3V6Ff+hkwQAsjuuGaeA/Gs4xtoRat/BQe4u6KwRCpoz2e3Q6k6sAiAsB8GHoNwvLYPHXwdeG/JkBAAE\=
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Subsystem-Name: SAML Web Single Sign-On 2.0
-bundles=\
io.openliberty.org.apache.commons.logging, \
io.openliberty.org.apache.commons.codec, \
com.ibm.ws.org.jose4j, \
com.ibm.ws.crypto.common
com.ibm.ws.org.jose4j
kind=ga
edition=core
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Subsystem-Name: Secure Socket Layer 1.0
com.ibm.ws.channel.ssl, \
com.ibm.websphere.security, \
com.ibm.ws.crypto.certificateutil, \
com.ibm.ws.crypto.common, \
io.openliberty.wsoc.ssl.internal, \
io.openliberty.endpoint, \
io.openliberty.io.netty, \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Subsystem-Name: Web Service Security 1.1
io.openliberty.wsSecurity1.1.internal.jaxws-2.2; ibm.tolerates:="3.0,4.0,11.0", \
io.openliberty.org.bouncycastle
-bundles=\
io.openliberty.org.apache.commons.logging, \
com.ibm.ws.crypto.common
io.openliberty.org.apache.commons.logging
kind=ga
edition=base
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# IBM Corporation - initial API and implementation
###############################################################################

#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.common.crypto.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
bootstrap.include=../testports.properties

#com.ibm.ws.logging.trace.specification=*=info=enabled:webcontainer=all=enabled:com.ibm.ws.webcontainer*=all=enable:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# IBM Corporation - initial API and implementation
###############################################################################

#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.common.crypto.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
bootstrap.include=../testports.properties

#com.ibm.ws.logging.trace.specification=*=info=enabled:webcontainer=all=enabled:com.ibm.ws.webcontainer*=all=enable:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# IBM Corporation - initial API and implementation
###############################################################################

#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.common.crypto.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
bootstrap.include=../testports.properties

#com.ibm.ws.logging.trace.specification=*=info=enabled:webcontainer=all=enabled:com.ibm.ws.webcontainer*=all=enable:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# IBM Corporation - initial API and implementation
###############################################################################

#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.common.crypto.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
bootstrap.include=../testports.properties

#com.ibm.ws.logging.trace.specification=*=info=enabled:webcontainer=all=enabled:com.ibm.ws.webcontainer*=all=enable:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#Fri Sep 13 14:24:02 PDT 2024
com.ibm.websphere.CreationDate=Fri Sep 13 14\:23\:52 PDT 2024
com.ibm.websphere.ltpa.version=1.0
com.ibm.websphere.ltpa.3DESKey=9KfdS15V4ujMTvaYSYEnESiQaiPIQEN9lZFH+w5EpJ07FkUM+sPxiF83QqOSdinQ
com.ibm.websphere.CreationHost=localhost
com.ibm.websphere.ltpa.PrivateKey=NweYlrwEnk7++//sSn6DVF+RRegEnryv67yZ5y6NeIqP0TFkkszUqVWoh58n87dm4UTgP5CRJcHv7p79yEgpVkTJjfW7cUTujtGXUO9JGcdVFqS6kE37fHhWwpDLaCCln9M1/ef0ZjyC+ciZWScgoVGLpaJTcX7i9hsAM/1xUl2mKoWMVNEPecnUBsz4+8rZRWQD0i2QjOLmKQKljcOWw+11byOZZwyKgiqWN/S3q/ILLdhQMFfCnwWCHxsbqKsp5lKvX48LFHk2d7Ig1DtpdIMdRjTT0qeMfFSMtmeMBPAZMwpLFOsn0IZCzwUFeXmwH15NIFt4WwOpo4kVFOgn0wxqgii787+/l79XLT+Gq2tJpMP5HQbXrNDByp+ZdXoIsHWGM9jKC61BJlLX/WZ5GwND4yRQRhPx15K48XYxpTn6PZc7oK924HxWY6tJF3wjrGKE7l5PNdVTo39ZO3tTrHXxVAxiT0GS2Ct/Ikq8qIfPV0SvOOyWpAef4Oq2LXD9S2vyLC4OmECeXmGpEHkksZEN39Pfxiv3CCf3ImDdPQhKr79GcjUjimGeMTBQUxNLNltQwYImtBjL8yUSLwEpUn+cPSOLznKtrVtundbQL22aMKkg9z1n7hsY/0KkDliSWtAhxFukiKrlNZBxFtsmmF8ehj+PjOaRTJwEqvpoYLvNyAW5F80xpMBBt0580yG6nhm2scSonmShJg\=\=
com.ibm.websphere.ltpa.Realm=BasicRealm
com.ibm.websphere.ltpa.PublicKey=AKibrRdG/x9EW1aW6wXya0oGmis22cdZniIX4Z2Tyb1y7c/9CeRLJqIFbSPe+MAVTjvFSuUFLj2vfL9ih+QcsWW/t5ZJjVJL2zkve5aUaPLIqSRe+727o0TEHNMW8/odQq+zYdj4yZahgJp5YpuCgR9bs7wMVpDaKxCRD37fQao96HgaFCCl0s2iqJaOD5L/EQX51MMlV3zxUQgsbT5ItbnzWAW57AQ4hGi6v4L+y1fIm2mpA/xvB8GugOZv3TGU3W8QPIFjnsIH3V6Ff+hkwQAsjuuGaeA/Gs4xtoRat/BQe4u6KwRCpoz2e3Q6k6sAiAsB8GHoNwvLYPHXwdeG/JkBAAE\=
8 changes: 0 additions & 8 deletions dev/com.ibm.ws.crypto.common/.classpath

This file was deleted.

3 changes: 0 additions & 3 deletions dev/com.ibm.ws.crypto.common/.gitignore

This file was deleted.

23 changes: 0 additions & 23 deletions dev/com.ibm.ws.crypto.common/.project

This file was deleted.

2 changes: 0 additions & 2 deletions dev/com.ibm.ws.crypto.common/.settings/bndtools.core.prefs

This file was deleted.

This file was deleted.

Loading