[pkg-opensc-commit] [SCM] OpenSC packaging branch, master, updated. c5fd9b97f47cff49f8ef7867f56ab9266e7bda39

[Eric Dorland]

The following commit has been merged in the master branch:
commit 9e1991c44fe69a832a6cf4fd13268033eb18aff6
Merge: 8eeea4108ff386081e3510161675e5d5b246da41 24010a6513100c572bcc531f9344867ffadef078
Author: Eric Dorland <eric at debian.org>
Date:   Wed Mar 18 02:36:07 2009 -0400

    Merge branch 'upstream'
    
    Conflicts:
    	etc/opensc.conf.in
    	src/tools/pkcs15-tool.c

diff --combined src/signer/dialog.c
index 409e757,c66f434..5dd83ee
--- a/src/signer/dialog.c
+++ b/src/signer/dialog.c
@@@ -3,7 -3,7 +3,7 @@@
  #include <stdarg.h>
  
  #ifndef PIN_ENTRY
 -#define PIN_ENTRY "/usr/local/bin/gpinentry"
 +#define PIN_ENTRY "/usr/bin/pinentry"
  #endif
  
  extern int ask_and_verify_pin_code(struct sc_pkcs15_card *p15card,
@@@ -36,6 -36,7 +36,7 @@@ int ask_and_verify_pin_code(struct sc_p
  			    struct sc_pkcs15_object *pin)
  {
  	int r;
+ 	size_t len;
  	const char *argv[3];
  	const char *pgmname = PIN_ENTRY;
  	ASSUAN_CONTEXT ctx;
@@@ -78,12 -79,12 +79,12 @@@
  			printf("GETPIN: %s\n", assuan_strerror((AssuanError) r));
  			goto err;
  		}
- 		r = strlen(buf);
- 		if (r < pinfo->min_length) {
+ 		len = strlen(buf);
+ 		if (len < pinfo->min_length) {
  			sprintf(errtext, "PIN code too short, min. %lu digits", (unsigned long) pinfo->min_length);
  			continue;
  		}
- 		if (r > pinfo->max_length) {
+ 		if (len > pinfo->max_length) {
  			sprintf(errtext, "PIN code too long, max. %lu digits", (unsigned long) pinfo->max_length);
  			continue;
  		}

-- 
OpenSC packaging