generated from gaoyang3513/SDK_RK3288
[Mod] First commit
This commit is contained in:
@ -0,0 +1,42 @@
|
||||
From ba44b87318ed89e489fa3ce0a5d66002afa2bd6c Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 12 Aug 2022 11:54:54 +0200
|
||||
Subject: [PATCH] src/p11_attr.c: fix build with gcc 4.8
|
||||
|
||||
Fix the following build failure with gcc 4.8 raised since version 0.4.12
|
||||
and
|
||||
https://github.com/OpenSC/libp11/commit/639a4b6463278c0119a2ec60b261da3e5330fb33:
|
||||
|
||||
p11_attr.c: In function 'pkcs11_zap_attrs':
|
||||
p11_attr.c:167:2: error: 'for' loop initial declarations are only allowed in C99 mode
|
||||
for (unsigned i = 0; i < 32; i++) {
|
||||
^
|
||||
p11_attr.c:167:2: note: use option -std=c99 or -std=gnu99 to compile your code
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/4391020fb5738cc8c26dc53783a6228bbf76473a
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/OpenSC/libp11/commit/ba44b87318ed89e489fa3ce0a5d66002afa2bd6c]
|
||||
---
|
||||
src/p11_attr.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/p11_attr.c b/src/p11_attr.c
|
||||
index d49456ff..d425241a 100644
|
||||
--- a/src/p11_attr.c
|
||||
+++ b/src/p11_attr.c
|
||||
@@ -162,9 +162,11 @@ void pkcs11_addattr_obj(PKCS11_TEMPLATE *tmpl, int type, pkcs11_i2d_fn enc, void
|
||||
|
||||
void pkcs11_zap_attrs(PKCS11_TEMPLATE *tmpl)
|
||||
{
|
||||
+ unsigned int i;
|
||||
+
|
||||
if (!tmpl->allocated)
|
||||
return;
|
||||
- for (unsigned i = 0; i < 32; i++) {
|
||||
+ for (i = 0; i < 32; i++) {
|
||||
if (tmpl->allocated & (1<<i))
|
||||
OPENSSL_free(tmpl->attrs[i].pValue);
|
||||
}
|
||||
13
package/libp11/Config.in
Normal file
13
package/libp11/Config.in
Normal file
@ -0,0 +1,13 @@
|
||||
config BR2_PACKAGE_LIBP11
|
||||
bool "libp11"
|
||||
depends on !BR2_STATIC_LIBS # dlopen
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
help
|
||||
OpenSSL engine for PKCS#11 modules. Part of the OpenSC
|
||||
project.
|
||||
|
||||
https://github.com/OpenSC/OpenSC/wiki
|
||||
|
||||
comment "libp11 needs a toolchain w/ dynamic library, threads"
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
7
package/libp11/Config.in.host
Normal file
7
package/libp11/Config.in.host
Normal file
@ -0,0 +1,7 @@
|
||||
config BR2_PACKAGE_HOST_LIBP11
|
||||
bool "host libp11"
|
||||
help
|
||||
OpenSSL engine for PKCS#11 modules. Part of the OpenSC
|
||||
project.
|
||||
|
||||
https://github.com/OpenSC/OpenSC/wiki
|
||||
3
package/libp11/libp11.hash
Normal file
3
package/libp11/libp11.hash
Normal file
@ -0,0 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 1e1a2533b3fcc45fde4da64c9c00261b1047f14c3f911377ebd1b147b3321cfd libp11-0.4.12.tar.gz
|
||||
sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING
|
||||
32
package/libp11/libp11.mk
Normal file
32
package/libp11/libp11.mk
Normal file
@ -0,0 +1,32 @@
|
||||
################################################################################
|
||||
#
|
||||
# libp11
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBP11_VERSION = 0.4.12
|
||||
LIBP11_SITE = https://github.com/OpenSC/libp11/releases/download/libp11-$(LIBP11_VERSION)
|
||||
LIBP11_DEPENDENCIES = openssl host-pkgconf
|
||||
LIBP11_INSTALL_STAGING = YES
|
||||
LIBP11_LICENSE = LGPL-2.1+
|
||||
LIBP11_LICENSE_FILES = COPYING
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
|
||||
LIBP11_ENGINESDIR = enginesdir
|
||||
else ifeq ($(BR2_PACKAGE_LIBRESSL),y)
|
||||
LIBP11_ENGINESDIR = libdir
|
||||
endif
|
||||
|
||||
# pkg-config returns a libcrypto enginesdir prefixed with the sysroot,
|
||||
# so let's rip it out.
|
||||
LIBP11_CONF_OPTS = \
|
||||
--with-enginesdir=`$(PKG_CONFIG_HOST_BINARY) --variable $(LIBP11_ENGINESDIR) libcrypto | xargs readlink -f | sed 's%^$(STAGING_DIR)%%'`
|
||||
|
||||
ifeq ($(BR2_PACKAGE_P11_KIT),y)
|
||||
LIBP11_CONF_OPTS += --with-pkcs11-module=/usr/lib/p11-kit-proxy.so
|
||||
endif
|
||||
|
||||
HOST_LIBP11_DEPENDENCIES = host-pkgconf host-openssl
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
Reference in New Issue
Block a user