summaryrefslogtreecommitdiff
path: root/lib/includes/gnutls/pkcs11.h
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2020-05-16 18:29:56 +0200
committerDaiki Ueno <ueno@gnu.org>2021-02-15 16:59:05 +0100
commitb13e76d921ecda40c9e8eb1389f191628ac72208 (patch)
tree0f78fb0f900bccbe6e94ecc565f4ae899ebdbe78 /lib/includes/gnutls/pkcs11.h
parent71f7e59fe4952bebcf27eaf4f9fc000c722946fa (diff)
downloadgnutls-tmp-pkcs11-reject-duplicate-modules.tar.gz
pkcs11: add option to skip the duplicate modules checktmp-pkcs11-reject-duplicate-modules
The check introduced by commit 12f4abc02e718e2ab0f7ae80b3026a29028536e7 prevents the same smart card drivers being accessed from multiple drivers, but also prevents using multiple different tokens configured to be used with p11-kit's "remote:" option. This reverts that behavior but adds a new flag to opt for the check. Signed-off-by: Daiki Ueno <ueno@gnu.org>
Diffstat (limited to 'lib/includes/gnutls/pkcs11.h')
-rw-r--r--lib/includes/gnutls/pkcs11.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h
index 2436069849..fc4031e47d 100644
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -67,6 +67,7 @@ typedef struct gnutls_pkcs11_obj_st *gnutls_pkcs11_obj_t;
#define GNUTLS_PKCS11_FLAG_MANUAL 0 /* Manual loading of libraries */
#define GNUTLS_PKCS11_FLAG_AUTO 1 /* Automatically load libraries by reading /etc/gnutls/pkcs11.conf */
#define GNUTLS_PKCS11_FLAG_AUTO_TRUSTED (1<<1) /* Automatically load trusted libraries by reading /etc/gnutls/pkcs11.conf */
+#define GNUTLS_PKCS11_FLAG_IGNORE_DUPLICATE (1<<2) /* Ignore modules with duplicate module info when loading */
/* pkcs11.conf format:
* load = /lib/xxx-pkcs11.so