5567-2.diff
| new/build.xml 2022-07-21 14:42:09 +0000 | ||
|---|---|---|
| 1474 | 1474 | |
| 1475 | 1475 |
<!-- make the sudo input appear on new line --> |
| 1476 | 1476 |
<echo message="${line.separator}"/>
|
| 1477 | ||
| 1478 | 1477 |
<exec dir="${build.home}/native" executable="${native.build.tool}" failonerror="true">
|
| 1479 | 1478 |
<arg value="SONAME=${libname}" />
|
| 1480 | 1479 |
<arg value="SRCDIR=${src.home}/native"/>
|
| 1481 | 1480 |
<arg value="JRE_HOME=${java.home}"/>
|
| 1481 |
<arg value="JVM_LIBPATH=${java.home}/lib/server/"/>
|
|
| 1482 | 1482 |
<arg value="PB=${post.build}"/>
|
| 1483 | 1483 |
<arg value="SPAWN_FOLDER=${spawn.install.folder}"/>
|
| 1484 | 1484 |
<arg value="SRV_CERTS_STORE=${srv.certs}"/>
|
| new/src/com/goldencode/p2j/security/SecureSocketsRegistrar.java 2022-07-21 16:34:22 +0000 | ||
|---|---|---|
| 109 | 109 |
Security.insertProviderAt(BCHolder.JSSE, 2); |
| 110 | 110 |
if (createContext) |
| 111 | 111 |
{
|
| 112 |
ctx = SSLContext.getInstance("TLS", BCHolder.JSSE);
|
|
| 112 |
ctx = SSLContext.getInstance("TLSv1.2", BCHolder.JSSE);
|
|
| 113 | 113 |
} |
| 114 | 114 |
else |
| 115 | 115 |
{
|
| ... | ... | |
| 130 | 130 |
Security.insertProviderAt(CSHolder.SSL, 1); |
| 131 | 131 |
if (createContext) |
| 132 | 132 |
{
|
| 133 |
ctx = SSLContext.getInstance("TLS", "Conscrypt");
|
|
| 133 |
ctx = SSLContext.getInstance("TLSv1.2", "Conscrypt");
|
|
| 134 | 134 |
} |
| 135 | 135 |
} |
| 136 | 136 |
else |
| ... | ... | |
| 144 | 144 |
} |
| 145 | 145 |
if (createContext) |
| 146 | 146 |
{
|
| 147 |
ctx = SSLContext.getInstance("TLS");
|
|
| 147 |
ctx = SSLContext.getInstance("TLSv1.2");
|
|
| 148 | 148 |
} |
| 149 | 149 |
} |
| 150 | 150 |
return ctx; |