author | Huie-Ying Lee <huieying.lee@oracle.com> |
Wed, 08 Jun 2011 18:37:56 -0700 | |
changeset 291 | b454e61af367 |
child 5682 | 94c0ca64c022 |
permissions | -rw-r--r-- |
291
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1 |
*** pam_pkcs11-0.6.0-ORIG/configure.in Mon Jun 11 05:17:38 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
2 |
--- pam_pkcs11-WS/configure.in Mon Sep 28 16:06:48 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
3 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
4 |
*** 237,243 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
5 |
AC_FUNC_REALLOC |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
6 |
AC_FUNC_STAT |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
7 |
AC_FUNC_VPRINTF |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
8 |
! AC_CHECK_FUNCS([memset strdup strerror]) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
9 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
10 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
11 |
AC_CONFIG_FILES([ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
12 |
--- 237,243 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
13 |
AC_FUNC_REALLOC |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
14 |
AC_FUNC_STAT |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
15 |
AC_FUNC_VPRINTF |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
16 |
! AC_CHECK_FUNCS([memset strdup strerror daemon]) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
17 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
18 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
19 |
AC_CONFIG_FILES([ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
20 |
*** pam_pkcs11-0.6.0-ORIG/po/Makefile.in.in Tue May 22 00:54:56 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
21 |
--- pam_pkcs11-WS/po/Makefile.in.in Mon Sep 28 16:06:48 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
22 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
23 |
*** 46,61 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
24 |
GMSGFMT_ = @GMSGFMT@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
25 |
GMSGFMT_no = @GMSGFMT@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
26 |
GMSGFMT_yes = @GMSGFMT_015@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
27 |
! GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
28 |
MSGFMT_ = @MSGFMT@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
29 |
MSGFMT_no = @MSGFMT@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
30 |
MSGFMT_yes = @MSGFMT_015@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
31 |
MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
32 |
! XGETTEXT_ = @XGETTEXT@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
33 |
XGETTEXT_no = @XGETTEXT@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
34 |
XGETTEXT_yes = @XGETTEXT_015@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
35 |
XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
36 |
! MSGMERGE = msgmerge |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
37 |
MSGMERGE_UPDATE = @MSGMERGE@ --update |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
38 |
MSGINIT = msginit |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
39 |
MSGCONV = msgconv |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
40 |
--- 46,61 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
41 |
GMSGFMT_ = @GMSGFMT@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
42 |
GMSGFMT_no = @GMSGFMT@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
43 |
GMSGFMT_yes = @GMSGFMT_015@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
44 |
! GMSGFMT = msgfmt |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
45 |
MSGFMT_ = @MSGFMT@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
46 |
MSGFMT_no = @MSGFMT@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
47 |
MSGFMT_yes = @MSGFMT_015@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
48 |
MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
49 |
! XGETTEXT_ = /bin/xgettext |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
50 |
XGETTEXT_no = @XGETTEXT@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
51 |
XGETTEXT_yes = @XGETTEXT_015@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
52 |
XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
53 |
! MSGMERGE = /usr/lib/intltool/gettext-tools/msgmerge |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
54 |
MSGMERGE_UPDATE = @MSGMERGE@ --update |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
55 |
MSGINIT = msginit |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
56 |
MSGCONV = msgconv |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
57 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
58 |
*** 87,94 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
59 |
.po.gmo: |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
60 |
@lang=`echo $* | sed -e 's,.*/,,'`; \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
61 |
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
62 |
! echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
63 |
! cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
64 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
65 |
.sin.sed: |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
66 |
sed -e '/^#/d' $< > t-$@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
67 |
--- 87,94 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
68 |
.po.gmo: |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
69 |
@lang=`echo $* | sed -e 's,.*/,,'`; \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
70 |
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
71 |
! echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -o $${lang}.gmo $${lang}.po"; \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
72 |
! cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
73 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
74 |
.sin.sed: |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
75 |
sed -e '/^#/d' $< > t-$@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
76 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
77 |
*** 135,145 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
78 |
else \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
79 |
msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
80 |
fi; \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
81 |
! $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
82 |
! --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
83 |
! --files-from=$(srcdir)/POTFILES.in \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
84 |
! --copyright-holder='$(COPYRIGHT_HOLDER)' \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
85 |
! --msgid-bugs-address="$$msgid_bugs_address" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
86 |
test ! -f $(DOMAIN).po || { \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
87 |
if test -f $(srcdir)/$(DOMAIN).pot; then \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
88 |
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
89 |
--- 135,142 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
90 |
else \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
91 |
msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
92 |
fi; \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
93 |
! $(XGETTEXT) -ns -c TRANSLATORS: -m "" -d $(DOMAIN) \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
94 |
! ../src/pam_pkcs11/pam_pkcs11.c |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
95 |
test ! -f $(DOMAIN).po || { \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
96 |
if test -f $(srcdir)/$(DOMAIN).pot; then \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
97 |
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
98 |
*** pam_pkcs11-0.6.0-ORIG/src/common/pkcs11_lib.h Mon May 21 02:46:19 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
99 |
--- pam_pkcs11-WS/src/common/pkcs11_lib.h Mon Sep 28 16:06:48 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
100 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
101 |
*** 36,46 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
102 |
PKCS11_EXTERN int find_slot_by_number_and_label(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
103 |
int slot_num, const char *slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
104 |
unsigned int *slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
105 |
! PKCS11_EXTERN const char *get_slot_label(pkcs11_handle_t *h); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
106 |
PKCS11_EXTERN int wait_for_token(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
107 |
int wanted_slot_num, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
108 |
const char *wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
109 |
unsigned int *slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
110 |
PKCS11_EXTERN const X509 *get_X509_certificate(cert_object_t *cert); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
111 |
PKCS11_EXTERN void release_pkcs11_module(pkcs11_handle_t *h); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
112 |
PKCS11_EXTERN int open_pkcs11_session(pkcs11_handle_t *h, unsigned int slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
113 |
--- 36,57 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
114 |
PKCS11_EXTERN int find_slot_by_number_and_label(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
115 |
int slot_num, const char *slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
116 |
unsigned int *slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
117 |
! PKCS11_EXTERN const char *get_slot_tokenlabel(pkcs11_handle_t *h); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
118 |
PKCS11_EXTERN int wait_for_token(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
119 |
int wanted_slot_num, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
120 |
+ const char *wanted_token_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
121 |
+ unsigned int *slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
122 |
+ PKCS11_EXTERN int find_slot_by_slotlabel(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
123 |
const char *wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
124 |
unsigned int *slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
125 |
+ PKCS11_EXTERN int find_slot_by_slotlabel_and_tokenlabel(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
126 |
+ const char *wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
127 |
+ const char *wanted_token_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
128 |
+ unsigned int *slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
129 |
+ PKCS11_EXTERN int wait_for_token_by_slotlabel(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
130 |
+ const char *wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
131 |
+ const char *wanted_token_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
132 |
+ unsigned int *slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
133 |
PKCS11_EXTERN const X509 *get_X509_certificate(cert_object_t *cert); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
134 |
PKCS11_EXTERN void release_pkcs11_module(pkcs11_handle_t *h); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
135 |
PKCS11_EXTERN int open_pkcs11_session(pkcs11_handle_t *h, unsigned int slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
136 |
*** pam_pkcs11-0.6.0-ORIG/src/common/pkcs11_lib.c Wed Jun 6 02:33:10 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
137 |
--- pam_pkcs11-WS/src/common/pkcs11_lib.c Mon Sep 28 16:06:48 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
138 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
139 |
*** 67,77 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
140 |
--- 67,138 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
141 |
return 0; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
142 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
143 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
144 |
+ /* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
145 |
+ * memcmp_pad_max() is a specialized version of memcmp() which compares two |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
146 |
+ * pieces of data up to a maximum length. If the two data match up the |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
147 |
+ * maximum length, they are considered matching. Trailing blanks do not cause |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
148 |
+ * the match to fail if one of the data is shorted. |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
149 |
+ * |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
150 |
+ * Examples of matches: |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
151 |
+ * "one" | |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
152 |
+ * "one " | |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
153 |
+ * ^maximum length |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
154 |
+ * |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
155 |
+ * "Number One | X" (X is beyond maximum length) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
156 |
+ * "Number One " | |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
157 |
+ * ^maximum length |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
158 |
+ * |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
159 |
+ * Examples of mismatches: |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
160 |
+ * " one" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
161 |
+ * "one" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
162 |
+ * |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
163 |
+ * "Number One X|" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
164 |
+ * "Number One |" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
165 |
+ * ^maximum length |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
166 |
+ */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
167 |
+ static int |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
168 |
+ memcmp_pad_max(void *d1, size_t d1_len, void *d2, size_t d2_len, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
169 |
+ size_t max_sz) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
170 |
+ { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
171 |
+ size_t len, extra_len; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
172 |
+ char *marker; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
173 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
174 |
+ /* No point in comparing anything beyond max_sz */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
175 |
+ if (d1_len > max_sz) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
176 |
+ d1_len = max_sz; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
177 |
+ if (d2_len > max_sz) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
178 |
+ d2_len = max_sz; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
179 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
180 |
+ /* Find shorter of the two data. */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
181 |
+ if (d1_len <= d2_len) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
182 |
+ len = d1_len; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
183 |
+ extra_len = d2_len; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
184 |
+ marker = d2; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
185 |
+ } else { /* d1_len > d2_len */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
186 |
+ len = d2_len; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
187 |
+ extra_len = d1_len; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
188 |
+ marker = d1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
189 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
190 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
191 |
+ /* Have a match in the shortest length of data? */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
192 |
+ if (memcmp(d1, d2, len) != 0) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
193 |
+ /* CONSTCOND */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
194 |
+ return (1); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
195 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
196 |
+ /* If the rest of longer data is nulls or blanks, call it a match. */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
197 |
+ while (len < extra_len && marker[len]) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
198 |
+ if (!isspace(marker[len++])) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
199 |
+ /* CONSTCOND */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
200 |
+ return (1); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
201 |
+ return (0); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
202 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
203 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
204 |
#ifdef HAVE_NSS |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
205 |
/* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
206 |
* Using NSS to find the manage the PKCS #11 modules |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
207 |
*/ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
208 |
#include "nss.h" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
209 |
+ #include "nspr.h" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
210 |
#include "cert.h" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
211 |
#include "secmod.h" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
212 |
#include "pk11pub.h" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
213 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
214 |
*** 287,294 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
215 |
/* we're configured for a specific module and token, see if it's present */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
216 |
slot_num--; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
217 |
if (slot_num >= 0 && slot_num < module->slotCount && module->slots && |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
218 |
! module->slots[i] && PK11_IsPresent(module->slots[i])) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
219 |
! h->slot = PK11_ReferenceSlot(module->slots[i]); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
220 |
*slotID = PK11_GetSlotID(h->slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
221 |
return 0; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
222 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
223 |
--- 348,355 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
224 |
/* we're configured for a specific module and token, see if it's present */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
225 |
slot_num--; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
226 |
if (slot_num >= 0 && slot_num < module->slotCount && module->slots && |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
227 |
! module->slots[slot_num] && PK11_IsPresent(module->slots[slot_num])) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
228 |
! h->slot = PK11_ReferenceSlot(module->slots[slot_num]); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
229 |
*slotID = PK11_GetSlotID(h->slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
230 |
return 0; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
231 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
232 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
233 |
*** 301,327 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
234 |
*/ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
235 |
int find_slot_by_number_and_label(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
236 |
int wanted_slot_id, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
237 |
! const char *wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
238 |
unsigned int *slot_num) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
239 |
{ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
240 |
int rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
241 |
! const char *slot_label = NULL; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
242 |
PK11SlotInfo *slot = NULL; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
243 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
244 |
/* we want a specific slot id, or we don't kare about the label */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
245 |
! if ((wanted_slot_label == NULL) || (wanted_slot_id != 0)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
246 |
rv = find_slot_by_number(h, wanted_slot_id, slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
247 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
248 |
/* if we don't care about the label, or we failed, we're done */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
249 |
! if ((wanted_slot_label == NULL) || (rv != 0)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
250 |
return rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
251 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
252 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
253 |
/* verify it's the label we want */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
254 |
! slot_label = PK11_GetTokenName(h->slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
255 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
256 |
! if ((slot_label != NULL) && |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
257 |
! (strcmp (wanted_slot_label, slot_label) == 0)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
258 |
return 0; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
259 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
260 |
return -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
261 |
--- 362,388 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
262 |
*/ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
263 |
int find_slot_by_number_and_label(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
264 |
int wanted_slot_id, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
265 |
! const char *wanted_token_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
266 |
unsigned int *slot_num) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
267 |
{ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
268 |
int rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
269 |
! const char *token_label = NULL; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
270 |
PK11SlotInfo *slot = NULL; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
271 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
272 |
/* we want a specific slot id, or we don't kare about the label */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
273 |
! if ((wanted_token_label == NULL) || (wanted_slot_id != 0)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
274 |
rv = find_slot_by_number(h, wanted_slot_id, slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
275 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
276 |
/* if we don't care about the label, or we failed, we're done */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
277 |
! if ((wanted_token_label == NULL) || (rv != 0)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
278 |
return rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
279 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
280 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
281 |
/* verify it's the label we want */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
282 |
! token_label = PK11_GetTokenName(h->slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
283 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
284 |
! if ((token_label != NULL) && |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
285 |
! (strcmp (wanted_token_label, token_label) == 0)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
286 |
return 0; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
287 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
288 |
return -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
289 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
290 |
*** 328,334 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
291 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
292 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
293 |
/* we want a specific slot by label only */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
294 |
! slot = PK11_FindSlotByName(wanted_slot_label); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
295 |
if (!slot) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
296 |
return -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
297 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
298 |
--- 389,395 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
299 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
300 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
301 |
/* we want a specific slot by label only */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
302 |
! slot = PK11_FindSlotByName(wanted_token_label); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
303 |
if (!slot) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
304 |
return -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
305 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
306 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
307 |
*** 350,356 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
308 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
309 |
int wait_for_token(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
310 |
int wanted_slot_id, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
311 |
! const char *wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
312 |
unsigned int *slot_num) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
313 |
{ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
314 |
int rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
315 |
--- 411,417 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
316 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
317 |
int wait_for_token(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
318 |
int wanted_slot_id, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
319 |
! const char *wanted_token_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
320 |
unsigned int *slot_num) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
321 |
{ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
322 |
int rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
323 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
324 |
*** 358,364 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
325 |
rv = -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
326 |
do { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
327 |
/* see if the card we're looking for is inserted */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
328 |
! rv = find_slot_by_number_and_label (h, wanted_slot_id, wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
329 |
slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
330 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
331 |
PK11SlotInfo *slot; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
332 |
--- 419,425 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
333 |
rv = -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
334 |
do { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
335 |
/* see if the card we're looking for is inserted */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
336 |
! rv = find_slot_by_number_and_label (h, wanted_slot_id, wanted_token_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
337 |
slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
338 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
339 |
PK11SlotInfo *slot; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
340 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
341 |
*** 385,390 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
342 |
--- 446,592 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
343 |
return rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
344 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
345 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
346 |
+ /* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
347 |
+ * This function will search the slot list to find a slot based on the slot |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
348 |
+ * label. If the wanted_slot_label is "none", then we will return the first |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
349 |
+ * slot with the token presented. |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
350 |
+ * |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
351 |
+ * This function return 0 if it found a matching slot; otherwise, it returns |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
352 |
+ * -1. |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
353 |
+ */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
354 |
+ int |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
355 |
+ find_slot_by_slotlabel(pkcs11_handle_t *h, const char *wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
356 |
+ unsigned int *slotID) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
357 |
+ { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
358 |
+ SECMODModule *module = h->module; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
359 |
+ PK11SlotInfo *slot; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
360 |
+ int rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
361 |
+ int i; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
362 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
363 |
+ if (slotID == NULL || wanted_slot_label == NULL || |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
364 |
+ strlen(wanted_slot_label) == 0 || module == NULL) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
365 |
+ return (-1); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
366 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
367 |
+ if (strcmp(wanted_slot_label, "none") == 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
368 |
+ rv = find_slot_by_number(h, 0, slotID); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
369 |
+ return (rv); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
370 |
+ } else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
371 |
+ /* wanted_slot_label is not "none" */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
372 |
+ for (i = 0; i < module->slotCount; i++) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
373 |
+ if (module->slots[i] && PK11_IsPresent(module->slots[i])) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
374 |
+ const char *slot_label; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
375 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
376 |
+ slot = PK11_ReferenceSlot(module->slots[i]); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
377 |
+ slot_label = PK11_GetSlotName(slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
378 |
+ if (memcmp_pad_max((void *)slot_label, strlen(slot_label), |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
379 |
+ (void *)wanted_slot_label, strlen(wanted_slot_label), 64) == 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
380 |
+ h->slot = slot; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
381 |
+ *slotID = PK11_GetSlotID(slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
382 |
+ return 0; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
383 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
384 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
385 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
386 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
387 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
388 |
+ return (-1); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
389 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
390 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
391 |
+ int |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
392 |
+ find_slot_by_slotlabel_and_tokenlabel(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
393 |
+ const char *wanted_slot_label, const char *wanted_token_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
394 |
+ unsigned int *slot_num) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
395 |
+ { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
396 |
+ SECMODModule *module = h->module; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
397 |
+ PK11SlotInfo *slot; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
398 |
+ unsigned long i; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
399 |
+ int rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
400 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
401 |
+ if (slot_num == NULL || module == NULL) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
402 |
+ return (-1); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
403 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
404 |
+ if (wanted_token_label == NULL){ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
405 |
+ rv = find_slot_by_slotlabel(h, wanted_slot_label, slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
406 |
+ return (rv); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
407 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
408 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
409 |
+ /* wanted_token_label != NULL */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
410 |
+ if (strcmp(wanted_slot_label, "none") == 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
411 |
+ for (i = 0; i < module->slotCount; i++) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
412 |
+ if (module->slots[i] && PK11_IsPresent(module->slots[i])) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
413 |
+ const char *token_label; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
414 |
+ slot = PK11_ReferenceSlot(module->slots[i]); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
415 |
+ token_label = PK11_GetTokenName(slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
416 |
+ if (memcmp_pad_max((void *) token_label, strlen(token_label), |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
417 |
+ (void *)wanted_token_label, strlen(wanted_token_label), 33) == 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
418 |
+ h->slot = slot; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
419 |
+ *slot_num = PK11_GetSlotID(slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
420 |
+ return (0); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
421 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
422 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
423 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
424 |
+ return (-1); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
425 |
+ } else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
426 |
+ for (i = 0; i < module->slotCount; i++) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
427 |
+ if (module->slots[i] && PK11_IsPresent(module->slots[i])) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
428 |
+ const char *slot_label; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
429 |
+ const char *token_label; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
430 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
431 |
+ slot = PK11_ReferenceSlot(module->slots[i]); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
432 |
+ slot_label = PK11_GetSlotName(slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
433 |
+ token_label = PK11_GetTokenName(slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
434 |
+ if ((memcmp_pad_max((void *)slot_label, strlen(slot_label), |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
435 |
+ (void *)wanted_slot_label, strlen(wanted_slot_label), 64) == 0) && |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
436 |
+ (memcmp_pad_max((void *)token_label, strlen(token_label), |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
437 |
+ (void *)wanted_token_label, strlen(wanted_token_label), 33) == 0)) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
438 |
+ { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
439 |
+ h->slot = slot; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
440 |
+ *slot_num = PK11_GetSlotID(slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
441 |
+ return (0); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
442 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
443 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
444 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
445 |
+ return (-1); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
446 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
447 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
448 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
449 |
+ int wait_for_token_by_slotlabel(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
450 |
+ const char *wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
451 |
+ const char *wanted_token_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
452 |
+ unsigned int *slot_num) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
453 |
+ { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
454 |
+ int rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
455 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
456 |
+ rv = -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
457 |
+ do { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
458 |
+ /* see if the card we're looking for is inserted */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
459 |
+ rv = find_slot_by_slotlabel_and_tokenlabel (h, wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
460 |
+ wanted_token_label, slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
461 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
462 |
+ if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
463 |
+ PK11SlotInfo *slot; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
464 |
+ PRIntervalTime slot_poll_interval; /* only for legacy hardware */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
465 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
466 |
+ /* if the card is not inserted, then block until something happens */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
467 |
+ slot_poll_interval = PR_MillisecondsToInterval(PAM_PKCS11_POLL_TIME); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
468 |
+ slot = SECMOD_WaitForAnyTokenEvent(h->module, 0 /* flags */, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
469 |
+ slot_poll_interval); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
470 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
471 |
+ /* unexpected error */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
472 |
+ if (slot == NULL) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
473 |
+ break; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
474 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
475 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
476 |
+ /* something happened, continue loop and check if the card |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
477 |
+ * we're looking for is inserted |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
478 |
+ */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
479 |
+ PK11_FreeSlot(slot); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
480 |
+ continue; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
481 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
482 |
+ } while (rv != 0); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
483 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
484 |
+ return rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
485 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
486 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
487 |
void release_pkcs11_module(pkcs11_handle_t *h) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
488 |
{ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
489 |
SECStatus rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
490 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
491 |
*** 470,476 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
492 |
return 0; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
493 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
494 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
495 |
! const char *get_slot_label(pkcs11_handle_t *h) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
496 |
{ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
497 |
if (!h->slot) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
498 |
return NULL; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
499 |
--- 672,678 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
500 |
return 0; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
501 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
502 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
503 |
! const char *get_slot_tokenlabel(pkcs11_handle_t *h) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
504 |
{ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
505 |
if (!h->slot) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
506 |
return NULL; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
507 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
508 |
*** 613,619 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
509 |
return (rv == SECSuccess) ? 0 : -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
510 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
511 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
512 |
- #include "nspr.h" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
513 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
514 |
struct tuple_str { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
515 |
PRErrorCode errNum; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
516 |
--- 815,820 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
517 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
518 |
*** 708,714 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
519 |
typedef struct { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
520 |
CK_SLOT_ID id; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
521 |
CK_BBOOL token_present; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
522 |
! CK_UTF8CHAR label[33]; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
523 |
} slot_t; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
524 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
525 |
struct pkcs11_handle_str { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
526 |
--- 909,916 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
527 |
typedef struct { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
528 |
CK_SLOT_ID id; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
529 |
CK_BBOOL token_present; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
530 |
! CK_UTF8CHAR label[33]; /* token label */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
531 |
! CK_UTF8CHAR slotDescription[64]; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
532 |
} slot_t; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
533 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
534 |
struct pkcs11_handle_str { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
535 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
536 |
*** 758,764 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
537 |
DBG3("module permissions: uid = %d, gid = %d, mode = %o", |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
538 |
module_stat.st_uid, module_stat.st_gid, module_stat.st_mode & 0777); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
539 |
if (module_stat.st_mode & S_IWGRP || module_stat.st_mode & S_IWOTH |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
540 |
! || module_stat.st_uid != 0 || module_stat.st_gid != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
541 |
set_error("the pkcs #11 module MUST be owned by root and MUST NOT " |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
542 |
"be writeable by the group or others"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
543 |
free(h); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
544 |
--- 960,966 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
545 |
DBG3("module permissions: uid = %d, gid = %d, mode = %o", |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
546 |
module_stat.st_uid, module_stat.st_gid, module_stat.st_mode & 0777); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
547 |
if (module_stat.st_mode & S_IWGRP || module_stat.st_mode & S_IWOTH |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
548 |
! || module_stat.st_uid != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
549 |
set_error("the pkcs #11 module MUST be owned by root and MUST NOT " |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
550 |
"be writeable by the group or others"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
551 |
free(h); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
552 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
553 |
*** 807,812 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
554 |
--- 1009,1018 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
555 |
set_error("C_GetSlotInfo() failed: %x", rv); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
556 |
return -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
557 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
558 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
559 |
+ (void) memcpy(h->slots[i].slotDescription, sinfo.slotDescription, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
560 |
+ sizeof(h->slots[i].slotDescription)); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
561 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
562 |
DBG1("- description: %.64s", sinfo.slotDescription); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
563 |
DBG1("- manufacturer: %.32s", sinfo.manufacturerID); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
564 |
DBG1("- flags: %04lx", sinfo.flags); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
565 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
566 |
*** 945,971 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
567 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
568 |
int find_slot_by_number_and_label(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
569 |
int wanted_slot_id, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
570 |
! const char *wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
571 |
unsigned int *slot_num) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
572 |
{ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
573 |
unsigned int slot_index; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
574 |
int rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
575 |
! const char *slot_label = NULL; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
576 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
577 |
/* we want a specific slot id, or we don't care about the label */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
578 |
! if ((wanted_slot_label == NULL) || (wanted_slot_id != 0)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
579 |
rv = find_slot_by_number(h, wanted_slot_id, slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
580 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
581 |
/* if we don't care about the label, or we failed, we're done */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
582 |
! if ((wanted_slot_label == NULL) || (rv != 0)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
583 |
return rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
584 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
585 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
586 |
/* verify it's the label we want */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
587 |
! slot_label = h->slots[*slot_num].label; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
588 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
589 |
! if ((slot_label != NULL) && |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
590 |
! (strcmp (wanted_slot_label, slot_label) == 0)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
591 |
return 0; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
592 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
593 |
return -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
594 |
--- 1151,1177 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
595 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
596 |
int find_slot_by_number_and_label(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
597 |
int wanted_slot_id, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
598 |
! const char *wanted_token_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
599 |
unsigned int *slot_num) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
600 |
{ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
601 |
unsigned int slot_index; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
602 |
int rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
603 |
! const char *token_label = NULL; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
604 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
605 |
/* we want a specific slot id, or we don't care about the label */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
606 |
! if ((wanted_token_label == NULL) || (wanted_slot_id != 0)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
607 |
rv = find_slot_by_number(h, wanted_slot_id, slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
608 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
609 |
/* if we don't care about the label, or we failed, we're done */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
610 |
! if ((wanted_token_label == NULL) || (rv != 0)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
611 |
return rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
612 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
613 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
614 |
/* verify it's the label we want */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
615 |
! token_label = h->slots[*slot_num].label; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
616 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
617 |
! if ((token_label != NULL) && |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
618 |
! (strcmp (wanted_token_label, token_label) == 0)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
619 |
return 0; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
620 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
621 |
return -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
622 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
623 |
*** 974,982 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
624 |
/* look up the slot by it's label from the list */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
625 |
for (slot_index = 0; slot_index < h->slot_count; slot_index++) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
626 |
if (h->slots[slot_index].token_present) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
627 |
! slot_label = h->slots[slot_index].label; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
628 |
! if ((slot_label != NULL) && |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
629 |
! (strcmp (wanted_slot_label, slot_label) == 0)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
630 |
*slot_num = slot_index; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
631 |
return 0; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
632 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
633 |
--- 1180,1188 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
634 |
/* look up the slot by it's label from the list */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
635 |
for (slot_index = 0; slot_index < h->slot_count; slot_index++) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
636 |
if (h->slots[slot_index].token_present) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
637 |
! token_label = h->slots[slot_index].label; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
638 |
! if ((token_label != NULL) && |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
639 |
! (strcmp (wanted_token_label, token_label) == 0)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
640 |
*slot_num = slot_index; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
641 |
return 0; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
642 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
643 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
644 |
*** 985,993 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
645 |
return -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
646 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
647 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
648 |
int wait_for_token(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
649 |
int wanted_slot_id, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
650 |
! const char *wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
651 |
unsigned int *slot_num) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
652 |
{ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
653 |
int rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
654 |
--- 1191,1310 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
655 |
return -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
656 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
657 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
658 |
+ /* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
659 |
+ * This function will search the slot list to find a slot based on the slot |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
660 |
+ * label. If the wanted_slot_label is "none", then we will return the first |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
661 |
+ * slot with the token presented. |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
662 |
+ * |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
663 |
+ * This function return 0 if it found a matching slot; otherwise, it returns |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
664 |
+ * -1. |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
665 |
+ */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
666 |
+ int |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
667 |
+ find_slot_by_slotlabel(pkcs11_handle_t *h, const char *wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
668 |
+ unsigned int *slot_num) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
669 |
+ { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
670 |
+ unsigned long index; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
671 |
+ size_t len; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
672 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
673 |
+ if (slot_num == NULL || wanted_slot_label == NULL || |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
674 |
+ strlen(wanted_slot_label) == 0) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
675 |
+ return (-1); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
676 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
677 |
+ if (strcmp(wanted_slot_label, "none") == 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
678 |
+ for (index = 0; index < h->slot_count; index++) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
679 |
+ if (h->slots[index].token_present) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
680 |
+ *slot_num = index; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
681 |
+ return (0); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
682 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
683 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
684 |
+ } else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
685 |
+ /* Look up the slot by it's slotDescription */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
686 |
+ len = strlen(wanted_slot_label); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
687 |
+ for (index = 0; index < h->slot_count; index++) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
688 |
+ if (memcmp_pad_max(h->slots[index].slotDescription, 64, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
689 |
+ (void *)wanted_slot_label, len, 64) == 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
690 |
+ *slot_num = index; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
691 |
+ return (0); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
692 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
693 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
694 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
695 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
696 |
+ return (-1); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
697 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
698 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
699 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
700 |
+ int |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
701 |
+ find_slot_by_slotlabel_and_tokenlabel(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
702 |
+ const char *wanted_slot_label, const char *wanted_token_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
703 |
+ unsigned int *slot_num) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
704 |
+ { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
705 |
+ unsigned long i; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
706 |
+ int rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
707 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
708 |
+ if (slot_num == NULL) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
709 |
+ return (-1); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
710 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
711 |
+ if (wanted_token_label == NULL) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
712 |
+ rv = find_slot_by_slotlabel(h, wanted_slot_label, slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
713 |
+ return (rv); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
714 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
715 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
716 |
+ /* wanted_token_label != NULL */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
717 |
+ if (strcmp(wanted_slot_label, "none") == 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
718 |
+ for (i= 0; i < h->slot_count; i++) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
719 |
+ if (h->slots[i].token_present && |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
720 |
+ strcmp(wanted_token_label, h->slots[i].label) == 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
721 |
+ *slot_num = i; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
722 |
+ return (0); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
723 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
724 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
725 |
+ return (-1); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
726 |
+ } else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
727 |
+ for (i = 0; i < h->slot_count; i++) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
728 |
+ if (h->slots[i].token_present) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
729 |
+ const char *slot_label = h->slots[i].slotDescription; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
730 |
+ const char *token_label = h->slots[i].label; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
731 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
732 |
+ if ((memcmp_pad_max((void *)slot_label, strlen(slot_label), |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
733 |
+ (void *)wanted_slot_label, strlen(wanted_slot_label), 64) == 0) && |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
734 |
+ (memcmp_pad_max((void *)token_label, strlen(token_label), |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
735 |
+ (void *)wanted_token_label, strlen(wanted_token_label), 33) == 0)) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
736 |
+ { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
737 |
+ *slot_num = i; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
738 |
+ return (0); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
739 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
740 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
741 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
742 |
+ return (-1); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
743 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
744 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
745 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
746 |
+ int wait_for_token_by_slotlabel(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
747 |
+ const char *wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
748 |
+ const char *wanted_token_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
749 |
+ unsigned int *slot_num) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
750 |
+ { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
751 |
+ int rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
752 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
753 |
+ rv = -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
754 |
+ do { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
755 |
+ /* see if the card we're looking for is inserted */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
756 |
+ rv = find_slot_by_slotlabel_and_tokenlabel (h, wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
757 |
+ wanted_token_label, slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
758 |
+ if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
759 |
+ /* could call C_WaitForSlotEvent, for now just poll */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
760 |
+ sleep(10); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
761 |
+ refresh_slots(h); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
762 |
+ continue; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
763 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
764 |
+ } while (rv != 0); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
765 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
766 |
+ return rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
767 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
768 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
769 |
int wait_for_token(pkcs11_handle_t *h, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
770 |
int wanted_slot_id, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
771 |
! const char *wanted_token_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
772 |
unsigned int *slot_num) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
773 |
{ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
774 |
int rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
775 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
776 |
*** 995,1001 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
777 |
rv = -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
778 |
do { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
779 |
/* see if the card we're looking for is inserted */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
780 |
! rv = find_slot_by_number_and_label (h, wanted_slot_id, wanted_slot_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
781 |
slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
782 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
783 |
/* could call C_WaitForSlotEvent, for now just poll */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
784 |
--- 1312,1318 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
785 |
rv = -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
786 |
do { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
787 |
/* see if the card we're looking for is inserted */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
788 |
! rv = find_slot_by_number_and_label (h, wanted_slot_id, wanted_token_label, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
789 |
slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
790 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
791 |
/* could call C_WaitForSlotEvent, for now just poll */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
792 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
793 |
*** 1306,1312 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
794 |
return -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
795 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
796 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
797 |
! const char *get_slot_label(pkcs11_handle_t *h) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
798 |
{ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
799 |
return h->slots[h->current_slot].label; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
800 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
801 |
--- 1623,1629 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
802 |
return -1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
803 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
804 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
805 |
! const char *get_slot_tokenlabel(pkcs11_handle_t *h) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
806 |
{ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
807 |
return h->slots[h->current_slot].label; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
808 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
809 |
*** pam_pkcs11-0.6.0-ORIG/src/pam_pkcs11/Makefile.in Wed Jun 6 02:23:27 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
810 |
--- pam_pkcs11-WS/src/pam_pkcs11/Makefile.in Mon Sep 28 16:06:48 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
811 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
812 |
*** 234,241 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
813 |
top_builddir = @top_builddir@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
814 |
top_srcdir = @top_srcdir@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
815 |
MAINTAINERCLEANFILES = Makefile.in |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
816 |
! AM_CFLAGS = -Wall -fno-strict-aliasing $(CRYPTO_CFLAGS) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
817 |
! AM_CPPFLAGS = -Wall -fno-strict-aliasing $(CRYPTO_CFLAGS) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
818 |
lib_LTLIBRARIES = pam_pkcs11.la |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
819 |
pam_pkcs11_la_SOURCES = pam_pkcs11.c \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
820 |
mapper_mgr.c mapper_mgr.h \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
821 |
--- 234,241 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
822 |
top_builddir = @top_builddir@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
823 |
top_srcdir = @top_srcdir@ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
824 |
MAINTAINERCLEANFILES = Makefile.in |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
825 |
! AM_CFLAGS = $(CRYPTO_CFLAGS) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
826 |
! AM_CPPFLAGS = $(CRYPTO_CFLAGS) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
827 |
lib_LTLIBRARIES = pam_pkcs11.la |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
828 |
pam_pkcs11_la_SOURCES = pam_pkcs11.c \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
829 |
mapper_mgr.c mapper_mgr.h \ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
830 |
*** pam_pkcs11-0.6.0-ORIG/src/pam_pkcs11/pam_config.h Wed Jun 6 02:55:02 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
831 |
--- pam_pkcs11-WS/src/pam_pkcs11/pam_config.h Mon Sep 28 16:06:48 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
832 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
833 |
*** 13,19 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
834 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
835 |
* Lesser General Public License for more details. |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
836 |
* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
837 |
! * $Id: pam_config.h 270 2007-05-21 08:13:00Z ludovic.rousseau $ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
838 |
*/ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
839 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
840 |
/* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
841 |
--- 13,19 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
842 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
843 |
* Lesser General Public License for more details. |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
844 |
* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
845 |
! * $Id: pam_config.h 341 2008-10-14 07:36:46Z ludovic.rousseau $ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
846 |
*/ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
847 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
848 |
/* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
849 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
850 |
*** 38,46 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
851 |
--- 38,48 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
852 |
char *pkcs11_module; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
853 |
char *pkcs11_modulepath; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
854 |
char **screen_savers; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
855 |
+ char *slot_description; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
856 |
int slot_num; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
857 |
int support_threads; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
858 |
cert_policy policy; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
859 |
+ char *token_type; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
860 |
char *username; /* provided user name */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
861 |
}; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
862 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
863 |
*** pam_pkcs11-0.6.0-ORIG/src/pam_pkcs11/pam_pkcs11.c Tue May 22 01:28:33 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
864 |
--- pam_pkcs11-WS/src/pam_pkcs11/pam_pkcs11.c Mon Nov 2 15:39:57 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
865 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
866 |
*** 12,18 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
867 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
868 |
* Lesser General Public License for more details. |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
869 |
* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
870 |
! * $Id: pam_pkcs11.c 281 2007-05-22 08:28:40Z ludovic.rousseau $ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
871 |
*/ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
872 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
873 |
/* We have to make this definitions before we include the pam header files! */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
874 |
--- 12,18 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
875 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
876 |
* Lesser General Public License for more details. |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
877 |
* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
878 |
! * $Id: pam_pkcs11.c 341 2008-10-14 07:36:46Z ludovic.rousseau $ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
879 |
*/ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
880 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
881 |
/* We have to make this definitions before we include the pam header files! */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
882 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
883 |
*** 59,65 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
884 |
/* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
885 |
* comodity function that returns 1 on null, empty o spaced string |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
886 |
*/ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
887 |
! int is_spaced_str(const char *str) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
888 |
char *pt=(char *)str; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
889 |
if(!str) return 1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
890 |
if (!strcmp(str,"")) return 1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
891 |
--- 59,65 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
892 |
/* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
893 |
* comodity function that returns 1 on null, empty o spaced string |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
894 |
*/ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
895 |
! static int is_spaced_str(const char *str) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
896 |
char *pt=(char *)str; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
897 |
if(!str) return 1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
898 |
if (!strcmp(str,"")) return 1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
899 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
900 |
*** 91,103 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
901 |
rv = conv->conv(1, (const struct pam_message **)msgp, &resp, conv->appdata_ptr); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
902 |
if (rv != PAM_SUCCESS) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
903 |
return rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
904 |
! if ((resp == NULL) || (resp[0].resp == NULL)) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
905 |
return !response ? PAM_SUCCESS : PAM_CRED_INSUFFICIENT; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
906 |
if (response) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
907 |
*response = strdup(resp[0].resp); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
908 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
909 |
/* overwrite memory and release it */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
910 |
memset(resp[0].resp, 0, strlen(resp[0].resp)); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
911 |
free(&resp[0]); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
912 |
return PAM_SUCCESS; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
913 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
914 |
--- 91,106 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
915 |
rv = conv->conv(1, (const struct pam_message **)msgp, &resp, conv->appdata_ptr); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
916 |
if (rv != PAM_SUCCESS) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
917 |
return rv; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
918 |
! if ((resp == NULL) || (resp[0].resp == NULL)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
919 |
! free(&resp[0]); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
920 |
return !response ? PAM_SUCCESS : PAM_CRED_INSUFFICIENT; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
921 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
922 |
if (response) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
923 |
*response = strdup(resp[0].resp); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
924 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
925 |
/* overwrite memory and release it */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
926 |
memset(resp[0].resp, 0, strlen(resp[0].resp)); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
927 |
+ free(resp[0].resp); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
928 |
free(&resp[0]); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
929 |
return PAM_SUCCESS; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
930 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
931 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
932 |
*** 206,211 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
933 |
--- 209,220 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
934 |
return PAM_AUTHINFO_UNAVAIL; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
935 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
936 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
937 |
+ /* Either slot_description or slot_num, but not both, needs to be used */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
938 |
+ if ((configuration->slot_description != NULL && configuration->slot_num != -1) || (configuration->slot_description == NULL && configuration->slot_num == -1)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
939 |
+ ERR("Error setting configuration parameters"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
940 |
+ return PAM_AUTHINFO_UNAVAIL; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
941 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
942 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
943 |
/* fail if we are using a remote server |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
944 |
* local login: DISPLAY=:0 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
945 |
* XDMCP login: DISPLAY=host:0 */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
946 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
947 |
*** 274,281 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
948 |
DBG1("explicit username = [%s]", user); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
949 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
950 |
} else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
951 |
! pam_prompt(pamh, PAM_TEXT_INFO, NULL, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
952 |
! _("Please insert your smart card or enter your username.")); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
953 |
/* get user name */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
954 |
rv = pam_get_user(pamh, &user, NULL); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
955 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
956 |
--- 283,292 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
957 |
DBG1("explicit username = [%s]", user); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
958 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
959 |
} else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
960 |
! sprintf(password_prompt, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
961 |
! _("Please insert your %s or enter your username."), |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
962 |
! _(configuration->token_type)); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
963 |
! pam_prompt(pamh, PAM_TEXT_INFO, NULL, password_prompt); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
964 |
/* get user name */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
965 |
rv = pam_get_user(pamh, &user, NULL); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
966 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
967 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
968 |
*** 314,321 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
969 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
970 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
971 |
/* open pkcs #11 session */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
972 |
! rv = find_slot_by_number_and_label(ph, configuration->slot_num, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
973 |
login_token_name, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
974 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
975 |
ERR("no suitable token available"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
976 |
pam_syslog(pamh, LOG_ERR, "no suitable token available"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
977 |
--- 325,338 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
978 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
979 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
980 |
/* open pkcs #11 session */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
981 |
! if (configuration->slot_description != NULL) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
982 |
! rv = find_slot_by_slotlabel_and_tokenlabel(ph, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
983 |
! configuration->slot_description, login_token_name, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
984 |
! } else if (configuration->slot_num != -1) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
985 |
! rv = find_slot_by_number_and_label(ph, configuration->slot_num, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
986 |
login_token_name, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
987 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
988 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
989 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
990 |
ERR("no suitable token available"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
991 |
pam_syslog(pamh, LOG_ERR, "no suitable token available"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
992 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
993 |
*** 337,344 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
994 |
pam_prompt(pamh, PAM_TEXT_INFO, NULL, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
995 |
_("Please insert your smart card.")); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
996 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
997 |
! rv = wait_for_token(ph, configuration->slot_num, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
998 |
login_token_name, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
999 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1000 |
release_pkcs11_module(ph); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1001 |
return pkcs11_pam_fail; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1002 |
--- 354,368 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1003 |
pam_prompt(pamh, PAM_TEXT_INFO, NULL, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1004 |
_("Please insert your smart card.")); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1005 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1006 |
! |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1007 |
! if (configuration->slot_description != NULL) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1008 |
! rv = wait_for_token_by_slotlabel(ph, configuration->slot_description, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1009 |
! login_token_name, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1010 |
! } else if (configuration->slot_num != -1) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1011 |
! rv = wait_for_token(ph, configuration->slot_num, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1012 |
login_token_name, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1013 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1014 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1015 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1016 |
release_pkcs11_module(ph); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1017 |
return pkcs11_pam_fail; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1018 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1019 |
*** 350,362 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1020 |
} else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1021 |
/* we haven't prompted for the user yet, get the user and see if |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1022 |
* the smart card has been inserted in the mean time */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1023 |
! pam_prompt(pamh, PAM_TEXT_INFO, NULL, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1024 |
! _("Please insert your smart card or enter your username.")); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1025 |
rv = pam_get_user(pamh, &user, NULL); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1026 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1027 |
/* check one last time for the smart card before bouncing to the next |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1028 |
* module */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1029 |
! rv = find_slot_by_number(ph, configuration->slot_num, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1030 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1031 |
/* user gave us a user id and no smart card go to next module */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1032 |
release_pkcs11_module(ph); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1033 |
--- 374,394 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1034 |
} else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1035 |
/* we haven't prompted for the user yet, get the user and see if |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1036 |
* the smart card has been inserted in the mean time */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1037 |
! sprintf(password_prompt, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1038 |
! _("Please insert your %s or enter your username."), |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1039 |
! _(configuration->token_type)); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1040 |
! pam_prompt(pamh, PAM_TEXT_INFO, NULL, password_prompt); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1041 |
rv = pam_get_user(pamh, &user, NULL); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1042 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1043 |
/* check one last time for the smart card before bouncing to the next |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1044 |
* module */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1045 |
! if (configuration->slot_description != NULL) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1046 |
! rv = find_slot_by_slotlabel(ph, configuration->slot_description, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1047 |
! &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1048 |
! } else if (configuration->slot_num != -1) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1049 |
! rv = find_slot_by_number(ph, configuration->slot_num, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1050 |
! } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1051 |
! |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1052 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1053 |
/* user gave us a user id and no smart card go to next module */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1054 |
release_pkcs11_module(ph); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1055 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1056 |
*** 364,370 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1057 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1058 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1059 |
} else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1060 |
! pam_prompt(pamh, PAM_TEXT_INFO, NULL, _("Smart card inserted. ")); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1061 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1062 |
rv = open_pkcs11_session(ph, slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1063 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1064 |
--- 396,404 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1065 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1066 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1067 |
} else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1068 |
! sprintf(password_prompt, _("Found the %s."), |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1069 |
! _(configuration->token_type)); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1070 |
! pam_prompt(pamh, PAM_TEXT_INFO, NULL, password_prompt); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1071 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1072 |
rv = open_pkcs11_session(ph, slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1073 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1074 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1075 |
*** 375,390 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1076 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1077 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1078 |
/* get password */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1079 |
! sprintf(password_prompt, _("Welcome %.32s!"), get_slot_label(ph)); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1080 |
pam_prompt(pamh, PAM_TEXT_INFO, NULL, password_prompt); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1081 |
if (configuration->use_first_pass) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1082 |
rv = pam_get_pwd(pamh, &password, NULL, PAM_AUTHTOK, 0); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1083 |
} else if (configuration->try_first_pass) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1084 |
! rv = pam_get_pwd(pamh, &password, _("Smart card password: "), PAM_AUTHTOK, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1085 |
PAM_AUTHTOK); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1086 |
} else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1087 |
! rv = pam_get_pwd(pamh, &password, _("Smart card password: "), 0, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1088 |
! PAM_AUTHTOK); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1089 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1090 |
if (rv != PAM_SUCCESS) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1091 |
release_pkcs11_module(ph); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1092 |
--- 409,424 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1093 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1094 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1095 |
/* get password */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1096 |
! sprintf(password_prompt, _("Welcome %.32s!"), get_slot_tokenlabel(ph)); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1097 |
pam_prompt(pamh, PAM_TEXT_INFO, NULL, password_prompt); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1098 |
+ sprintf(password_prompt, _("%s PIN: "), _(configuration->token_type)); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1099 |
if (configuration->use_first_pass) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1100 |
rv = pam_get_pwd(pamh, &password, NULL, PAM_AUTHTOK, 0); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1101 |
} else if (configuration->try_first_pass) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1102 |
! rv = pam_get_pwd(pamh, &password, password_prompt, PAM_AUTHTOK, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1103 |
PAM_AUTHTOK); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1104 |
} else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1105 |
! rv = pam_get_pwd(pamh, &password, password_prompt, 0, PAM_AUTHTOK); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1106 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1107 |
if (rv != PAM_SUCCESS) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1108 |
release_pkcs11_module(ph); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1109 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1110 |
*** 558,564 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1111 |
snprintf(env_temp, sizeof(env_temp) - 1, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1112 |
"PKCS11_LOGIN_TOKEN_NAME=%.*s", |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1113 |
(sizeof(env_temp) - 1) - strlen("PKCS11_LOGIN_TOKEN_NAME="), |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1114 |
! get_slot_label(ph)); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1115 |
rv = pam_putenv(pamh, env_temp); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1116 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1117 |
if (rv != PAM_SUCCESS) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1118 |
--- 592,598 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1119 |
snprintf(env_temp, sizeof(env_temp) - 1, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1120 |
"PKCS11_LOGIN_TOKEN_NAME=%.*s", |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1121 |
(sizeof(env_temp) - 1) - strlen("PKCS11_LOGIN_TOKEN_NAME="), |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1122 |
! get_slot_tokenlabel(ph)); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1123 |
rv = pam_putenv(pamh, env_temp); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1124 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1125 |
if (rv != PAM_SUCCESS) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1126 |
*** pam_pkcs11-0.6.0-ORIG/src/pam_pkcs11/pam_config.c Mon May 21 02:46:19 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1127 |
--- pam_pkcs11-WS/src/pam_pkcs11/pam_config.c Mon Sep 28 16:06:48 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1128 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1129 |
*** 20,25 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1130 |
--- 20,26 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1131 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1132 |
#include <syslog.h> |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1133 |
#include <string.h> |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1134 |
+ #include "config.h" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1135 |
#include "../scconf/scconf.h" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1136 |
#include "../common/debug.h" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1137 |
#include "../common/error.h" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1138 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1139 |
*** 27,38 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1140 |
--- 28,45 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1141 |
#include "pam_config.h" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1142 |
#include "mapper_mgr.h" |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1143 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1144 |
+ #define N_(string) (string) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1145 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1146 |
/* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1147 |
* configuration related functions |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1148 |
*/ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1149 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1150 |
struct configuration_st configuration = { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1151 |
+ #ifndef ORIGINAL /* SUN_SOLARIS */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1152 |
+ "/etc/security/pam_pkcs11/pam_pkcs11.conf", |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1153 |
+ #else |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1154 |
"/etc/pam_pkcs11/pam_pkcs11.conf", /* char * config_file; */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1155 |
+ #endif |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1156 |
NULL, /* scconf_context *ctx; */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1157 |
0, /* int debug; */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1158 |
0, /* int nullok; */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1159 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1160 |
*** 44,57 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1161 |
"default", /* const char *pkcs11_module; */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1162 |
"/etc/pam_pkcs11/pkcs11_module.so",/* const char *pkcs11_module_path; */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1163 |
NULL, /* screen savers */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1164 |
! 0, /* int slot_num; */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1165 |
0, /* support threads */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1166 |
/* cert policy; */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1167 |
{ 0,CRLP_NONE,0,"/etc/pam_pkcs11/cacerts","/etc/pam_pkcs11/crls","/etc/pam_pkcs11/nssdb",OCSP_NONE }, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1168 |
NULL /* char *username */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1169 |
}; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1170 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1171 |
- #if 0 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1172 |
static void display_config (void) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1173 |
DBG1("debug %d",configuration.debug); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1174 |
DBG1("nullok %d",configuration.nullok); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1175 |
--- 51,65 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1176 |
"default", /* const char *pkcs11_module; */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1177 |
"/etc/pam_pkcs11/pkcs11_module.so",/* const char *pkcs11_module_path; */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1178 |
NULL, /* screen savers */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1179 |
! NULL, /* slot_description */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1180 |
! -1, /* int slot_num; */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1181 |
0, /* support threads */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1182 |
/* cert policy; */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1183 |
{ 0,CRLP_NONE,0,"/etc/pam_pkcs11/cacerts","/etc/pam_pkcs11/crls","/etc/pam_pkcs11/nssdb",OCSP_NONE }, |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1184 |
+ N_("Smart card"), /* token_type */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1185 |
NULL /* char *username */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1186 |
}; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1187 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1188 |
static void display_config (void) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1189 |
DBG1("debug %d",configuration.debug); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1190 |
DBG1("nullok %d",configuration.nullok); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1191 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1192 |
*** 71,77 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1193 |
DBG1("signature_policy %d",configuration.policy.signature_policy); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1194 |
DBG1("ocsp_policy %d",configuration.policy.ocsp_policy); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1195 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1196 |
- #endif |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1197 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1198 |
/* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1199 |
parse configuration file |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1200 |
--- 79,84 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1201 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1202 |
*** 136,143 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1203 |
--- 143,164 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1204 |
scconf_get_str(pkcs11_mblk,"crl_dir",configuration.policy.crl_dir); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1205 |
configuration.policy.nss_dir = (char *) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1206 |
scconf_get_str(pkcs11_mblk,"nss_dir",configuration.policy.nss_dir); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1207 |
+ configuration.slot_description = (char *) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1208 |
+ scconf_get_str(pkcs11_mblk,"slot_description",configuration.slot_description); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1209 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1210 |
configuration.slot_num = |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1211 |
scconf_get_int(pkcs11_mblk,"slot_num",configuration.slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1212 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1213 |
+ if (configuration.slot_description != NULL && configuration.slot_num != -1) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1214 |
+ DBG1("Can not specify both slot_description and slot_num in file %s",configuration.config_file); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1215 |
+ return; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1216 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1217 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1218 |
+ if (configuration.slot_description == NULL && configuration.slot_num == -1) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1219 |
+ DBG1("Neither slot_description nor slot_num found in file %s",configuration.config_file); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1220 |
+ return; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1221 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1222 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1223 |
configuration.support_threads = |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1224 |
scconf_get_bool(pkcs11_mblk,"support_threads",configuration.support_threads); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1225 |
policy_list= scconf_find_list(pkcs11_mblk,"cert_policy"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1226 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1227 |
*** 165,170 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1228 |
--- 186,194 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1229 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1230 |
policy_list= policy_list->next; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1231 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1232 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1233 |
+ configuration.token_type = (char *) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1234 |
+ scconf_get_str(pkcs11_mblk,"token_type",configuration.token_type); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1235 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1236 |
screen_saver_list = scconf_find_list(root,"screen_savers"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1237 |
if (screen_saver_list) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1238 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1239 |
*** 199,205 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1240 |
int i; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1241 |
int res; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1242 |
/* try to find a configuration file entry */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1243 |
! for (i = 0; i < argc; i++) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1244 |
if (strstr(argv[i],"config_file=") ) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1245 |
configuration.config_file=1+strchr(argv[i],'='); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1246 |
break; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1247 |
--- 223,229 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1248 |
int i; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1249 |
int res; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1250 |
/* try to find a configuration file entry */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1251 |
! for (i = 1; i < argc; i++) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1252 |
if (strstr(argv[i],"config_file=") ) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1253 |
configuration.config_file=1+strchr(argv[i],'='); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1254 |
break; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1255 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1256 |
*** 211,217 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1257 |
/* display_config(); */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1258 |
/* finally parse provided arguments */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1259 |
/* dont skip argv[0] */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1260 |
! for (i = 0; i < argc; i++) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1261 |
if (strcmp("nullok", argv[i]) == 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1262 |
configuration.nullok = 1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1263 |
continue; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1264 |
--- 235,241 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1265 |
/* display_config(); */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1266 |
/* finally parse provided arguments */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1267 |
/* dont skip argv[0] */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1268 |
! for (i = 1; i < argc; i++) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1269 |
if (strcmp("nullok", argv[i]) == 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1270 |
configuration.nullok = 1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1271 |
continue; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1272 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1273 |
*** 246,255 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1274 |
res=sscanf(argv[i],"pkcs11_module=%255s",configuration.pkcs11_module); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1275 |
continue; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1276 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1277 |
if (strstr(argv[i],"slot_num=") ) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1278 |
! res=sscanf(argv[i],"slot_nume=%d",&configuration.slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1279 |
continue; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1280 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1281 |
if (strstr(argv[i],"ca_dir=") ) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1282 |
res=sscanf(argv[i],"ca_dir=%255s",configuration.policy.ca_dir); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1283 |
continue; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1284 |
--- 270,285 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1285 |
res=sscanf(argv[i],"pkcs11_module=%255s",configuration.pkcs11_module); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1286 |
continue; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1287 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1288 |
+ if (strstr(argv[i],"slot_description=") ) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1289 |
+ res=sscanf(argv[i],"slot_description=%255s",configuration.slot_description); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1290 |
+ continue; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1291 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1292 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1293 |
if (strstr(argv[i],"slot_num=") ) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1294 |
! res=sscanf(argv[i],"slot_num=%d",&configuration.slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1295 |
continue; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1296 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1297 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1298 |
if (strstr(argv[i],"ca_dir=") ) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1299 |
res=sscanf(argv[i],"ca_dir=%255s",configuration.policy.ca_dir); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1300 |
continue; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1301 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1302 |
*** 289,294 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1303 |
--- 319,330 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1304 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1305 |
continue; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1306 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1307 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1308 |
+ if (strstr(argv[i],"token_type=") ) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1309 |
+ res=sscanf(argv[i],"token_type=%255s",configuration.token_type); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1310 |
+ continue; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1311 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1312 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1313 |
if (strstr(argv[i],"config_file=") ) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1314 |
/* already parsed, skip */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1315 |
continue; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1316 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1317 |
*** 299,302 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1318 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1319 |
return &configuration; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1320 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1321 |
- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1322 |
--- 335,337 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1323 |
*** pam_pkcs11-0.6.0-ORIG/src/mappers/ldap_mapper.c Wed Jun 6 02:48:24 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1324 |
--- pam_pkcs11-WS/src/mappers/ldap_mapper.c Mon Sep 28 16:06:48 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1325 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1326 |
*** 184,192 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1327 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1328 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1329 |
# ifdef HAVE_LDAP_INIT |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1330 |
! *ld = ldap_init (uri, defport); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1331 |
# else |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1332 |
! *ld = ldap_open (uri, defport); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1333 |
# endif |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1334 |
rc = (*ld == NULL) ? LDAP_SERVER_DOWN : LDAP_SUCCESS; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1335 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1336 |
--- 184,192 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1337 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1338 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1339 |
# ifdef HAVE_LDAP_INIT |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1340 |
! *ld = ldap_init (uri, ldapdefport); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1341 |
# else |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1342 |
! *ld = ldap_open (uri, ldapdefport); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1343 |
# endif |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1344 |
rc = (*ld == NULL) ? LDAP_SERVER_DOWN : LDAP_SUCCESS; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1345 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1346 |
*** pam_pkcs11-0.6.0-ORIG/src/tools/pkcs11_inspect.c Mon May 21 02:46:19 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1347 |
--- pam_pkcs11-WS/src/tools/pkcs11_inspect.c Mon Sep 28 16:06:48 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1348 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1349 |
*** 53,58 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1350 |
--- 53,63 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1351 |
return 1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1352 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1353 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1354 |
+ if ((configuration->slot_description != NULL && configuration->slot_num != -1) || (configuration->slot_description == NULL && configuration->slot_num == -1)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1355 |
+ ERR("Error setting configuration parameters"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1356 |
+ return 1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1357 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1358 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1359 |
/* init openssl */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1360 |
rv = crypto_init(&configuration->policy); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1361 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1362 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1363 |
*** 79,85 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1364 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1365 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1366 |
/* open pkcs #11 session */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1367 |
! rv = find_slot_by_number(ph, configuration->slot_num, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1368 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1369 |
release_pkcs11_module(ph); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1370 |
DBG("no token available"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1371 |
--- 84,95 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1372 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1373 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1374 |
/* open pkcs #11 session */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1375 |
! if (configuration->slot_description != NULL) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1376 |
! rv = find_slot_by_slotlabel(ph, configuration->slot_description, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1377 |
! } else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1378 |
! rv = find_slot_by_number(ph, configuration->slot_num, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1379 |
! } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1380 |
! |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1381 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1382 |
release_pkcs11_module(ph); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1383 |
DBG("no token available"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1384 |
*** pam_pkcs11-0.6.0-ORIG/src/tools/pklogin_finder.c Wed Jun 6 03:00:36 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1385 |
--- pam_pkcs11-WS/src/tools/pklogin_finder.c Mon Sep 28 16:06:48 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1386 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1387 |
*** 55,60 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1388 |
--- 55,65 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1389 |
return 1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1390 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1391 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1392 |
+ if ((configuration->slot_description != NULL && configuration->slot_num != -1) || (configuration->slot_description == NULL && configuration->slot_num == -1)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1393 |
+ ERR("Error setting configuration parameters"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1394 |
+ return 1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1395 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1396 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1397 |
/* init openssl */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1398 |
rv = crypto_init(&configuration->policy); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1399 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1400 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1401 |
*** 80,86 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1402 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1403 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1404 |
/* open pkcs #11 session */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1405 |
! rv = find_slot_by_number(ph,configuration->slot_num, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1406 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1407 |
release_pkcs11_module(ph); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1408 |
DBG("no token available"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1409 |
--- 85,95 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1410 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1411 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1412 |
/* open pkcs #11 session */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1413 |
! if (configuration->slot_description != NULL) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1414 |
! rv = find_slot_by_slotlabel(ph,configuration->slot_description, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1415 |
! } else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1416 |
! rv = find_slot_by_number(ph,configuration->slot_num, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1417 |
! } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1418 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1419 |
release_pkcs11_module(ph); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1420 |
DBG("no token available"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1421 |
*** pam_pkcs11-0.6.0-ORIG/src/tools/pkcs11_eventmgr.c Wed Jun 6 04:14:27 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1422 |
--- pam_pkcs11-WS/src/tools/pkcs11_eventmgr.c Mon Sep 28 16:06:48 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1423 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1424 |
*** 430,435 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1425 |
--- 430,436 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1426 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1427 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1428 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1429 |
+ #ifdef HAVE_DAEMON |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1430 |
if (daemonize) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1431 |
DBG("Going to be daemon..."); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1432 |
if ( daemon(0,debug)<0 ) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1433 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1434 |
*** 440,445 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1435 |
--- 441,447 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1436 |
return 1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1437 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1438 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1439 |
+ #endif |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1440 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1441 |
/* |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1442 |
* Wait endlessly for all events in the list of readers |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1443 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1444 |
*** 512,517 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1445 |
--- 514,520 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1446 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1447 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1448 |
/* put my self into background if flag is set */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1449 |
+ #ifdef HAVE_DAEMON |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1450 |
if (daemonize) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1451 |
DBG("Going to be daemon..."); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1452 |
if ( daemon(0,debug)<0 ) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1453 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1454 |
*** 521,526 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1455 |
--- 524,530 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1456 |
return 1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1457 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1458 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1459 |
+ #endif |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1460 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1461 |
/* open pkcs11 sesion */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1462 |
DBG("initialising pkcs #11 module..."); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1463 |
*** pam_pkcs11-0.6.0-ORIG/src/tools/pkcs11_listcerts.c Mon May 21 02:46:19 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1464 |
--- pam_pkcs11-WS/src/tools/pkcs11_listcerts.c Mon Sep 28 16:06:48 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1465 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1466 |
*** 53,58 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1467 |
--- 53,63 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1468 |
return 1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1469 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1470 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1471 |
+ if ((configuration->slot_description != NULL && configuration->slot_num != -1) || (configuration->slot_description == NULL && configuration->slot_num == -1)) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1472 |
+ ERR("Error setting configuration parameters"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1473 |
+ return 1; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1474 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1475 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1476 |
/* init openssl */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1477 |
rv = crypto_init(&configuration->policy); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1478 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1479 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1480 |
*** 78,84 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1481 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1482 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1483 |
/* open pkcs #11 session */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1484 |
! rv = find_slot_by_number(ph, configuration->slot_num, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1485 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1486 |
release_pkcs11_module(ph); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1487 |
DBG("no token available"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1488 |
--- 83,94 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1489 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1490 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1491 |
/* open pkcs #11 session */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1492 |
! if (configuration->slot_description != NULL) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1493 |
! rv = find_slot_by_slotlabel(ph,configuration->slot_description, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1494 |
! } else { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1495 |
! rv = find_slot_by_number(ph,configuration->slot_num, &slot_num); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1496 |
! } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1497 |
! |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1498 |
if (rv != 0) { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1499 |
release_pkcs11_module(ph); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1500 |
DBG("no token available"); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1501 |
*** pam_pkcs11-0.6.0-ORIG/src/tools/pkcs11_setup.c Wed Jun 6 04:20:09 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1502 |
--- pam_pkcs11-WS/src/tools/pkcs11_setup.c Mon Sep 28 16:06:48 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1503 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1504 |
*** 60,65 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1505 |
--- 60,92 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1506 |
return value; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1507 |
} |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1508 |
|
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1509 |
+ #ifndef ORIGINAL /* SUN_SOLARIS */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1510 |
+ /* Written by Niels M\ufffd\ufffdller <[email protected]> |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1511 |
+ * modified by Ludovic Rousseau <[email protected]> |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1512 |
+ * |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1513 |
+ * This file is hereby placed in the public domain. |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1514 |
+ */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1515 |
+ static char * strndup (const char *s, size_t size) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1516 |
+ { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1517 |
+ char *r; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1518 |
+ char *end = memchr(s, 0, size); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1519 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1520 |
+ if (NULL == end) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1521 |
+ return NULL; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1522 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1523 |
+ /* Length */ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1524 |
+ size = end - s; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1525 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1526 |
+ r = malloc(size+1); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1527 |
+ if (r) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1528 |
+ { |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1529 |
+ memcpy(r, s, size); |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1530 |
+ r[size] = '\0'; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1531 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1532 |
+ return r; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1533 |
+ } |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1534 |
+ #endif |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1535 |
+ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1536 |
static int scconf_replace_str_list(scconf_block * block, const char *option, const char *value) |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1537 |
{ |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1538 |
scconf_list *list = NULL; |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1539 |
*** pam_pkcs11-0.6.0-ORIG/tools/make_hash_link.sh Mon May 21 02:46:19 2007 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1540 |
--- pam_pkcs11-WS/tools/make_hash_link.sh Mon Sep 28 16:06:48 2009 |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1541 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1542 |
*** 54,60 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1543 |
hash=`$OPENSSL x509 -inform pem -in $file -noout -hash 2> /dev/null` |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1544 |
if [ ! -z $hash ]; then |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1545 |
is_ca=`$OPENSSL x509 -inform pem -in $file -noout -text | grep 'CA:TRUE'` |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1546 |
! if [ ! -z $is_ca ]; then |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1547 |
hash=$hash. |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1548 |
mk_link |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1549 |
fi |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1550 |
--- 54,60 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1551 |
hash=`$OPENSSL x509 -inform pem -in $file -noout -hash 2> /dev/null` |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1552 |
if [ ! -z $hash ]; then |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1553 |
is_ca=`$OPENSSL x509 -inform pem -in $file -noout -text | grep 'CA:TRUE'` |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1554 |
! if [ ! -z "$is_ca" ]; then |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1555 |
hash=$hash. |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1556 |
mk_link |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1557 |
fi |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1558 |
*************** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1559 |
*** 63,69 **** |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1560 |
hash=`$OPENSSL x509 -inform der -in $file -noout -hash 2> /dev/null` |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1561 |
if [ ! -z $hash ]; then |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1562 |
is_ca=`$OPENSSL x509 -inform der -in $file -noout -text | grep 'CA:TRUE'` |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1563 |
! if [ ! -z $is_ca ]; then |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1564 |
hash=$hash. |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1565 |
mk_link |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1566 |
fi |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1567 |
--- 63,69 ---- |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1568 |
hash=`$OPENSSL x509 -inform der -in $file -noout -hash 2> /dev/null` |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1569 |
if [ ! -z $hash ]; then |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1570 |
is_ca=`$OPENSSL x509 -inform der -in $file -noout -text | grep 'CA:TRUE'` |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1571 |
! if [ ! -z "$is_ca" ]; then |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1572 |
hash=$hash. |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1573 |
mk_link |
b454e61af367
7050151 migrate pam_pkcs11 from sfw to userland
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1574 |
fi |