File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1717 <connect .version>0.7.2</connect .version>
1818 <okhttp .version>4.12.0</okhttp .version>
1919 <platform .branch>protocol/go/v0.16.0</platform .branch>
20- <!-- test.java.security.file is set by the `non-fips` (default) or `fips` profile -->
20+ <!-- in the non-FIPS case we don't need to pass anything to the jvm -->
21+ <java .security.properties.test></java .security.properties.test>
22+ <!-- Default empty argLine; overridden by jacoco:prepare-agent when the `coverage` profile is active -->
23+ <argLine ></argLine >
2124 </properties >
2225 <dependencies >
2326 <!-- Logging Dependencies -->
468471 <groupId >org.apache.maven.plugins</groupId >
469472 <artifactId >maven-surefire-plugin</artifactId >
470473 <configuration >
471- <argLine >-Djava.security.properties= ${test. java.security.file } </argLine >
474+ <argLine >@{argLine} ${ java.security.properties.test } </argLine >
472475 </configuration >
473476 </plugin >
474477 </plugins >
477480 <profile >
478481 <id >non-fips</id >
479482 <activation >
480- <activeByDefault >false </activeByDefault >
483+ <activeByDefault >true </activeByDefault >
481484 </activation >
482- <properties >
483- <test .java.security.file>${project.basedir} /src/test/java.security.test</test .java.security.file>
484- </properties >
485485 <dependencies >
486486 <dependency >
487487 <groupId >org.bouncycastle</groupId >
503503 <profile >
504504 <id >fips</id >
505505 <activation >
506- <activeByDefault >true </activeByDefault >
506+ <activeByDefault >false </activeByDefault >
507507 </activation >
508508 <properties >
509- <test . java.security.file> ${project.basedir} /src/test/java.security.fips.test</test . java.security.file >
509+ <java .security.properties.test>-Djava.security.properties= ${project.basedir} /src/test/java.security.fips.test</java .security.properties.test >
510510 </properties >
511511 <dependencies >
512512 <dependency >
Original file line number Diff line number Diff line change 1- # TODO: get rid of the BCt di providers, we should not need them
1+ # the default for these is usually SunX509 but BC doesn't
2+ # support them. tell it to use PKIX instead which is supported by BC
3+ ssl.KeyManagerFactory.algorithm=PKIX
4+ ssl.TrustManagerFactory.algorithm=PKIX
You can’t perform that action at this time.
0 commit comments