Skip to content

Commit f3d3eaf

Browse files
committed
release: add check-symbols and check-security make targets
These are not added to the default checks because some of them depend on release-build configs.
1 parent 475813b commit f3d3eaf

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

Makefile.am

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
2626

2727
DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
2828

29+
BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
30+
$(top_srcdir)/contrib/devtools/security-check.py
31+
2932
WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
3033
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
3134
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
@@ -213,7 +216,7 @@ endif
213216

214217
dist_noinst_SCRIPTS = autogen.sh
215218

216-
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
219+
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
217220

218221
CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
219222

configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ AC_PATH_PROG([GIT], [git])
6464
AC_PATH_PROG(CCACHE,ccache)
6565
AC_PATH_PROG(XGETTEXT,xgettext)
6666
AC_PATH_PROG(HEXDUMP,hexdump)
67+
AC_PATH_TOOL(READELF, readelf)
68+
AC_PATH_TOOL(CPPFILT, c++filt)
6769

6870
dnl pkg-config check.
6971
PKG_PROG_PKG_CONFIG
@@ -936,6 +938,7 @@ AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
936938
AM_CONDITIONAL([USE_COMPARISON_TOOL],[test x$use_comparison_tool != xno])
937939
AM_CONDITIONAL([USE_COMPARISON_TOOL_REORG_TESTS],[test x$use_comparison_tool_reorg_test != xno])
938940
AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
941+
AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes])
939942

940943
AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version])
941944
AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version])

src/Makefile.am

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ if BUILD_BITCOIN_UTILS
7676
bin_PROGRAMS += bitcoin-cli bitcoin-tx
7777
endif
7878

79-
.PHONY: FORCE
79+
.PHONY: FORCE check-symbols check-security
8080
# bitcoin core #
8181
BITCOIN_CORE_H = \
8282
addrman.h \
@@ -459,6 +459,18 @@ clean-local:
459459
$(AM_V_CXX) $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
460460
$(CPPFLAGS) $(AM_CXXFLAGS) $(QT_INCLUDES) $(AM_CXXFLAGS) $(PIE_FLAGS) $(CXXFLAGS) -c -o $@ $<
461461

462+
check-symbols: $(bin_PROGRAMS)
463+
if GLIBC_BACK_COMPAT
464+
@echo "Checking glibc back compat..."
465+
$(AM_V_at) READELF=$(READELF) CPPFILT=$(CPPFILT) $(top_srcdir)/contrib/devtools/symbol-check.py < $(bin_PROGRAMS)
466+
endif
467+
468+
check-security: $(bin_PROGRAMS)
469+
if HARDEN
470+
@echo "Checking binary security..."
471+
$(AM_V_at) READELF=$(READELF) OBJDUMP=$(OBJDUMP) $(top_srcdir)/contrib/devtools/security-check.py < $(bin_PROGRAMS)
472+
endif
473+
462474
%.pb.cc %.pb.h: %.proto
463475
@test -f $(PROTOC)
464476
$(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(abspath $(<D) $<)

0 commit comments

Comments
 (0)