mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
1f07a41d5a
Allow to specify a volume-type for a key. This applies to all associated volumes. The volume type can be either 'plain' or 'luks2'. New keys created will default to 'luks2', but existing keys that do not have a volume-type property default to 'plain' for compatibility reasons. The volume type 'luks2' is only available when the define HAVE_LUKS2_SUPPORT is set in the makefile. This is set only when libcryptsetup version 2.0.3 or newer is available at build time. If the define is not set, the volume-type option is not available to the user, and the volume-type of a key defaults to 'plain'. Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com> Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com> Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
98 lines
2.7 KiB
Makefile
98 lines
2.7 KiB
Makefile
include ../common.mak
|
|
|
|
ifneq (${HAVE_OPENSSL},0)
|
|
BUILD_TARGETS += zkey
|
|
INSTALL_TARGETS += install-zkey
|
|
else
|
|
BUILD_TARGETS += zkey-skip
|
|
INSTALL_TARGETS += zkey-skip
|
|
endif
|
|
|
|
ifneq (${HAVE_CRYPTSETUP2},0)
|
|
ifneq (${HAVE_JSONC},0)
|
|
BUILD_TARGETS += zkey-cryptsetup
|
|
INSTALL_TARGETS += install-zkey-cryptsetup
|
|
CPPFLAGS += -DHAVE_LUKS2_SUPPORT
|
|
else
|
|
BUILD_TARGETS += zkey-cryptsetup-skip-jsonc
|
|
INSTALL_TARGETS += zkey-cryptsetup-skip-jsonc
|
|
endif
|
|
else
|
|
BUILD_TARGETS += zkey-cryptsetup-skip-cryptsetup2
|
|
INSTALL_TARGETS += zkey-cryptsetup-skip-cryptsetup2
|
|
endif
|
|
|
|
CPPFLAGS += -I../include
|
|
LIBS = $(rootdir)/libutil/libutil.a
|
|
|
|
detect-libcryptsetup.h:
|
|
echo "#include <libcryptsetup.h>" > detect-libcryptsetup.h
|
|
echo "#ifndef CRYPT_LUKS2" >> detect-libcryptsetup.h
|
|
echo " #error libcryptsetup version 2.0.3 is required" >> detect-libcryptsetup.h
|
|
echo "#endif" >> detect-libcryptsetup.h
|
|
echo "int i = CRYPT_SLOT_UNBOUND;" >> detect-libcryptsetup.h
|
|
|
|
check-dep-zkey:
|
|
$(call check_dep, \
|
|
"zkey", \
|
|
"openssl/evp.h", \
|
|
"openssl-devel", \
|
|
"HAVE_OPENSSL=0")
|
|
|
|
check-dep-zkey-cryptsetup: detect-libcryptsetup.h
|
|
$(call check_dep, \
|
|
"zkey-cryptsetup", \
|
|
"detect-libcryptsetup.h", \
|
|
"cryptsetup-devel version 2.0.3", \
|
|
"HAVE_CRYPTSETUP2=0", \
|
|
"-I.")
|
|
$(call check_dep, \
|
|
"zkey-cryptsetup", \
|
|
"json-c/json.h", \
|
|
"json-c-devel", \
|
|
"HAVE_JSONC=0")
|
|
|
|
zkey-skip:
|
|
echo " SKIP zkey due to HAVE_OPENSSL=0"
|
|
|
|
zkey-cryptsetup-skip-cryptsetup2:
|
|
echo " SKIP zkey-cryptsetup due to HAVE_CRYPTSETUP2=0"
|
|
|
|
zkey-cryptsetup-skip-jsonc:
|
|
echo " SKIP zkey-cryptsetup due to HAVE_JSONC=0"
|
|
|
|
all: $(BUILD_TARGETS)
|
|
|
|
zkey.o: zkey.c pkey.h misc.h
|
|
pkey.o: pkey.c pkey.h
|
|
properties.o: check-dep-zkey properties.c properties.h
|
|
keystore.o: keystore.c keystore.h properties.h
|
|
zkey-cryptsetup.o: check-dep-zkey-cryptsetup zkey-cryptsetup.c pkey.h misc.h
|
|
|
|
zkey: LDLIBS = -ldl -lcrypto
|
|
zkey: zkey.o pkey.o properties.o keystore.o $(LIBS)
|
|
|
|
zkey-cryptsetup: LDLIBS = -ldl -lcryptsetup -ljson-c
|
|
zkey-cryptsetup: zkey-cryptsetup.o pkey.o $(LIBS)
|
|
|
|
install-common:
|
|
$(INSTALL) -d -m 755 $(DESTDIR)$(USRBINDIR)
|
|
$(INSTALL) -d -m 755 $(DESTDIR)$(MANDIR)/man1
|
|
|
|
install-zkey:
|
|
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 zkey $(DESTDIR)$(USRBINDIR)
|
|
$(INSTALL) -m 644 -c zkey.1 $(DESTDIR)$(MANDIR)/man1
|
|
$(INSTALL) -d -m 770 $(DESTDIR)$(SYSCONFDIR)/zkey
|
|
$(INSTALL) -d -m 770 $(DESTDIR)$(SYSCONFDIR)/zkey/repository
|
|
|
|
install-zkey-cryptsetup:
|
|
$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 zkey-cryptsetup $(DESTDIR)$(USRBINDIR)
|
|
$(INSTALL) -m 644 -c zkey-cryptsetup.1 $(DESTDIR)$(MANDIR)/man1
|
|
|
|
install: all install-common $(INSTALL_TARGETS)
|
|
|
|
clean:
|
|
rm -f *.o zkey zkey-cryptsetup detect-libcryptsetup.h
|
|
|
|
.PHONY: all install clean
|