Commit 71334963 authored by Johannes Berg's avatar Johannes Berg
Browse files

wireless: replace usage of hexdump with od/sed 



Since od/sed are in posix, hopefully there's a better chance
people will have them, over hexdump.

Fixes: 90a53e44 ("cfg80211: implement regdb signature checking")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent ccab371f

net/wireless/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ $(obj)/shipped-certs.c: $(wildcard $(srctree)/$(src)/certs/*.x509) 
	@$(kecho) "  GEN     $@"

	@echo '#include "reg.h"' > $@

	@echo 'const u8 shipped_regdb_certs[] = {' >> $@

	@for f in $^ ; do hexdump -v -e '1/1 "0x%.2x," "\n"' < $$f >> $@ ; done

	@for f in $^ ; do od -An -v -tx1 < $$f | sed -e 's/ /\n/g' | sed -e 's/^[0-9a-f]\+$$/\0/;t;d' | sed -e 's/^/0x/;s/$$/,/' >> $@ ; done

	@echo '};' >> $@

	@echo 'unsigned int shipped_regdb_certs_len = sizeof(shipped_regdb_certs);' >> $@
@@ -36,6 +36,6 @@ $(obj)/extra-certs.c: $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR:"%"=%) \ 
	@$(kecho) "  GEN     $@"

	@echo '#include "reg.h"' > $@

	@echo 'const u8 extra_regdb_certs[] = {' >> $@

	@for f in $^ ; do test -f $$f && hexdump -v -e '1/1 "0x%.2x," "\n"' < $$f >> $@ || true ; done

	@for f in $^ ; do test -f $$f && od -An -v -tx1 < $$f | sed -e 's/ /\n/g' | sed -e 's/^[0-9a-f]\+$$/\0/;t;d' | sed -e 's/^/0x/;s/$$/,/' >> $@ ; done

	@echo '};' >> $@

	@echo 'unsigned int extra_regdb_certs_len = sizeof(extra_regdb_certs);' >> $@

CRA Git | Maintained and supported by SUSTech CRA and CCSE