Skip to content

Commit b94455e

Browse files
authored
Upgrade to BoringSSL 6d503ae1 (#950)
1. Make the `fips-boringssl-static` profile point to BoringSSL commit `6d503ae1cf8b2e25162435225610b8c1f063d6f4`, which is the latest revision that is available for download as a tarball from https://commondatastorage.googleapis.com/chromium-boringssl-fips 2. Update toolchain to clang-12 (required for compatibility with newer BoringSSL versions) 3. Remove `CMAKE_POSITION_INDEPENDENT_CODE` flag (seems redundant as BoringSSL manages PIC internally) 4. Fix bssl executable path (the `bssl` utility is now generated directly in the build directory rather than in a `tool/` subdirectory) 5. Link with libdecrepit 6. Explicitly link with C++ standard library
1 parent d1173ed commit b94455e

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

boringssl-static/pom.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@
119119
<boringsslCheckoutDir>${project.build.directory}/boringssl-${boringsslBranch}/boringssl</boringsslCheckoutDir>
120120
<boringsslBuildDir>${boringsslCheckoutDir}/build</boringsslBuildDir>
121121
<!-- Latest FIPS compliant boringSSL commit -->
122-
<boringsslBranch>853ca1ea1168dff08011e5d42d94609cc0ca2e27</boringsslBranch>
122+
<boringsslBranch>6d503ae1cf8b2e25162435225610b8c1f063d6f4</boringsslBranch>
123123
<linkStatic>true</linkStatic>
124124
<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>
127127
<jniArch>${os.detected.arch}</jniArch>
128128
<project.artifactId>netty-tcnative-boringssl-static-fips</project.artifactId>
129129
</properties>
@@ -236,10 +236,9 @@
236236
</if>
237237
<exec executable="cmake" failonerror="true" dir="${boringsslBuildDir}" resolveexecutable="true">
238238
<arg value="-DCMAKE_BUILD_TYPE=Release" />
239-
<arg value="-DCMAKE_POSITION_INDEPENDENT_CODE=TRUE" />
240239
<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" />
243242
<arg value="-DFIPS=1" />
244243
<arg value="-GNinja" />
245244
<arg value="${boringsslCheckoutDir}" />
@@ -261,7 +260,7 @@
261260
<!-- This is needed to generate bssl execute file to verify isfips property-->
262261
<exec executable="${ninjaExecutable}" failonerror="true" dir="${boringsslBuildDir}" resolveexecutable="true">
263262
</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">
265264
<arg value="isfips" />
266265
</exec>
267266
<if>
@@ -379,7 +378,7 @@
379378
<configureArg>--libdir=${project.build.directory}/native-build/target/lib</configureArg>
380379
<configureArg>CFLAGS=-O3 -Werror -fno-omit-frame-pointer -fvisibility=hidden -Wunused -Wno-unused-value</configureArg>
381380
<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>
383382
</configureArgs>
384383
</configuration>
385384
</execution>

0 commit comments

Comments
 (0)