Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pam_pkcs11 for openSUSE:Factory checked in at 2026-11-19 16:56:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pam_pkcs11 (Old) and /work/SRC/openSUSE:Factory/.pam_pkcs11.new.1251 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam_pkcs11" Thu Nov 19 16:56:29 2026 rev:44 rq:1398599 version:0.6.14 Changes: -------- --- /work/SRC/openSUSE:Factory/pam_pkcs11/pam_pkcs11.changes 2026-03-27 06:46:38.842896295 +0100 +++ /work/SRC/openSUSE:Factory/.pam_pkcs11.new.1251/pam_pkcs11.changes 2026-11-19 16:57:58.328049435 +0100 @@ -1,0 +2,15 @@ +Sat Nov 7 02:00:36 UTC 2026 - Simon Vogl <[email protected]> + +- Update to 0.6.14 + * Fixed SIGSEGV in pam_get_pwd() (when conv() returned NULL + value). + * Fixed building with OpenSSL 4.0: Use ASN1_STRING_get0_data + to access ASN1_STRING contents (thx Finn Rayk Gaertner). + * Fixed building with Autoconf 2.73 (thx Adrian Bunk). + * Fixed distcheck. + * Fixed some spelling errors. + * Added Georgian translation (thx Ekaterine Papava). +- Adjust patch pam_pkcs11-0.6.13-fix-null-deref.patch to fix any + potential null derefs in a similar function + +------------------------------------------------------------------- Old: ---- pam_pkcs11-0.6.13.tar.gz New: ---- pam_pkcs11-0.6.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_pkcs11.spec ++++++ --- /var/tmp/diff_new_pack.aALB1r/_old 2026-11-19 16:57:59.234087840 +0100 +++ /var/tmp/diff_new_pack.aALB1r/_new 2026-11-19 16:57:59.236087925 +0100 @@ -19,7 +19,7 @@ # It seems to be an upstream naming bug: %define _name pam_pkcs11-pam_pkcs11 Name: pam_pkcs11 -Version: 0.6.13 +Version: 0.6.14 Release: 0 Summary: PKCS #11 PAM Module License: LGPL-2.1-or-later ++++++ pam_pkcs11-0.6.13-fix-null-deref.patch ++++++ --- /var/tmp/diff_new_pack.aALB1r/_old 2026-11-19 16:57:59.284089960 +0100 +++ /var/tmp/diff_new_pack.aALB1r/_new 2026-11-19 16:57:59.286090044 +0100 @@ -2,7 +2,19 @@ =================================================================== --- pam_pkcs11-pam_pkcs11-0.6.13.orig/src/common/pkcs11_lib.c +++ pam_pkcs11-pam_pkcs11-0.6.13/src/common/pkcs11_lib.c -@@ -468,6 +468,11 @@ +@@ -467,6 +467,11 @@ + if (rv != 0) { + PK11SlotInfo *slot; + PRIntervalTime slot_poll_interval; /* only for legacy hardware */ ++ ++ /* stop if handle or module is not initialized */ ++ if (h == NULL || h->module == NULL) { ++ break; ++ } + + /* if the card is not inserted, then block until something happens */ + slot_poll_interval = PR_MillisecondsToInterval(PAM_PKCS11_POLL_TIME); +@@ -610,6 +615,11 @@ PK11SlotInfo *slot; PRIntervalTime slot_poll_interval; /* only for legacy hardware */ ++++++ pam_pkcs11-0.6.13.tar.gz -> pam_pkcs11-0.6.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_pkcs11-pam_pkcs11-0.6.13/ChangeLog new/pam_pkcs11-pam_pkcs11-0.6.14/ChangeLog --- old/pam_pkcs11-pam_pkcs11-0.6.13/ChangeLog 2025-02-04 18:12:38.000000000 +0100 +++ new/pam_pkcs11-pam_pkcs11-0.6.14/ChangeLog 2026-09-04 15:42:20.000000000 +0200 @@ -1,3 +1,14 @@ +04- Sep 2026 + - Version 0.6.14. + - Fixed SIGSEGV in pam_get_pwd() (when conv() returned NULL value). + - Fixed building with OpenSSL 4.0: Use ASN1_STRING_get0_data to + access ASN1_STRING contents (thx Finn Rayk Gaertner). + - Fixed building with Autoconf 2.73: Add AC_CONFIG_MACRO_DIR([aclocal]) + (thx Adrian Bunk). + - Fixed distcheck. + - Fixed some spelling errors. + - Added Georgian translation (thx Ekaterine Papava). + 04- Feb 2025 - Version 0.6.13. - Added pkcs11-eventmgr systemd service unit. @@ -256,7 +267,7 @@ pkcs11_login-0.4 released: - Now pam_pkcs11 can take arguments from command line or via configuration file - - Certificate to User mappin has been modularized + - Certificate to User mapping has been modularized - Preliminary works on entering session without userlogin prompt: just insert certificate and enter PIN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_pkcs11-pam_pkcs11-0.6.13/NEWS new/pam_pkcs11-pam_pkcs11-0.6.14/NEWS --- old/pam_pkcs11-pam_pkcs11-0.6.13/NEWS 2025-02-04 18:12:38.000000000 +0100 +++ new/pam_pkcs11-pam_pkcs11-0.6.14/NEWS 2026-09-04 15:42:20.000000000 +0200 @@ -1,3 +1,9 @@ +04- Sep 2026 + - Version 0.6.14. + - Fixed SIGSEGV on login timeout and other conversation errors. + - Fixed some spelling errors. + - Added Georgian translation (thx Ekaterine Papava). + 04- Feb 2025 - Version 0.6.13. - Added pkcs11-eventmgr systemd service unit. @@ -81,7 +87,7 @@ pkcs11_login-0.4 released: - Now pam_pkcs11 can take arguments from command line or via configuration file - - Certificate to User mappin has been modularized + - Certificate to User mapping has been modularized - Preliminary works on entering session without userlogin prompt: just insert certificate and enter PIN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_pkcs11-pam_pkcs11-0.6.13/configure.ac new/pam_pkcs11-pam_pkcs11-0.6.14/configure.ac --- old/pam_pkcs11-pam_pkcs11-0.6.13/configure.ac 2025-02-04 18:12:38.000000000 +0100 +++ new/pam_pkcs11-pam_pkcs11-0.6.14/configure.ac 2026-09-04 15:42:20.000000000 +0200 @@ -4,7 +4,7 @@ AC_PREREQ([2.69]) # Process this file with autoconf to produce a configure script. -AC_INIT([pam_pkcs11],[0.6.13]) +AC_INIT([pam_pkcs11],[0.6.14]) AC_CONFIG_SRCDIR([src/pam_pkcs11/pam_pkcs11.c]) AC_CANONICAL_HOST AM_INIT_AUTOMAKE @@ -15,10 +15,11 @@ AM_MAINTAINER_MODE +AC_CONFIG_MACRO_DIR([aclocal]) AM_GNU_GETTEXT([external]) dnl Add the languages which your application supports here. -ALL_LINGUAS="de fr it nl pl pt_BR ru tr zh_CN" +ALL_LINGUAS="de fr it ka nl pl pt_BR ru tr zh_CN" # Checks for programs. AC_PROG_CC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_pkcs11-pam_pkcs11-0.6.13/doc/mappers_api.xml new/pam_pkcs11-pam_pkcs11-0.6.14/doc/mappers_api.xml --- old/pam_pkcs11-pam_pkcs11-0.6.13/doc/mappers_api.xml 2025-02-04 18:12:38.000000000 +0100 +++ new/pam_pkcs11-pam_pkcs11-0.6.14/doc/mappers_api.xml 2026-09-04 15:42:20.000000000 +0200 @@ -762,7 +762,7 @@ <application>PAM-PKCS#11</application> configuration files are based in the SCConf library of the <application>OpenSC</application> Project. See the file <filename>src/scconf/README.scconf</filename> for a detailed description of the <application>scconf</application> </para> <para> -As a resume, below are shown the most relevants scconf API functions for the mapper programmer: +As a resume, below are shown the most relevant scconf API functions for the mapper programmer: <itemizedlist> <listitem><function>const char *scconf_get_str(const scconf_block * block, const char *option, const char *default); </function> To retrieve the string value assigned to keyword <option>option</option> or return <option>default</option> if keyword not found</listitem> <listitem><function>int scconf_get_int(const scconf_block * block, const char *option, int default); </function> To retrieve the integer value assigned to keyword <option>option</option> or return <option>default</option> if keyword not found</listitem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_pkcs11-pam_pkcs11-0.6.13/doc/pam_pkcs11.xml new/pam_pkcs11-pam_pkcs11-0.6.14/doc/pam_pkcs11.xml --- old/pam_pkcs11-pam_pkcs11-0.6.13/doc/pam_pkcs11.xml 2025-02-04 18:12:38.000000000 +0100 +++ new/pam_pkcs11-pam_pkcs11-0.6.14/doc/pam_pkcs11.xml 2026-09-04 15:42:20.000000000 +0200 @@ -145,7 +145,7 @@ <para> <application>Pam-pkcs11</application> is a PAM (Pluggable Authentication -Module) pluggin to allow logging into a UNIX/Linux System that supports +Module) plugin to allow logging into a UNIX/Linux System that supports PAM by mean of use Digital Certificates stored in a smart card. </para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_pkcs11-pam_pkcs11-0.6.13/etc/Makefile.am new/pam_pkcs11-pam_pkcs11-0.6.14/etc/Makefile.am --- old/pam_pkcs11-pam_pkcs11-0.6.13/etc/Makefile.am 2025-02-04 18:12:38.000000000 +0100 +++ new/pam_pkcs11-pam_pkcs11-0.6.14/etc/Makefile.am 2026-09-04 15:42:20.000000000 +0200 @@ -12,11 +12,12 @@ EXTRA_DIST = $(TO_INSTALL) \ pam.d_ignore_no_card.example \ pam.d_login.example.in \ - pam_pkcs11.conf.example.in + pam_pkcs11.conf.example.in \ + pkcs11-eventmgr.service doc_DATA = $(TO_INSTALL) \ pam_pkcs11.conf.example \ pam.d_login.example -unitdir = /usr/lib/systemd/system +unitdir = $(prefix)/lib/systemd/system unit_DATA = pkcs11-eventmgr.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_pkcs11-pam_pkcs11-0.6.13/pam_pkcs11.spec new/pam_pkcs11-pam_pkcs11-0.6.14/pam_pkcs11.spec --- old/pam_pkcs11-pam_pkcs11-0.6.13/pam_pkcs11.spec 2025-02-04 18:12:38.000000000 +0100 +++ new/pam_pkcs11-pam_pkcs11-0.6.14/pam_pkcs11.spec 2026-09-04 15:42:20.000000000 +0200 @@ -1,5 +1,5 @@ Name: pam_pkcs11 -Version: 0.6.13 +Version: 0.6.14 Release: 1%{?dist} Summary: PKCS #11 PAM module diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_pkcs11-pam_pkcs11-0.6.13/po/ka.po new/pam_pkcs11-pam_pkcs11-0.6.14/po/ka.po --- old/pam_pkcs11-pam_pkcs11-0.6.13/po/ka.po 1970-01-01 01:00:00.000000000 +0100 +++ new/pam_pkcs11-pam_pkcs11-0.6.14/po/ka.po 2026-09-04 15:42:20.000000000 +0200 @@ -0,0 +1,147 @@ +# Georgian translation for pam_pkcs11 +# Copyright (C) 2025 pam_pkcs11's authors. +# This file is distributed under the same license as the pam_pkcs11 package. +# Ekaterine Papava <[email protected]>, 2025. +# +msgid "" +msgstr "" +"Project-Id-Version: pam_pkcs11 0.6.12\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-12-01 15:13+0800\n" +"PO-Revision-Date: 2025-02-26 14:09+0100\n" +"Last-Translator: Ekaterine Papava <[email protected]>\n" +"Language-Team: Georgian <(nothing)>\n" +"Language: ka\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.5\n" + +#: src/pam_pkcs11/pam_pkcs11.c:340 +msgid "Error 2302: PKCS#11 module failed loading." +msgstr "შეცდომა 2302: PKCS#11 მოდულის ჩატვირთვა ჩავარდა." + +#: src/pam_pkcs11/pam_pkcs11.c:354 +msgid "Error 2304: PKCS#11 module could not be initialized." +msgstr "შეცდომა 2304: PKCS#11 მოდულის ინიციალიზაცია შეუძლებელია." + +#: src/pam_pkcs11/pam_pkcs11.c:385 +#, c-format +msgid "Please insert your smart card called \"%.32s\"." +msgstr "ჩადეთ თქვენი სმარტ ბარათი სახელად \"%.32s\"." + +#: src/pam_pkcs11/pam_pkcs11.c:389 +msgid "Please insert your smart card." +msgstr "ჩადეთ თქვენი სმართ ბარათი." + +#: src/pam_pkcs11/pam_pkcs11.c:408 +msgid "Error 2308: No smart card found." +msgstr "შეცდომა 2308: სმარტ ბარათი აღმოჩენილი არაა." + +#: src/pam_pkcs11/pam_pkcs11.c:413 +msgid "No smart card found." +msgstr "სმარტ ბარათები აღმოჩენილი არაა." + +#: src/pam_pkcs11/pam_pkcs11.c:420 +#, c-format +msgid "%s found." +msgstr "%s აღმოჩენილია." + +#: src/pam_pkcs11/pam_pkcs11.c:428 +msgid "Error 2312: Open PKCS#11 session failed." +msgstr "შეცდომა 2312: PKCS#11 სესიის გახსნა ჩავარდა." + +#: src/pam_pkcs11/pam_pkcs11.c:440 +msgid "Error 2314: Slot login failed." +msgstr "შეცდომა 2314: სლოტის შესვლა ჩავარდა." + +#: src/pam_pkcs11/pam_pkcs11.c:447 +#, c-format +msgid "Welcome %.32s!" +msgstr "მოგესალმებით %.32s!" + +#: src/pam_pkcs11/pam_pkcs11.c:455 +#, c-format +msgid "%s PIN: " +msgstr "%s-ის PIN-კოდი: " + +#: src/pam_pkcs11/pam_pkcs11.c:466 +msgid "Error 2316: Password could not be read." +msgstr "პაროლი 2316: პაროლის წაკითხვა შეუძლებელია." + +#: src/pam_pkcs11/pam_pkcs11.c:482 +msgid "Error 2318: Empty smart card PIN not allowed." +msgstr "შეცდომა 2318: სმარტ ბარათის ცარიელი PIN-კოდი დაშვებული არაა." + +#: src/pam_pkcs11/pam_pkcs11.c:492 +#, c-format +msgid "Enter your %s PIN on the pinpad." +msgstr "შეიყვანეთ თქვენი %s-ის PIN-კოდი pinpad-ზე." + +#: src/pam_pkcs11/pam_pkcs11.c:506 +msgid "Error 2320: Wrong smart card PIN." +msgstr "შეცდომა 2320: არასწორი სმარტ ბარათის PIN-კოდი." + +#: src/pam_pkcs11/pam_pkcs11.c:519 +msgid "Error 2322: No certificate found." +msgstr "შეცდომა 2322: სერტიფიკატი აღმოჩენილი არაა." + +#: src/pam_pkcs11/pam_pkcs11.c:534 +msgid "Verifying certificate..." +msgstr "სერტიფიკატის გადამოწმება..." + +#: src/pam_pkcs11/pam_pkcs11.c:547 +msgid "Error 2324: Certificate has expired." +msgstr "შეცდომა 2324: სერტიფიკატის ვადა ამოიწურა." + +#: src/pam_pkcs11/pam_pkcs11.c:551 +msgid "Error 2326: Certificate not yet valid." +msgstr "შეცდომა 2326: სერტიფიკატი ჯერ ვარგისი არაა." + +#: src/pam_pkcs11/pam_pkcs11.c:555 +msgid "Error 2328: Certificate signature invalid." +msgstr "შეცდომა 2328: სერტიფიკატის ხელმოწერა არასწორია." + +#: src/pam_pkcs11/pam_pkcs11.c:559 +msgid "Error 2330: Certificate invalid." +msgstr "შეცდომა 2330: სერტიფიკატი არასწორია." + +#: src/pam_pkcs11/pam_pkcs11.c:594 +msgid "Error 2332: Setting PAM user entry failed." +msgstr "შეცდომა 2332: PAM-ის მომხმარებლის ჩანაწერის დაყენება ჩავარდა." + +#: src/pam_pkcs11/pam_pkcs11.c:610 +msgid "Error 2334: No matching user." +msgstr "შეცდომა 2334: შესაბამისი მომხმარებლის გარეშე." + +#: src/pam_pkcs11/pam_pkcs11.c:631 +msgid "Error 2336: No matching certificate found." +msgstr "შეცდომა 2336: შესაბამისი სერტიფიკატი აღმოჩენილი არაა." + +#: src/pam_pkcs11/pam_pkcs11.c:640 +msgid "Checking signature..." +msgstr "მიმდინარეობს ხელმოწერის შემოწმება..." + +#: src/pam_pkcs11/pam_pkcs11.c:660 +msgid "Error 2338: Getting random value failed." +msgstr "შეცდომა 2338: შემთხვევითი მნიშვნელობის მიღება ჩავარდა." + +#: src/pam_pkcs11/pam_pkcs11.c:674 +msgid "Error 2340: Signing failed." +msgstr "შეცდომა 2340: ხელმოწერა ჩავარდა." + +#: src/pam_pkcs11/pam_pkcs11.c:691 +msgid "Error 2342: Verifying signature failed." +msgstr "შეცდომა 2342: ხელმოწერის გადამოწმება ჩავარდა." + +#: src/pam_pkcs11/pam_pkcs11.c:808 +msgid "Smart card authentication cancelled." +msgstr "სმარტ ბარათის ავთენტიკაცია გაუქმდა." + +#: src/pam_pkcs11/pam_pkcs11.c:854 +msgid "Cannot change the password on your smart card." +msgstr "თქვენს სმარტ ბარათზე პაროლის შეცვლა შეუძლებელია." + +#: src/pam_pkcs11/pam_config.c:65 +msgid "Smart card" +msgstr "სმარტ ბარათი" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_pkcs11-pam_pkcs11-0.6.13/src/common/cert_info.c new/pam_pkcs11-pam_pkcs11-0.6.14/src/common/cert_info.c --- old/pam_pkcs11-pam_pkcs11-0.6.13/src/common/cert_info.c 2025-02-04 18:12:38.000000000 +0100 +++ new/pam_pkcs11-pam_pkcs11-0.6.14/src/common/cert_info.c 2026-09-04 15:42:20.000000000 +0200 @@ -483,8 +483,9 @@ for (i=0,j=0; (i < sk_GENERAL_NAME_num(gens)) && (j<CERT_INFO_MAX_ENTRIES); i++) { name = sk_GENERAL_NAME_value(gens, i); if ( name && name->type==GEN_EMAIL ) { - DBG1("Found E-Mail Entry = '%s'", name->d.ia5->data); - entries[j++]=clone_str((const char *)name->d.ia5->data); + const char *ia5 = (const char *)ASN1_STRING_get0_data(name->d.ia5); + DBG1("Found E-Mail Entry = '%s'", ia5); + entries[j++]=clone_str(ia5); } } sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free); @@ -519,8 +520,9 @@ /* try to extract string and return it */ if (name->d.otherName->value->type == V_ASN1_UTF8STRING) { ASN1_UTF8STRING *str = name->d.otherName->value->value.utf8string; - DBG1("Adding UPN NAME entry= %s",str->data); - entries[j++] = clone_str((const char *)str->data); + const char *upn = (const char *)ASN1_STRING_get0_data(str); + DBG1("Adding UPN NAME entry= %s",upn); + entries[j++] = clone_str(upn); } else { DBG("Found UPN entry is not an utf8string"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_pkcs11-pam_pkcs11-0.6.13/src/common/cert_vfy.c new/pam_pkcs11-pam_pkcs11-0.6.14/src/common/cert_vfy.c --- old/pam_pkcs11-pam_pkcs11-0.6.13/src/common/cert_vfy.c 2025-02-04 18:12:38.000000000 +0100 +++ new/pam_pkcs11-pam_pkcs11-0.6.14/src/common/cert_vfy.c 2026-09-04 15:42:20.000000000 +0200 @@ -305,8 +305,9 @@ for (j = 0; j < sk_GENERAL_NAME_num(GET_FULLNAME(point->distpoint)); j++) { name = sk_GENERAL_NAME_value(GET_FULLNAME(point->distpoint), j); if (name != NULL && name->type == GEN_URI) { - DBG1("downloading crl from %s", name->d.ia5->data); - crl = download_crl((const char *)name->d.ia5->data); + const char *uri = (const char *)ASN1_STRING_get0_data(name->d.ia5); + DBG1("downloading crl from %s", uri); + crl = download_crl(uri); /*crl = download_crl("file:///home/mario/projects/pkcs11_login/tests/ca_crl_0.pem"); */ /*crl = download_crl("http://www-t.zhwin.ch/ca/root_ca.crl"); */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_pkcs11-pam_pkcs11-0.6.13/src/common/pam-pkcs11-ossl-compat.h new/pam_pkcs11-pam_pkcs11-0.6.14/src/common/pam-pkcs11-ossl-compat.h --- old/pam_pkcs11-pam_pkcs11-0.6.13/src/common/pam-pkcs11-ossl-compat.h 2025-02-04 18:12:38.000000000 +0100 +++ new/pam_pkcs11-pam_pkcs11-0.6.14/src/common/pam-pkcs11-ossl-compat.h 2026-09-04 15:42:20.000000000 +0200 @@ -100,6 +100,7 @@ #define RSA_get0_n(x) (x->n) #define ECDSA_SIG_get0_r(x) (x->r) #define ECDSA_SIG_get0_s(x) (x->s) +#define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) #define X509_OBJECT_free(x) ({ \ if (x) { \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_pkcs11-pam_pkcs11-0.6.13/src/pam_pkcs11/mapper_mgr.c new/pam_pkcs11-pam_pkcs11-0.6.14/src/pam_pkcs11/mapper_mgr.c --- old/pam_pkcs11-pam_pkcs11-0.6.13/src/pam_pkcs11/mapper_mgr.c 2025-02-04 18:12:38.000000000 +0100 +++ new/pam_pkcs11-pam_pkcs11-0.6.14/src/pam_pkcs11/mapper_mgr.c 2026-09-04 15:42:20.000000000 +0200 @@ -170,7 +170,7 @@ DBG("No pam_pkcs11 block in config file"); return NULL; } - DBG("Retrieveing mapper module list"); + DBG("Retrieving mapper module list..."); root = scconf_find_block(ctx, NULL, "pam_pkcs11"); if (!root) { /* should not occurs, but Murphy says.. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_pkcs11-pam_pkcs11-0.6.13/src/pam_pkcs11/pam_pkcs11.c new/pam_pkcs11-pam_pkcs11-0.6.14/src/pam_pkcs11/pam_pkcs11.c --- old/pam_pkcs11-pam_pkcs11-0.6.13/src/pam_pkcs11/pam_pkcs11.c 2025-02-04 18:12:38.000000000 +0100 +++ new/pam_pkcs11-pam_pkcs11-0.6.14/src/pam_pkcs11/pam_pkcs11.c 2026-09-04 15:42:20.000000000 +0200 @@ -154,11 +154,11 @@ */ static int pam_get_pwd(pam_handle_t *pamh, char **pwd, char *text, int oitem, int nitem) { - int rv; + int rv = PAM_CRED_INSUFFICIENT; const char *old_pwd; struct pam_conv *conv; struct pam_message msg; - struct pam_response *resp; + struct pam_response *resp = NULL; /* struct pam_message *(msgp[1]) = { &msg}; */ const struct pam_message *(msgp[1]); msgp[0] = &msg; @@ -168,10 +168,11 @@ /* try to get stored item */ rv = pam_get_item(pamh, oitem, (const void **) &old_pwd); if (rv != PAM_SUCCESS) - return rv; + goto pwd_exit; if (old_pwd != NULL) { *pwd = strdup(old_pwd); - return PAM_SUCCESS; + rv = PAM_SUCCESS; + goto pwd_exit; } } @@ -181,34 +182,34 @@ msg.msg = text; rv = pam_get_item(pamh, PAM_CONV, (const void **) &conv); if (rv != PAM_SUCCESS) - return rv; - if ((conv == NULL) || (conv->conv == NULL)) - return PAM_CRED_INSUFFICIENT; + goto pwd_exit; + if ((conv == NULL) || (conv->conv == NULL)) { + rv = PAM_CRED_INSUFFICIENT; + goto pwd_exit; + } rv = conv->conv(1, msgp, &resp, conv->appdata_ptr); - if (rv != PAM_SUCCESS) goto pwd_exit; + if (rv != PAM_SUCCESS) + goto pwd_exit; if ((resp == NULL) || (resp[0].resp == NULL)) { rv = PAM_CRED_INSUFFICIENT; goto pwd_exit; } *pwd = strdup(resp[0].resp); - /* overwrite memory and release it */ - cleanse(resp[0].resp, strlen(resp[0].resp)); - free(resp[0].resp); - free(&resp[0]); /* save password if variable nitem is set */ if ((nitem == PAM_AUTHTOK) || (nitem == PAM_OLDAUTHTOK)) { rv = pam_set_item(pamh, nitem, *pwd); - if (rv != PAM_SUCCESS) - return rv; - } - return PAM_SUCCESS; + } else + rv = PAM_SUCCESS; } pwd_exit: - if(NULL != resp[0].resp) { - cleanse(resp[0].resp, strlen(resp[0].resp)); - free(resp[0].resp); + if (NULL != resp) { + if (NULL != resp[0].resp) { + /* overwrite memory and release it */ + cleanse(resp[0].resp, strlen(resp[0].resp)); + free(resp[0].resp); + } + free(resp); } - free(&resp[0]); return rv; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_pkcs11-pam_pkcs11-0.6.13/src/tools/pkcs11_eventmgr.c new/pam_pkcs11-pam_pkcs11-0.6.14/src/tools/pkcs11_eventmgr.c --- old/pam_pkcs11-pam_pkcs11-0.6.13/src/tools/pkcs11_eventmgr.c 2025-02-04 18:12:38.000000000 +0100 +++ new/pam_pkcs11-pam_pkcs11-0.6.14/src/tools/pkcs11_eventmgr.c 2026-09-04 15:42:20.000000000 +0200 @@ -652,15 +652,16 @@ * We only stop in case of an error * * COMMENT: - * There are no way in pkcs11 API to detect if a card is present or no - * so the way we proced is to look for an slot whit available token + * There are no way in pkcs11 API to detect if a card is present or + * no so the way we proceed is to look for a slot with available + * token. * Any ideas will be wellcomed * * REVIEW: - * Errrh, well, above note is not exactly true: pkcs11v2.1 API defines - * C_WaitForSlotEvent(). But it's known that is not supported in all - * pkcs11 implementations, and seems to be buggy in multithreaded - * environments.... + * Errrh, well, above note is not exactly true: pkcs11v2.1 API + * defines C_WaitForSlotEvent(). But it's known that is not + * supported in all PKCS11 implementations, and seems to be buggy + * in multithreaded environments.... */ do {
