|
119 | 119 | <boringsslCheckoutDir>${project.build.directory}/boringssl-${boringsslBranch}/boringssl</boringsslCheckoutDir> |
120 | 120 | <boringsslBuildDir>${boringsslCheckoutDir}/build</boringsslBuildDir> |
121 | 121 | <!-- Latest FIPS compliant boringSSL commit --> |
122 | | - <boringsslBranch>853ca1ea1168dff08011e5d42d94609cc0ca2e27</boringsslBranch> |
| 122 | + <boringsslBranch>6d503ae1cf8b2e25162435225610b8c1f063d6f4</boringsslBranch> |
123 | 123 | <linkStatic>true</linkStatic> |
124 | 124 | <msvcSslIncludeDirs>${boringsslCheckoutDir}/include</msvcSslIncludeDirs> |
125 | | - <msvcSslLibDirs>${boringsslBuildDir}</msvcSslLibDirs> |
126 | | - <msvcSslLibs>ssl.lib;crypto.lib</msvcSslLibs> |
| 125 | + <msvcSslLibDirs>${boringsslBuildDir}/ssl;${boringsslBuildDir}/crypto;${boringsslBuildDir}/decrepit</msvcSslLibDirs> |
| 126 | + <msvcSslLibs>ssl.lib;crypto.lib;decrepit.lib</msvcSslLibs> |
127 | 127 | <jniArch>${os.detected.arch}</jniArch> |
128 | 128 | <project.artifactId>netty-tcnative-boringssl-static-fips</project.artifactId> |
129 | 129 | </properties> |
|
236 | 236 | </if> |
237 | 237 | <exec executable="cmake" failonerror="true" dir="${boringsslBuildDir}" resolveexecutable="true"> |
238 | 238 | <arg value="-DCMAKE_BUILD_TYPE=Release" /> |
239 | | - <arg value="-DCMAKE_POSITION_INDEPENDENT_CODE=TRUE" /> |
240 | 239 | <arg value="-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded" /> |
241 | | - <arg value="-DCMAKE_C_COMPILER=clang" /> |
242 | | - <arg value="-DCMAKE_CXX_COMPILER=clang++" /> |
| 240 | + <arg value="-DCMAKE_C_COMPILER=clang-12" /> |
| 241 | + <arg value="-DCMAKE_CXX_COMPILER=clang++-12" /> |
243 | 242 | <arg value="-DFIPS=1" /> |
244 | 243 | <arg value="-GNinja" /> |
245 | 244 | <arg value="${boringsslCheckoutDir}" /> |
|
261 | 260 | <!-- This is needed to generate bssl execute file to verify isfips property--> |
262 | 261 | <exec executable="${ninjaExecutable}" failonerror="true" dir="${boringsslBuildDir}" resolveexecutable="true"> |
263 | 262 | </exec> |
264 | | - <exec executable="./tool/bssl" failonerror="false" dir="${boringsslBuildDir}" outputproperty="boringssl.isfips.result"> |
| 263 | + <exec executable="./bssl" failonerror="false" dir="${boringsslBuildDir}" outputproperty="boringssl.isfips.result"> |
265 | 264 | <arg value="isfips" /> |
266 | 265 | </exec> |
267 | 266 | <if> |
|
379 | 378 | <configureArg>--libdir=${project.build.directory}/native-build/target/lib</configureArg> |
380 | 379 | <configureArg>CFLAGS=-O3 -Werror -fno-omit-frame-pointer -fvisibility=hidden -Wunused -Wno-unused-value</configureArg> |
381 | 380 | <configureArg>CPPFLAGS=-DHAVE_OPENSSL -I${boringsslCheckoutDir}/include</configureArg> |
382 | | - <configureArg>LDFLAGS=-L${boringsslBuildDir} -lssl -lcrypto</configureArg> |
| 381 | + <configureArg>LDFLAGS=-L${boringsslBuildDir} -lssl -lcrypto -ldecrepit -lstdc++</configureArg> |
383 | 382 | </configureArgs> |
384 | 383 | </configuration> |
385 | 384 | </execution> |
|
0 commit comments