fixes for illumos build

arekinath · Apr 27, 2022 · eeb985f · eeb985f
1 parent 0341a3b
commit eeb985f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -135,6 +135,7 @@ ifeq ($(SYSTEM), SunOS)
 	PCSC_LIBS	= $(shell pkg-config --libs libpcsclite)
 	CRYPTO_CFLAGS	= -I$(LIBRESSL_INC)
 	CRYPTO_LIBS	= -L$(LIBRESSL_LIB) -lcrypto -pthread
+	CRYPTO_LDFLAGS	= -L$(LIBRESSL_LIB)
 	ZLIB_CFLAGS	=
 	ZLIB_LIBS	= -lz
 	RDLINE_CFLAGS	=
@@ -143,7 +144,7 @@ ifeq ($(SYSTEM), SunOS)
 	SYSTEM_CFLAGS	+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t \
 		-Du_int32_t=uint32_t -Du_int64_t=uint64_t
 	SYSTEM_LIBS	= -L$(PROTO_AREA)/usr/lib/64 -lssp -lsocket -lnsl
-	SYSTEM_LDFLAGS	= -m64
+	SYSTEM_LDFLAGS	= -m64 -L$(PROTO_AREA)/usr/lib/64
 	HAVE_ZFS	:= $(USE_ZFS)
 	LIBZFS_CFLAGS	= -I$(ILLUMOS_SRC)/uts/common/fs/zfs	# for spa_impl.h
 	LIBZFS_CFLAGS	+= -I$(ILLUMOS_SRC)/common/zfs		# for zfeature_common.h

diff --git a/pivy-zfs.c b/pivy-zfs.c
@@ -595,7 +595,7 @@ cmd_genopt(const char *cmd, const char *subcmd, const char *opt,
 	newargv[newargc++] = subcmd;
 
 	newargv[newargc++] = opt;
-	newargv[newargc++] = "encryption=on";
+	newargv[newargc++] = "encryption=aes-256-gcm";
 	newargv[newargc++] = opt;
 	newargv[newargc++] = "keyformat=raw";