Skip to contentSkip to conversation

package/libkcapi: bump version to 1.4.0 and add Kconfigs

PATCH In review Tan En De 2 participants 5 messages Oct 15, 2022 – Oct 30, 2022

lore
Share & tools
lore

Tan En De

author
#0 lore raw

cover package/libkcapi: bump version to 1.4.0 and add Kconfigs

This series is to:
- bump version to latest version 1.4.0
- add Kconfig option for building kcapi-dgst
- add Kconfig options for enabling lib-asym and lib-kpp

Tan En De (3):
package/libkcapi: bump version to 1.4.0 package/libkcapi: support building kcapi-dgst application package/libkcapi: support enabling lib-asym and lib-kpp

 ...f-__NR_io_getevents-when-not-defined.patch | 42 -------------------
 package/libkcapi/Config.in                    |  9 ++++
 package/libkcapi/libkcapi.hash                |  4 +-
 package/libkcapi/libkcapi.mk                  | 20 ++++++++-
 4 files changed, 30 insertions(+), 45 deletions(-)
 delete mode 100644 package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#1 lore raw

PATCH 1/3 package/libkcapi: bump version to 1.4.0

Removed patch applied upstream:
https://github.com/smuellerDD/libkcapi/commit/455c4938f5822c017c7ff79dd2dca638b6410923

---
 ...f-__NR_io_getevents-when-not-defined.patch | 42 -------------------
 package/libkcapi/libkcapi.hash                |  4 +-
 package/libkcapi/libkcapi.mk                  |  2 +-
 3 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch
package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch deleted +0 -42
deleted file mode 100644
index 20aa75b741..0000000000
@@ -1,42 +0,0 @@
-From 455c4938f5822c017c7ff79dd2dca638b6410923 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 15 Nov 2020 18:05:48 -0800
-Subject: [PATCH] Disable use of __NR_io_getevents when not defined
-
-Architectures like riscv32 do not define this syscall, therefore return
-ENOSYS on such architectures
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
-Signed-off-by: Stephan Mueller <[email protected]>
-[Retrieved from:
-https://github.com/smuellerDD/libkcapi/commit/455c4938f5822c017c7ff79dd2dca638b6410923]
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- lib/internal.h | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/lib/internal.h b/lib/internal.h
-index 1237827..f765461 100644
---- a/lib/internal.h
-+++ b/lib/internal.h
-@@ -325,10 +325,17 @@ static inline int io_submit(aio_context_t ctx, long n,  struct iocb **iocb)
-     return syscall(__NR_io_submit, ctx, n, iocb);
- }
- 
--static inline int io_getevents(aio_context_t ctx, long min, long max,
--            struct io_event *events, struct timespec *timeout)
-+static inline int io_getevents(__attribute__((unused)) aio_context_t ctx,
-+            __attribute__((unused)) long min,
-+            __attribute__((unused)) long max,
-+            __attribute__((unused)) struct io_event *events,
-+            __attribute__((unused)) struct timespec *timeout)
- {
-+#ifdef __NR_io_getevents
-     return syscall(__NR_io_getevents, ctx, min, max, events, timeout);
-+#else
-+    return -ENOSYS;
-+#endif
- }
- 
- /************************************************************
package/libkcapi/libkcapi.hash +2 -2
index 49b0880211..d858086408 100644
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  8a08dcbb4d05ede4357cdc9d61c7f2a7f2cd96b7ce2eb41b28e45b2e378267ad  libkcapi-1.1.5.tar.xz
-sha256  c6b8402a68999b0f84560ab43cdf60f9ff33c4a9a8ced6a40db9d3b787ba5b4a  COPYING
+sha256  644b47593b3f27f08add7a8808ccdbe569a2f331d70fb8b52551e57379b917fa  libkcapi-1.4.0.tar.xz
+sha256  9765fad61726afb2b253db2c68153672e4178d6809667ae98141f3e90fe8645b  COPYING
 sha256  e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4  COPYING.gplv2
 sha256  13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239  COPYING.bsd
package/libkcapi/libkcapi.mk +1 -1
index 09c5c028bc..30d500696b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBKCAPI_VERSION = 1.1.5
+LIBKCAPI_VERSION = 1.4.0
 LIBKCAPI_SOURCE = libkcapi-$(LIBKCAPI_VERSION).tar.xz
 LIBKCAPI_SITE = http://www.chronox.de/libkcapi
 LIBKCAPI_AUTORECONF = YES
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#2 lore raw

PATCH 2/3 package/libkcapi: support building kcapi-dgst application

In reply to Tan En De

Just add a new Kconfig option in order to support building kcapi-dgst application.

---
 package/libkcapi/Config.in   | 3 +++
 package/libkcapi/libkcapi.mk | 6 ++++++
 2 files changed, 9 insertions(+)
package/libkcapi/Config.in +3 -0
index 8243f6b738..176767e338 100644
@@ -28,4 +28,7 @@ config BR2_PACKAGE_LIBKCAPI_TEST
 	bool "build test program"
 	depends on BR2_USE_MMU # fork()
 
+config BR2_PACKAGE_LIBKCAPI_DGSTAPP
+	bool "build dgst application"
+
 endif
package/libkcapi/libkcapi.mk +6 -0
index 30d500696b..214999ddd2 100644
@@ -47,4 +47,10 @@ else
 LIBKCAPI_CONF_OPTS += --disable-kcapi-test
 endif
 
+ifeq ($(BR2_PACKAGE_LIBKCAPI_DGSTAPP),y)
+LIBKCAPI_CONF_OPTS += --enable-kcapi-dgstapp
+else
+LIBKCAPI_CONF_OPTS += --disable-kcapi-dgstapp
+endif
+
 $(eval $(autotools-package))
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#3 lore raw

PATCH 3/3 package/libkcapi: support enabling lib-asym and lib-kpp

In reply to Tan En De

Add Kconfig options to allow enabling asymmetric cipher support (--enable-lib-asym) and key protocol primitives support (--enable-lib-kpp) in library.

---
 package/libkcapi/Config.in   |  6 ++++++
 package/libkcapi/libkcapi.mk | 12 ++++++++++++
 2 files changed, 18 insertions(+)
package/libkcapi/Config.in +6 -0
index 176767e338..97eda31a4e 100644
@@ -31,4 +31,10 @@ config BR2_PACKAGE_LIBKCAPI_TEST
 config BR2_PACKAGE_LIBKCAPI_DGSTAPP
 	bool "build dgst application"
 
+config BR2_PACKAGE_LIBKCAPI_ASYM
+	bool "enable asymmetric ciphers library functions (kernel patching required)"
+
+config BR2_PACKAGE_LIBKCAPI_KPP
+	bool "enable KPP library functions (kernel patching required)"
+
 endif
package/libkcapi/libkcapi.mk +12 -0
index 214999ddd2..c3b655bb35 100644
@@ -53,4 +53,16 @@ else
 LIBKCAPI_CONF_OPTS += --disable-kcapi-dgstapp
 endif
 
+ifeq ($(BR2_PACKAGE_LIBKCAPI_ASYM),y)
+LIBKCAPI_CONF_OPTS += --enable-lib-asym
+else
+LIBKCAPI_CONF_OPTS += --disable-lib-asym
+endif
+
+ifeq ($(BR2_PACKAGE_LIBKCAPI_KPP),y)
+LIBKCAPI_CONF_OPTS += --enable-lib-kpp
+else
+LIBKCAPI_CONF_OPTS += --disable-lib-kpp
+endif
+
 $(eval $(autotools-package))
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw
In reply to Tan En De

Hello Tan,

Quoted 4 lines · On Sat, 15 Oct 2022 16:47:54 +0800 Tan En De <[email protected]>…

Tan En De (3):
package/libkcapi: bump version to 1.4.0 package/libkcapi: support building kcapi-dgst application package/libkcapi: support enabling lib-asym and lib-kpp

Thanks a lot, all 3 patches applied. I did some minor changes on PATCH 2/3 and 3/3:

- Alphabetic ordering in Config.in and libkcapi.mk

- Improvement of the prompt of the options, moving the discussion about kernel patches into the help text of each option instead of inside the prompt (which would otherwise be too long)

Also, I see we have nobody in our DEVELOPERS associated to the libkcapi package. If you're a user of this package, would you agree to be listed in the DEVELOPERS file for this package? This way, you would receive notifications when we have build failures affecting this package, and you could help us maintain its support in Buildroot moving forward.

Thanks a lot!

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot