From: Jes Sorensen <jes.sorensen@gmail.com>
To: linux-fscrypt@vger.kernel.org
Cc: kernel-team@fb.com, ebiggers@kernel.org, Jes Sorensen <jsorensen@fb.com>
Subject: [PATCH 1/6] Build basic shared library framework
Date: Fri, 28 Feb 2020 16:28:09 -0500 [thread overview]
Message-ID: <20200228212814.105897-2-Jes.Sorensen@gmail.com> (raw)
In-Reply-To: <20200228212814.105897-1-Jes.Sorensen@gmail.com>
From: Jes Sorensen <jsorensen@fb.com>
This introduces a dummy shared library to start moving things into.
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
---
Makefile | 18 +++++++++++++++---
libverity.c | 10 ++++++++++
2 files changed, 25 insertions(+), 3 deletions(-)
create mode 100644 libverity.c
diff --git a/Makefile b/Makefile
index b9c09b9..bb85896 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,32 @@
EXE := fsverity
+LIB := libfsverity.so
CFLAGS := -O2 -Wall
CPPFLAGS := -D_FILE_OFFSET_BITS=64
LDLIBS := -lcrypto
DESTDIR := /usr/local
+LIBDIR := /usr/lib64
SRC := $(wildcard *.c)
-OBJ := $(SRC:.c=.o)
+OBJ := fsverity.o hash_algs.o cmd_enable.o cmd_measure.o cmd_sign.o util.o
+SSRC := libverity.c
+SOBJ := libverity.so
HDRS := $(wildcard *.h)
all:$(EXE)
-$(EXE):$(OBJ)
+$(EXE):$(OBJ) $(LIB)
+ $(CC) -o $@ $(OBJ) $(LDLIBS) -L . -l fsverity
$(OBJ): %.o: %.c $(HDRS)
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
+
+$(SOBJ): %.so: %.c $(HDRS)
+ $(CC) -c -fPIC $(CFLAGS) $(CPPFLAGS) $< -o $@
+
+libfsverity.so: $(SOBJ)
+ $(CC) $(LDLIBS) -shared -o libfsverity.so $(SOBJ)
clean:
- rm -f $(EXE) $(OBJ)
+ rm -f $(EXE) $(OBJ) $(SOBJ) $(LIB)
install:all
install -Dm755 -t $(DESTDIR)/bin $(EXE)
diff --git a/libverity.c b/libverity.c
new file mode 100644
index 0000000..6821aa2
--- /dev/null
+++ b/libverity.c
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * The 'fsverity library'
+ *
+ * Copyright (C) 2018 Google LLC
+ * Copyright (C) 2020 Facebook
+ *
+ * Written by Eric Biggers and Jes Sorensen.
+ */
+
--
2.24.1
next prev parent reply other threads:[~2020-02-28 21:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-28 21:28 [PATCH v2 0/6] Split fsverity-utils into a shared library Jes Sorensen
2020-02-28 21:28 ` Jes Sorensen [this message]
2020-02-28 21:28 ` [PATCH 2/6] Change compute_file_measurement() to take a file descriptor as argument Jes Sorensen
2020-02-28 21:28 ` [PATCH 3/6] Move fsverity_descriptor definition to libfsverity.h Jes Sorensen
2020-02-28 21:28 ` [PATCH 4/6] Move hash algorithm code to shared library Jes Sorensen
2020-02-28 21:28 ` [PATCH 5/6] Create libfsverity_compute_digest() and adapt cmd_sign to use it Jes Sorensen
2020-02-28 21:28 ` [PATCH 6/6] Introduce libfsverity_sign_digest() Jes Sorensen
2020-03-10 20:32 ` [PATCH v2 0/6] Split fsverity-utils into a shared library Jes Sorensen
2020-03-10 21:10 ` Eric Biggers
2020-03-10 21:53 ` Jes Sorensen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200228212814.105897-2-Jes.Sorensen@gmail.com \
--to=jes.sorensen@gmail.com \
--cc=ebiggers@kernel.org \
--cc=jsorensen@fb.com \
--cc=kernel-team@fb.com \
--cc=linux-fscrypt@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox