*** pam_pkcs11-0.6.0-ORIG/configure.in	Mon Jun 11 05:17:38 2007

--- pam_pkcs11-WS/configure.in	Mon Sep 28 16:06:48 2009

***************

*** 237,243 ****

  AC_FUNC_REALLOC

  AC_FUNC_STAT

  AC_FUNC_VPRINTF

! AC_CHECK_FUNCS([memset strdup strerror])

  AC_CONFIG_FILES([ 

--- 237,243 ----

  AC_FUNC_REALLOC

  AC_FUNC_STAT

  AC_FUNC_VPRINTF

! AC_CHECK_FUNCS([memset strdup strerror daemon])

  AC_CONFIG_FILES([ 

*** pam_pkcs11-0.6.0-ORIG/po/Makefile.in.in	Tue May 22 00:54:56 2007

--- pam_pkcs11-WS/po/Makefile.in.in	Mon Sep 28 16:06:48 2009

***************

*** 46,61 ****

  GMSGFMT_ = @GMSGFMT@

  GMSGFMT_no = @GMSGFMT@

  GMSGFMT_yes = @GMSGFMT_015@

! GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))

  MSGFMT_ = @MSGFMT@

  MSGFMT_no = @MSGFMT@

  MSGFMT_yes = @MSGFMT_015@

  MSGFMT = $(MSGFMT_$(USE_MSGCTXT))

! XGETTEXT_ = @XGETTEXT@

  XGETTEXT_no = @XGETTEXT@

  XGETTEXT_yes = @XGETTEXT_015@

  XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))

! MSGMERGE = msgmerge

  MSGMERGE_UPDATE = @MSGMERGE@ --update

  MSGINIT = msginit

  MSGCONV = msgconv

--- 46,61 ----

  GMSGFMT_ = @GMSGFMT@

  GMSGFMT_no = @GMSGFMT@

  GMSGFMT_yes = @GMSGFMT_015@

! GMSGFMT = msgfmt

  MSGFMT_ = @MSGFMT@

  MSGFMT_no = @MSGFMT@

  MSGFMT_yes = @MSGFMT_015@

  MSGFMT = $(MSGFMT_$(USE_MSGCTXT))

! XGETTEXT_ = /bin/xgettext

  XGETTEXT_no = @XGETTEXT@

  XGETTEXT_yes = @XGETTEXT_015@

  XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))

! MSGMERGE = /usr/lib/intltool/gettext-tools/msgmerge

  MSGMERGE_UPDATE = @MSGMERGE@ --update

  MSGINIT = msginit

  MSGCONV = msgconv

***************

*** 87,94 ****

  .po.gmo:

  	@lang=`echo $* | sed -e 's,.*/,,'`; \

  	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \

! 	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \

! 	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo

  .sin.sed:

  	sed -e '/^#/d' $< > t-$@

--- 87,94 ----

  .po.gmo:

  	@lang=`echo $* | sed -e 's,.*/,,'`; \

  	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \

! 	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -o $${lang}.gmo $${lang}.po"; \

! 	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo

  .sin.sed:

  	sed -e '/^#/d' $< > t-$@

***************

*** 135,145 ****

  	else \

  	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \

  	fi; \

! 	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \

! 	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \

! 	  --files-from=$(srcdir)/POTFILES.in \

! 	  --copyright-holder='$(COPYRIGHT_HOLDER)' \

! 	  --msgid-bugs-address="$$msgid_bugs_address"

  	test ! -f $(DOMAIN).po || { \

  	  if test -f $(srcdir)/$(DOMAIN).pot; then \

  	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \

--- 135,142 ----

  	else \

  	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \

  	fi; \

! 	$(XGETTEXT) -ns -c TRANSLATORS: -m "" -d $(DOMAIN) \

! 	  ../src/pam_pkcs11/pam_pkcs11.c

  	test ! -f $(DOMAIN).po || { \

  	  if test -f $(srcdir)/$(DOMAIN).pot; then \

  	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \

*** pam_pkcs11-0.6.0-ORIG/src/common/pkcs11_lib.h	Mon May 21 02:46:19 2007

--- pam_pkcs11-WS/src/common/pkcs11_lib.h	Mon Sep 28 16:06:48 2009

***************

*** 36,46 ****

  PKCS11_EXTERN int find_slot_by_number_and_label(pkcs11_handle_t *h,

                                        int slot_num, const char *slot_label,

                                        unsigned int *slot);

! PKCS11_EXTERN const char *get_slot_label(pkcs11_handle_t *h);

  PKCS11_EXTERN int wait_for_token(pkcs11_handle_t *h,

                                   int wanted_slot_num, 

                                   const char *wanted_slot_label,

                                   unsigned int *slot);

  PKCS11_EXTERN const X509 *get_X509_certificate(cert_object_t *cert);

  PKCS11_EXTERN void release_pkcs11_module(pkcs11_handle_t *h);

  PKCS11_EXTERN int open_pkcs11_session(pkcs11_handle_t *h, unsigned int slot);

--- 36,57 ----

  PKCS11_EXTERN int find_slot_by_number_and_label(pkcs11_handle_t *h,

                                        int slot_num, const char *slot_label,

                                        unsigned int *slot);

! PKCS11_EXTERN const char *get_slot_tokenlabel(pkcs11_handle_t *h);

  PKCS11_EXTERN int wait_for_token(pkcs11_handle_t *h,

                                   int wanted_slot_num, 

+                                  const char *wanted_token_label,

+                                  unsigned int *slot);

+ PKCS11_EXTERN int find_slot_by_slotlabel(pkcs11_handle_t *h,

                                   const char *wanted_slot_label,

                                   unsigned int *slot);

+ PKCS11_EXTERN int find_slot_by_slotlabel_and_tokenlabel(pkcs11_handle_t *h,

+                                  const char *wanted_slot_label,

+                                  const char *wanted_token_label,

+                                  unsigned int *slot);

+ PKCS11_EXTERN int wait_for_token_by_slotlabel(pkcs11_handle_t *h,

+                                  const char *wanted_slot_label, 

+                                  const char *wanted_token_label,

+                                  unsigned int *slot);

  PKCS11_EXTERN const X509 *get_X509_certificate(cert_object_t *cert);

  PKCS11_EXTERN void release_pkcs11_module(pkcs11_handle_t *h);

  PKCS11_EXTERN int open_pkcs11_session(pkcs11_handle_t *h, unsigned int slot);

*** pam_pkcs11-0.6.0-ORIG/src/common/pkcs11_lib.c	Wed Jun  6 02:33:10 2007

--- pam_pkcs11-WS/src/common/pkcs11_lib.c	Mon Sep 28 16:06:48 2009

***************

*** 67,77 ****

--- 67,138 ----

    return 0;

  }

+ /*

+  * memcmp_pad_max() is a specialized version of memcmp() which compares two

+  * pieces of data up to a maximum length.  If the two data match up the

+  * maximum length, they are considered matching.  Trailing blanks do not cause

+  * the match to fail if one of the data is shorted.

+  *

+  * Examples of matches:

+  *	"one"           |

+  *	"one      "     |

+  *	                ^maximum length

+  *

+  *	"Number One     |  X"	(X is beyond maximum length)

+  *	"Number One   " |

+  *	                ^maximum length

+  *

+  * Examples of mismatches:

+  *	" one"

+  *	"one"

+  *

+  *	"Number One    X|"

+  *	"Number One     |"

+  *	                ^maximum length

+  */

+ static int

+ memcmp_pad_max(void *d1, size_t d1_len, void *d2, size_t d2_len,

+     size_t max_sz)

+ {

+ 	size_t		len, extra_len;

+ 	char		*marker;

+ 

+ 	/* No point in comparing anything beyond max_sz */

+ 	if (d1_len > max_sz)

+ 		d1_len = max_sz;

+ 	if (d2_len > max_sz)

+ 		d2_len = max_sz;

+ 

+ 	/* Find shorter of the two data. */

+ 	if (d1_len <= d2_len) {

+ 		len = d1_len;

+ 		extra_len = d2_len;

+ 		marker = d2;

+ 	} else {	/* d1_len > d2_len */

+ 		len = d2_len;

+ 		extra_len = d1_len;

+ 		marker = d1;

+ 	}

+ 

+ 	/* Have a match in the shortest length of data? */

+ 	if (memcmp(d1, d2, len) != 0)

+ 		/* CONSTCOND */

+ 		return (1);

+ 

+ 	/* If the rest of longer data is nulls or blanks, call it a match. */

+ 	while (len < extra_len && marker[len])

+ 		if (!isspace(marker[len++]))

+ 			/* CONSTCOND */

+ 			return (1);

+ 	return (0);

+ }

+ 

  #ifdef HAVE_NSS

  /*

   * Using NSS to find the manage the PKCS #11 modules

   */

  #include "nss.h"

+ #include "nspr.h"

  #include "cert.h"

  #include "secmod.h"

  #include "pk11pub.h"

***************

*** 287,294 ****

    /* we're configured for a specific module and token, see if it's present */

    slot_num--;

    if (slot_num >= 0 && slot_num < module->slotCount && module->slots &&

!       module->slots[i] && PK11_IsPresent(module->slots[i])) {

!     h->slot = PK11_ReferenceSlot(module->slots[i]);

      *slotID = PK11_GetSlotID(h->slot);

      return 0;

    }

--- 348,355 ----

    /* we're configured for a specific module and token, see if it's present */

    slot_num--;

    if (slot_num >= 0 && slot_num < module->slotCount && module->slots &&

!       module->slots[slot_num] && PK11_IsPresent(module->slots[slot_num])) {

!     h->slot = PK11_ReferenceSlot(module->slots[slot_num]);

      *slotID = PK11_GetSlotID(h->slot);

      return 0;

    }

***************

*** 301,327 ****

   */

  int find_slot_by_number_and_label(pkcs11_handle_t *h, 

  				  int wanted_slot_id,

! 				  const char *wanted_slot_label,

                                    unsigned int *slot_num)

  {

    int rv;

!   const char *slot_label = NULL;

    PK11SlotInfo *slot = NULL;

    /* we want a specific slot id, or we don't kare about the label */

!   if ((wanted_slot_label == NULL) || (wanted_slot_id != 0)) {

      rv = find_slot_by_number(h, wanted_slot_id, slot_num);

      /* if we don't care about the label, or we failed, we're done */

!     if ((wanted_slot_label == NULL) || (rv != 0)) {

        return rv;

      }

      /* verify it's the label we want */

!     slot_label = PK11_GetTokenName(h->slot);

!     if ((slot_label != NULL) && 

!         (strcmp (wanted_slot_label, slot_label) == 0)) {

        return 0;

      }

      return -1;

--- 362,388 ----

   */

  int find_slot_by_number_and_label(pkcs11_handle_t *h, 

  				  int wanted_slot_id,

! 				  const char *wanted_token_label,

                                    unsigned int *slot_num)

  {

    int rv;

!   const char *token_label = NULL;

    PK11SlotInfo *slot = NULL;

    /* we want a specific slot id, or we don't kare about the label */

!   if ((wanted_token_label == NULL) || (wanted_slot_id != 0)) {

      rv = find_slot_by_number(h, wanted_slot_id, slot_num);

      /* if we don't care about the label, or we failed, we're done */

!     if ((wanted_token_label == NULL) || (rv != 0)) {

        return rv;

      }

      /* verify it's the label we want */

!     token_label = PK11_GetTokenName(h->slot);

!     if ((token_label != NULL) && 

!         (strcmp (wanted_token_label, token_label) == 0)) {

        return 0;

      }

      return -1;

***************

*** 328,334 ****

    }

    /* we want a specific slot by label only */

!   slot = PK11_FindSlotByName(wanted_slot_label);

    if (!slot) {

      return -1;

    }

--- 389,395 ----

    }

    /* we want a specific slot by label only */

!   slot = PK11_FindSlotByName(wanted_token_label);

    if (!slot) {

      return -1;

    }

***************

*** 350,356 ****

  int wait_for_token(pkcs11_handle_t *h, 

                     int wanted_slot_id,

!                    const char *wanted_slot_label,

                     unsigned int *slot_num)

  {

    int rv;

--- 411,417 ----

  int wait_for_token(pkcs11_handle_t *h, 

                     int wanted_slot_id,

!                    const char *wanted_token_label,

                     unsigned int *slot_num)

  {

    int rv;

***************

*** 358,364 ****

    rv = -1;

    do {

      /* see if the card we're looking for is inserted */

!     rv = find_slot_by_number_and_label (h, wanted_slot_id,  wanted_slot_label,

                                          slot_num);

      if (rv !=  0) {

        PK11SlotInfo *slot;

--- 419,425 ----

    rv = -1;

    do {

      /* see if the card we're looking for is inserted */

!     rv = find_slot_by_number_and_label (h, wanted_slot_id,  wanted_token_label,

                                          slot_num);

      if (rv !=  0) {

        PK11SlotInfo *slot;

***************

*** 385,390 ****

--- 446,592 ----

    return rv;

  }

+ /* 

+  * This function will search the slot list to find a slot based on the slot

+  * label.  If the wanted_slot_label is "none", then we will return the first

+  * slot with the token presented.

+  * 

+  * This function return 0 if it found a matching slot; otherwise, it returns

+  * -1.

+  */

+ int

+ find_slot_by_slotlabel(pkcs11_handle_t *h, const char *wanted_slot_label,

+     unsigned int *slotID)

+ {

+   SECMODModule *module = h->module;

+   PK11SlotInfo *slot;

+   int rv;

+   int i;

+ 

+   if (slotID == NULL || wanted_slot_label == NULL ||

+       strlen(wanted_slot_label) == 0 || module == NULL)

+     return (-1);

+ 

+   if (strcmp(wanted_slot_label, "none") == 0) {

+     rv = find_slot_by_number(h, 0, slotID);

+     return (rv);

+   } else {

+     /* wanted_slot_label is not "none"  */

+     for (i = 0; i < module->slotCount; i++) {

+       if (module->slots[i] && PK11_IsPresent(module->slots[i])) {

+         const char *slot_label;

+ 

+ 	slot = PK11_ReferenceSlot(module->slots[i]);

+ 	slot_label = PK11_GetSlotName(slot);	

+ 	if (memcmp_pad_max((void *)slot_label, strlen(slot_label),

+ 	    (void *)wanted_slot_label, strlen(wanted_slot_label), 64) == 0) {

+ 	  h->slot = slot;

+ 	  *slotID = PK11_GetSlotID(slot);

+ 	  return 0;

+         }

+       }

+     }

+   }

+ 

+   return (-1);

+ }

+ 

+ int

+ find_slot_by_slotlabel_and_tokenlabel(pkcs11_handle_t *h,

+     const char *wanted_slot_label, const char *wanted_token_label,

+     unsigned int *slot_num)

+ {

+   SECMODModule *module = h->module;

+   PK11SlotInfo *slot;

+   unsigned long i;

+   int rv;

+ 

+   if (slot_num == NULL || module == NULL)

+     return (-1);

+ 

+   if (wanted_token_label == NULL){ 

+     rv = find_slot_by_slotlabel(h, wanted_slot_label, slot_num);

+     return (rv);

+   }

+ 

+   /* wanted_token_label != NULL */

+   if (strcmp(wanted_slot_label, "none") == 0) { 

+     for (i = 0; i < module->slotCount; i++) {

+       if (module->slots[i] && PK11_IsPresent(module->slots[i])) {

+ 	const char *token_label;

+ 	slot = PK11_ReferenceSlot(module->slots[i]);

+ 	token_label = PK11_GetTokenName(slot);

+ 	if (memcmp_pad_max((void *) token_label, strlen(token_label),

+ 	    (void *)wanted_token_label, strlen(wanted_token_label), 33) == 0) {

+           h->slot =  slot;

+           *slot_num =  PK11_GetSlotID(slot);

+ 	  return (0);

+         }

+       }

+     }

+     return (-1);

+   } else {

+     for (i = 0; i < module->slotCount; i++) {

+       if (module->slots[i] && PK11_IsPresent(module->slots[i])) {

+ 	const char *slot_label;

+ 	const char *token_label;

+ 

+ 	slot = PK11_ReferenceSlot(module->slots[i]);

+ 	slot_label = PK11_GetSlotName(slot);

+ 	token_label = PK11_GetTokenName(slot);

+ 	if ((memcmp_pad_max((void *)slot_label, strlen(slot_label),

+ 	    (void *)wanted_slot_label, strlen(wanted_slot_label), 64) == 0) &&

+             (memcmp_pad_max((void *)token_label, strlen(token_label),

+ 	    (void *)wanted_token_label, strlen(wanted_token_label), 33) == 0))

+ 	{

+           h->slot =  slot;

+           *slot_num =  PK11_GetSlotID(slot);

+ 	  return (0);

+         }

+       }

+     }

+     return (-1);

+   }

+ }

+ 

+ int wait_for_token_by_slotlabel(pkcs11_handle_t *h, 

+                    const char *wanted_slot_label,

+                    const char *wanted_token_label,

+                    unsigned int *slot_num)

+ {

+   int rv;

+ 

+   rv = -1;

+   do {

+     /* see if the card we're looking for is inserted */

+     rv = find_slot_by_slotlabel_and_tokenlabel (h, wanted_slot_label,

+ 	wanted_token_label, slot_num);

+   

+     if (rv !=  0) {

+       PK11SlotInfo *slot;

+       PRIntervalTime slot_poll_interval; /* only for legacy hardware */

+ 

+       /* if the card is not inserted, then block until something happens */

+       slot_poll_interval = PR_MillisecondsToInterval(PAM_PKCS11_POLL_TIME);

+       slot = SECMOD_WaitForAnyTokenEvent(h->module, 0 /* flags */,

+                                          slot_poll_interval);

+ 

+       /* unexpected error */

+       if (slot == NULL) {

+         break;

+       }

+ 

+       /* something happened, continue loop and check if the card

+        * we're looking for is inserted

+        */

+       PK11_FreeSlot(slot);

+       continue;

+     }

+   } while (rv != 0);

+ 

+   return rv;

+ }

+ 

  void release_pkcs11_module(pkcs11_handle_t *h) 

  {

    SECStatus rv;

***************

*** 470,476 ****

    return 0;

  }

! const char *get_slot_label(pkcs11_handle_t *h)

  {

    if (!h->slot) {

      return NULL;

--- 672,678 ----

    return 0;

  }

! const char *get_slot_tokenlabel(pkcs11_handle_t *h)

  {

    if (!h->slot) {

      return NULL;

***************

*** 613,619 ****

    return (rv == SECSuccess) ? 0 : -1;

  }

- #include "nspr.h"

  struct tuple_str {

      PRErrorCode	 errNum;

--- 815,820 ----

***************

*** 708,714 ****

  typedef struct {

    CK_SLOT_ID id;

    CK_BBOOL token_present;

!   CK_UTF8CHAR label[33];

  } slot_t;

  struct pkcs11_handle_str {

--- 909,916 ----

  typedef struct {

    CK_SLOT_ID id;