pool/pam_pkcs11
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1172950 from home:dbenini:branches:security:chipcard

Browse Source 
- Fix for bsc#1221255:
  * Add patch 0001-Set-slot_num-configuration-parameter-to-0-by-default.patch

OBS-URL: https://build.opensuse.org/request/show/1172950
OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pam_pkcs11?expand=0&rev=37
This commit is contained in:
Otto Hollmann 2024-05-09 13:59:05 +00:00 committed by Git OBS Bridge
parent 5ba23cb655
commit 8ed6aff828
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-Set-slot_num-configuration-parameter-to-0-by-default.patch Normal file
View File

@ -0,0 +1,39 @@
From 8da6c472ddcf18a30676bf8f7c55785dd2de91c5 Mon Sep 17 00:00:00 2001
From: Paul Wolneykien <manowar@altlinux.org>
Date: Fri, 26 Apr 2024 18:10:24 +0300
Subject: [PATCH] Set 'slot_num' configuration parameter to 0 by default
See https://github.com/OpenSC/pam_pkcs11/pull/74 for details.
Signed-off-by: Paul Wolneykien <manowar@altlinux.org>
---
src/pam_pkcs11/pam_config.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
--- a/src/pam_pkcs11/pam_config.c
+++ b/src/pam_pkcs11/pam_config.c
@@ -50,7 +50,7 @@ struct configuration_st configuration =
NULL, /* const char *pkcs11_module_path; */
NULL, /* screen savers */
NULL, /* slot_description */
- -1, /* int slot_num; */
+ 0, /* int slot_num; */
0, /* support threads */
/* cert policy; */
{
@@ -167,13 +167,8 @@ static void parse_config_file(void) {
configuration.slot_num =
scconf_get_int(pkcs11_mblk,"slot_num",configuration.slot_num);
- if (configuration.slot_description != NULL && configuration.slot_num != -1) {
- DBG1("Can not specify both slot_description and slot_num in file %s",configuration.config_file);
- return;
- }
-
- if (configuration.slot_description == NULL && configuration.slot_num == -1) {
- DBG1("Neither slot_description nor slot_num found in file %s",configuration.config_file);
+ if (configuration.slot_description != NULL && configuration.slot_num != 0) {
+ DBG1("Can not specify both slot_description and slot_num != 0 in file %s",configuration.config_file);
return;
}

6
pam_pkcs11.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 7 15:19:11 UTC 2024 - Davide Benini <davide.benini@suse.com>
- Fix for bsc#1221255:
* Add patch 0001-Set-slot_num-configuration-parameter-to-0-by-default.patch
-------------------------------------------------------------------
Thu Feb 29 14:54:54 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

1
pam_pkcs11.spec
View File

@ -34,6 +34,7 @@ Source4: pkcs11_eventmgr.service
Patch0: %{name}-fsf-address.patch
Patch1: %{name}-0.5.3-nss-conf.patch
Patch3: %{name}-0.6.0-nss-autoconf.patch
Patch4: 0001-Set-slot_num-configuration-parameter-to-0-by-default.patch
BuildRequires: curl-devel
BuildRequires: docbook-xsl-stylesheets
BuildRequires: doxygen