From patchwork Thu Dec 17 14:47:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 11979923 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D860DC4361B for ; Thu, 17 Dec 2020 14:48:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 91A6B21534 for ; Thu, 17 Dec 2020 14:48:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726012AbgLQOsv (ORCPT ); Thu, 17 Dec 2020 09:48:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725468AbgLQOsv (ORCPT ); Thu, 17 Dec 2020 09:48:51 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7EC9C061794 for ; Thu, 17 Dec 2020 06:48:10 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id d13so8611706wrc.13 for ; Thu, 17 Dec 2020 06:48:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Fa9qT/pKkw/u/yVwCkGC3Mjio8P5+Oq6XKmyiCUuGOk=; b=n7uFZE2GYBtORWS9/lat3iorMlnJifNe4eS5mceKLe58SAp3NRXjhFgk4sG5B3YFWn xVVWnCxe8xNAGqEAbBBGFiUhIkxFY5pZXw7BcQ049Pi8CDOSzWLbBCYYFU0p5xsDOoJ/ rRqVpbuac3xizkcPbGgC79FZQyKWvVMqiv7JLMC+LCTBTONAWQAcpx9YZ0NoblTjYcMz yRQ7XF3lmkzV0pDOMagwTVhJ/volAP6XKhh7b8/0zs9mUpNuVDH9m0dY3Fg4MlqMOPdm WEfhfflZ4UKUxRMOooyDDGeJL6ZOT/Q7NfftKCh3mQ2xyOGlxTZCcp2nWgoEOgdUSU8/ P8+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Fa9qT/pKkw/u/yVwCkGC3Mjio8P5+Oq6XKmyiCUuGOk=; b=G7fI9Cy7rYoGQyRIsaXwwMSQy2Uslz2T0pcg8erUZFw3DeFQoybRn9DFZN+mNqk9nF jQFDHNWbl7tuDiRLws9iIjrI0TAmoBSRBkKEgiN9kfVw5xavPRgPp0gX1yuinNQISi+4 JOgk19+FMGhGAUG9RLXk9HBwGRoOFlOlvQFbcfURT0E8+wB6lAKg255VpS7HdbZpryLN aOkMjbHHmBlMD6Pg3RckC2dezDyWoTy2Noa0LTS0uKb6JfW9PYoyfmLfW+yyy1a4LH3D ebO626KHD/8ch33MwrvlzgCW7tSMksxHCuIUYowjoRzcfdeF+E6zx5owr/tcPTSUlH63 4hvQ== X-Gm-Message-State: AOAM532ttsxT6su5ju8QfMbquFf9oNVu0yVns5mkTvcfw7akJ3eGmqEo FSq9chibetUv9aPsSBxTBi5B6F2jB5BHJg== X-Google-Smtp-Source: ABdhPJwyM2dJcd3YtgjSiW0UUlE5xXdU7TlqYlsZhB/ncogAVHM/3J6R1HhHEig+H2A7kLaHg6bPww== X-Received: by 2002:a5d:51cc:: with SMTP id n12mr36626880wrv.375.1608216488986; Thu, 17 Dec 2020 06:48:08 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o83sm8241761wme.21.2020.12.17.06.48.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Dec 2020 06:48:07 -0800 (PST) From: luca.boccassi@gmail.com To: linux-fscrypt@vger.kernel.org Cc: ebiggers@google.com Subject: [fsverity-utils PATCH v2 1/2] Remove unneeded includes Date: Thu, 17 Dec 2020 14:47:48 +0000 Message-Id: <20201217144749.647533-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org From: Luca Boccassi Signed-off-by: Luca Boccassi --- v2: do not remove includes from fsverity_uapi.h, actually needed programs/cmd_enable.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/cmd_enable.c b/programs/cmd_enable.c index fdf26c7..14c3c17 100644 --- a/programs/cmd_enable.c +++ b/programs/cmd_enable.c @@ -14,7 +14,6 @@ #include #include #include -#include static bool read_signature(const char *filename, u8 **sig_ret, u32 *sig_size_ret) From patchwork Thu Dec 17 14:47:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 11979925 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAF92C4361B for ; Thu, 17 Dec 2020 14:48:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6390321534 for ; Thu, 17 Dec 2020 14:48:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727185AbgLQOsx (ORCPT ); Thu, 17 Dec 2020 09:48:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725468AbgLQOsw (ORCPT ); Thu, 17 Dec 2020 09:48:52 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 211E4C0617A7 for ; Thu, 17 Dec 2020 06:48:12 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id y17so26839016wrr.10 for ; Thu, 17 Dec 2020 06:48:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qQ8C7QFnsbE++j75BRHVJrliSA9jHzBjsFXkmu3iVxE=; b=jpqbVgGmz1JzZ8d8RfzSAzyMOALGMDTeFKtq4/3hxf/eBXYCP/kD69/Udk8f2yE7Hv XBYCV/yUfAZSQQsJ2KEgRNS9bJMtAg/sOxZYlAr/GFNLrHePC0AudPdgSBsp+y26nBHv rcTeWjs6Nh7lVWNWe5hj9UDHu+PkT6/+e6Q0AgR8k5u7zg2qFCcGP0muHiK/qNKkeTak Sv/M/XfDxm5ztGltkn7e801FySKEsjM1FJuO/CqKIcdWigDcL1dB341Oq2Q5LhHvNiKK R2RSNFOOqswUH/sczZGipRTbv5gcDKh7D5Nn0mHwqSXic9JDwqH7PcqOEKGTcgLUBL2d jv5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qQ8C7QFnsbE++j75BRHVJrliSA9jHzBjsFXkmu3iVxE=; b=ss6q/XKCt4DkL7/RETrVhvRUTKXNOF5LZUQnhdYFSVXhltdY7EGDxhni8AtGRre5pj DzZbF/PV+KDWj7PmAuY4yZ/4T18GUsvQ06ITukbCraKft5gdiJmbywBNXEf3q6hG+mCb a7SaeY7taGq5os8fik0Xm6tW2HeVtC7wKy/kM4t+MsiYltMDjnATW/MtOo/zoJH+wr2u yEWZyV22d1Q9e63ZRDBlwj0VQnw16Uj7y2GWB2ZlfarINYoJt0YghYfoW7g2/4u0RRi+ fY+7Op+mzDJDy2gc2lGpkM9elGN79pLIuz4c/QmPEbd35VqsACOz7A2LOt+2TiS/JGIU hjJQ== X-Gm-Message-State: AOAM530okzev+3LgnbK2Fk+pgP+7ru7gN39rggOF1psKTBx+lhWIKmLW Ks2hky4X8bsM18BPRuw/7Ug97RAhh0i2Pw== X-Google-Smtp-Source: ABdhPJzqIxBLcnxqKSV41qn3Qctmd1KumQjMivFsBI3C23QSqpSacoMbGXKO0aT/KmZAHnwxDDNq+g== X-Received: by 2002:adf:fd41:: with SMTP id h1mr43800934wrs.284.1608216490466; Thu, 17 Dec 2020 06:48:10 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m81sm8601660wmf.29.2020.12.17.06.48.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Dec 2020 06:48:09 -0800 (PST) From: luca.boccassi@gmail.com To: linux-fscrypt@vger.kernel.org Cc: ebiggers@google.com Subject: [fsverity-utils PATCH v2 2/2] Allow to build and run sign/digest on Windows Date: Thu, 17 Dec 2020 14:47:49 +0000 Message-Id: <20201217144749.647533-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201217144749.647533-1-luca.boccassi@gmail.com> References: <20201217144749.647533-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org From: Luca Boccassi Add some minimal compat type defs, and stub out the enable/measure sources. Also add a way to handle the fact that mingw adds a .exe extension automatically in the Makefile install rules, and that there is not pkg-config and the libcrypto linker flag is different. Signed-off-by: Luca Boccassi --- v2: rework the stubbing out to detect mingw in the Makefile and remove sources from compilation, instead of ifdefs. add a new common/win32_defs.h for the compat definitions. define strerror_r using strerror_s. To compile with mingw: make CC=x86_64-w64-mingw32-gcc-8.3-win32 note that the openssl headers and a win32 libcrypto.dll need to be available in the default search paths, and otherwise have to be specified as expected via CPPFLAGS/LDFLAGS Makefile | 36 ++++++++++++++++++------- common/common_defs.h | 2 ++ common/fsverity_uapi.h | 2 ++ common/win32_defs.h | 61 ++++++++++++++++++++++++++++++++++++++++++ lib/utils.c | 11 +++++++- programs/fsverity.c | 2 ++ programs/utils.c | 2 +- 7 files changed, 105 insertions(+), 11 deletions(-) create mode 100644 common/win32_defs.h diff --git a/Makefile b/Makefile index bfe83c4..cc62818 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,11 @@ cc-option = $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null > /dev/null 2>&1; \ then echo $(1); fi) +# Support building with MinGW for minimal Windows fsverity.exe +ifneq ($(findstring -mingw,$(shell $(CC) -dumpmachine 2>/dev/null)),) +MINGW = 1 +endif + CFLAGS ?= -O2 override CFLAGS := -Wall -Wundef \ @@ -62,7 +67,14 @@ BINDIR ?= $(PREFIX)/bin INCDIR ?= $(PREFIX)/include LIBDIR ?= $(PREFIX)/lib DESTDIR ?= +ifneq ($(MINGW),1) PKGCONF ?= pkg-config +LIBCRYPTO := -lcrypto +else +PKGCONF := false +LIBCRYPTO := -l:libcrypto.dll +EXEEXT := .exe +endif # Rebuild if a user-specified setting that affects the build changed. .build-config: FORCE @@ -81,15 +93,15 @@ PKGCONF ?= pkg-config DEFAULT_TARGETS := COMMON_HEADERS := $(wildcard common/*.h) -LDLIBS := $(shell "$(PKGCONF)" libcrypto --libs 2>/dev/null || echo -lcrypto) +LDLIBS := $(shell "$(PKGCONF)" libcrypto --libs 2>/dev/null || echo $(LIBCRYPTO)) CFLAGS += $(shell "$(PKGCONF)" libcrypto --cflags 2>/dev/null || echo) # If we are dynamically linking, when running tests we need to override # LD_LIBRARY_PATH as no RPATH is set ifdef USE_SHARED_LIB -RUN_FSVERITY = LD_LIBRARY_PATH=./ ./fsverity +RUN_FSVERITY = LD_LIBRARY_PATH=./ ./fsverity$(EXEEXT) else -RUN_FSVERITY = ./fsverity +RUN_FSVERITY = ./fsverity$(EXEEXT) endif ############################################################################## @@ -99,6 +111,9 @@ endif SOVERSION := 0 LIB_CFLAGS := $(CFLAGS) -fvisibility=hidden LIB_SRC := $(wildcard lib/*.c) +ifeq ($(MINGW),1) +LIB_SRC := $(filter-out lib/enable.c,${LIB_SRC}) +endif LIB_HEADERS := $(wildcard lib/*.h) $(COMMON_HEADERS) STATIC_LIB_OBJ := $(LIB_SRC:.c=.o) SHARED_LIB_OBJ := $(LIB_SRC:.c=.shlib.o) @@ -141,10 +156,13 @@ PROG_COMMON_SRC := programs/utils.c PROG_COMMON_OBJ := $(PROG_COMMON_SRC:.c=.o) FSVERITY_PROG_OBJ := $(PROG_COMMON_OBJ) \ programs/cmd_digest.o \ - programs/cmd_enable.o \ - programs/cmd_measure.o \ programs/cmd_sign.o \ programs/fsverity.o +ifneq ($(MINGW),1) +FSVERITY_PROG_OBJ += \ + programs/cmd_enable.o \ + programs/cmd_measure.o +endif TEST_PROG_SRC := $(wildcard programs/test_*.c) TEST_PROGRAMS := $(TEST_PROG_SRC:programs/%.c=%) @@ -186,7 +204,7 @@ test_programs:$(TEST_PROGRAMS) # want to run the full tests. check:fsverity test_programs for prog in $(TEST_PROGRAMS); do \ - $(TEST_WRAPPER_PROG) ./$$prog || exit 1; \ + $(TEST_WRAPPER_PROG) ./$$prog$(EXEEXT) || exit 1; \ done $(RUN_FSVERITY) --help > /dev/null $(RUN_FSVERITY) --version > /dev/null @@ -202,7 +220,7 @@ check:fsverity test_programs install:all install -d $(DESTDIR)$(LIBDIR)/pkgconfig $(DESTDIR)$(INCDIR) $(DESTDIR)$(BINDIR) - install -m755 fsverity $(DESTDIR)$(BINDIR) + install -m755 fsverity$(EXEEXT) $(DESTDIR)$(BINDIR) install -m644 libfsverity.a $(DESTDIR)$(LIBDIR) install -m755 libfsverity.so.$(SOVERSION) $(DESTDIR)$(LIBDIR) ln -sf libfsverity.so.$(SOVERSION) $(DESTDIR)$(LIBDIR)/libfsverity.so @@ -215,7 +233,7 @@ install:all chmod 644 $(DESTDIR)$(LIBDIR)/pkgconfig/libfsverity.pc uninstall: - rm -f $(DESTDIR)$(BINDIR)/fsverity + rm -f $(DESTDIR)$(BINDIR)/fsverity$(EXEEXT) rm -f $(DESTDIR)$(LIBDIR)/libfsverity.a rm -f $(DESTDIR)$(LIBDIR)/libfsverity.so.$(SOVERSION) rm -f $(DESTDIR)$(LIBDIR)/libfsverity.so @@ -232,4 +250,4 @@ help: clean: rm -f $(DEFAULT_TARGETS) $(TEST_PROGRAMS) \ - lib/*.o programs/*.o .build-config fsverity.sig + fsverity$(EXEEXT) lib/*.o programs/*.o .build-config fsverity.sig diff --git a/common/common_defs.h b/common/common_defs.h index 279385a..3ae5561 100644 --- a/common/common_defs.h +++ b/common/common_defs.h @@ -15,6 +15,8 @@ #include #include +#include "win32_defs.h" + typedef uint8_t u8; typedef uint16_t u16; typedef uint32_t u32; diff --git a/common/fsverity_uapi.h b/common/fsverity_uapi.h index 33f4415..be1d3f6 100644 --- a/common/fsverity_uapi.h +++ b/common/fsverity_uapi.h @@ -10,8 +10,10 @@ #ifndef _UAPI_LINUX_FSVERITY_H #define _UAPI_LINUX_FSVERITY_H +#ifndef _WIN32 #include #include +#endif /* _WIN32 */ #define FS_VERITY_HASH_ALG_SHA256 1 #define FS_VERITY_HASH_ALG_SHA512 2 diff --git a/common/win32_defs.h b/common/win32_defs.h new file mode 100644 index 0000000..e13938a --- /dev/null +++ b/common/win32_defs.h @@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: MIT */ +/* + * WIN32 compat definitions for libfsverity and the 'fsverity' program + * + * Copyright 2020 Microsoft + * + * Use of this source code is governed by an MIT-style + * license that can be found in the LICENSE file or at + * https://opensource.org/licenses/MIT. + */ +#ifndef COMMON_WIN32_DEFS_H +#define COMMON_WIN32_DEFS_H + +/* Some minimal definitions to allow the digest/sign commands to run under Windows */ + +/* All file reads we do need this flag on _WIN32 */ +#ifndef O_BINARY +# define O_BINARY 0 +#endif + +#ifdef _WIN32 + +#include +#include + +#ifdef _WIN64 +# define SIZET_PF PRIu64 +#else +# define SIZET_PF PRIu32 +#endif + +#ifndef ENOPKG +# define ENOPKG 65 +#endif + +#ifndef __cold +# define __cold +#endif + +typedef __signed__ char __s8; +typedef unsigned char __u8; +typedef __signed__ short __s16; +typedef unsigned short __u16; +typedef __signed__ int __s32; +typedef unsigned int __u32; +typedef __signed__ long long __s64; +typedef unsigned long long __u64; +typedef __u16 __le16; +typedef __u16 __be16; +typedef __u32 __le32; +typedef __u32 __be32; +typedef __u64 __le64; +typedef __u64 __be64; + +#else + +#define SIZET_PF "zu" + +#endif /* _WIN32 */ + +#endif /* COMMON_WIN32_DEFS_H */ diff --git a/lib/utils.c b/lib/utils.c index 8b5d6cb..8bb4413 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -22,7 +22,7 @@ static void *xmalloc(size_t size) void *p = malloc(size); if (!p) - libfsverity_error_msg("out of memory (tried to allocate %zu bytes)", + libfsverity_error_msg("out of memory (tried to allocate %" SIZET_PF " bytes)", size); return p; } @@ -53,6 +53,15 @@ libfsverity_set_error_callback(void (*cb)(const char *msg)) libfsverity_error_cb = cb; } +#ifdef _WIN32 +static char *strerror_r(int errnum, char *buf, size_t buflen) +{ + strerror_s(buf, buflen, errnum); + + return buf; +} +#endif + void libfsverity_do_error_msg(const char *format, va_list va, int err) { int saved_errno = errno; diff --git a/programs/fsverity.c b/programs/fsverity.c index 5d5fbe2..f68e034 100644 --- a/programs/fsverity.c +++ b/programs/fsverity.c @@ -28,6 +28,7 @@ static const struct fsverity_command { " fsverity digest FILE...\n" " [--hash-alg=HASH_ALG] [--block-size=BLOCK_SIZE] [--salt=SALT]\n" " [--compact] [--for-builtin-sig]\n" +#ifndef _WIN32 }, { .name = "enable", .func = fsverity_cmd_enable, @@ -43,6 +44,7 @@ static const struct fsverity_command { "Display the fs-verity digest of the given verity file(s)", .usage_str = " fsverity measure FILE...\n" +#endif /* _WIN32 */ }, { .name = "sign", .func = fsverity_cmd_sign, diff --git a/programs/utils.c b/programs/utils.c index facccda..ce19b57 100644 --- a/programs/utils.c +++ b/programs/utils.c @@ -102,7 +102,7 @@ void install_libfsverity_error_handler(void) bool open_file(struct filedes *file, const char *filename, int flags, int mode) { - file->fd = open(filename, flags, mode); + file->fd = open(filename, flags | O_BINARY, mode); if (file->fd < 0) { error_msg_errno("can't open '%s' for %s", filename, (flags & O_ACCMODE) == O_RDONLY ? "reading" :