- changed project name to OpenSC

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@52 c6295689-39f2-0310-b995-f0e70906c6a9

src/libopensc/asn1.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "sc.h"
+#include "opensc.h"
 #include "sc-asn1.h"
 #include <stdio.h>
 #include <string.h>

src/libopensc/base64.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "sc.h"
+#include "opensc.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

src/libopensc/defaults.c

@@ -1,6 +1,6 @@
 
-#include "sc.h"
-#include "sc-pkcs15.h"
+#include "opensc.h"
+#include "opensc-pkcs15.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

src/libopensc/opensc-pkcs15.h

@@ -1,5 +1,5 @@
 /*
- * sc-pkcs15.h: PKCS#15 header file
+ * opensc-pkcs15.h: OpenSC PKCS#15 header file
  *
  * Copyright (C) 2001  Juha Yrjölä <juha.yrjola@iki.fi>
  *

src/libopensc/opensc.h

@@ -1,5 +1,5 @@
 /*
- * sc.h: SmartCard library header file
+ * opensc.h: OpenSC library header file
  *
  * Copyright (C) 2001  Juha Yrjölä <juha.yrjola@iki.fi>
  *

src/libopensc/pkcs15-cert.c

@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "sc.h"
-#include "sc-pkcs15.h"
+#include "opensc.h"
+#include "opensc-pkcs15.h"
 #include "sc-asn1.h"
 #include <stdlib.h>
 #include <string.h>

src/libopensc/pkcs15-pin.c

@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "sc.h"
-#include "sc-pkcs15.h"
+#include "opensc.h"
+#include "opensc-pkcs15.h"
 #include "sc-asn1.h"
 #include <assert.h>
 #include <string.h>

src/libopensc/pkcs15-prkey.c

@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "sc.h"
-#include "sc-pkcs15.h"
+#include "opensc.h"
+#include "opensc-pkcs15.h"
 #include "sc-asn1.h"
 #include <stdlib.h>
 #include <string.h>

src/libopensc/pkcs15-sec.c

@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "sc.h"
-#include "sc-pkcs15.h"
+#include "opensc.h"
+#include "opensc-pkcs15.h"
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>

src/libopensc/pkcs15.c

@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "sc.h"
-#include "sc-pkcs15.h"
+#include "opensc.h"
+#include "opensc-pkcs15.h"
 #include "sc-asn1.h"
 #include <stdlib.h>
 #include <string.h>

src/libopensc/pkcs15.h

@@ -1,5 +1,5 @@
 /*
- * sc-pkcs15.h: PKCS#15 header file
+ * opensc-pkcs15.h: OpenSC PKCS#15 header file
  *
  * Copyright (C) 2001  Juha Yrjölä <juha.yrjola@iki.fi>
  *

src/libopensc/sc.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "sc.h"
+#include "opensc.h"
 #include "sc-asn1.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,7 +26,7 @@
 #include <assert.h>
 #include <ctype.h>
 
-const char *sc_version = LIBSC_VERSION;
+const char *sc_version = OPENSC_VERSION;
 int sc_debug = 1;
 
 int _sc_sw_to_errorcode(int sw1, int sw2)

src/libopensc/sec.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "sc.h"
+#include "opensc.h"
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>

src/pam/pam_pkcs15.c

@@ -16,8 +16,8 @@
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
 
-#include <sc.h>
-#include <sc-pkcs15.h>
+#include <opensc.h>
+#include <opensc-pkcs15.h>
 
 #ifndef NDEBUG
 #define DBG(x) { if (pamdebug) { x; } }
@@ -283,6 +283,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t * pamh, int flags, int argc, con
 	}
 	DBG(printf("Verifying PIN code...\n"));
 	r = sc_pkcs15_verify_pin(p15card, pinfo, password, strlen(password));
+	memset(password, 0, strlen(password));
 	if (r) {
 		DBG(printf("PIN code verification failed: %s\n", sc_strerror(r)));
 		if (r == SC_ERROR_CARD_REMOVED)

src/pkcs11/generic.c

@@ -25,7 +25,7 @@
 #include <winscard.h>
 
 #include "sc-pkcs11.h"
-#include <sc.h>
+#include <opensc.h>
 
 struct sc_context *ctx = NULL;
 struct pkcs11_slot slot[PKCS11_MAX_SLOTS];
@@ -36,7 +36,7 @@ void LOG(char *format, ...)
 	va_list valist;
 	FILE *out;
 
-	out = fopen("/tmp/libsc-pkcs11.log", "a");
+	out = fopen("/tmp/libopensc-pkcs11.log", "a");
 	if (out != NULL) {
                 va_start(valist, format);
 		vfprintf(out, format, valist);

src/tests/hst-test.c

@@ -6,8 +6,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sc.h>
-#include <sc-pkcs15.h>
+#include <opensc.h>
+#include <opensc-pkcs15.h>
 #include <sc-asn1.h>
 #include "sc-test.h"
 

src/tests/lottery.c

@@ -4,7 +4,7 @@
  */
 
 #include "sc-test.h"
-#include "sc.h"
+#include "opensc.h"
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>

src/tests/p15dump.c

@@ -6,8 +6,8 @@
  */
 
 #include "sc-test.h"
-#include "sc.h"
-#include "sc-pkcs15.h"
+#include "opensc.h"
+#include "opensc-pkcs15.h"
 #include "sc-asn1.h"
 #include <stdio.h>
 #include <stdlib.h>

src/tests/pintest.c

@@ -6,8 +6,8 @@
  */
 
 #include "sc-test.h"
-#include "sc.h"
-#include "sc-pkcs15.h"
+#include "opensc.h"
+#include "opensc-pkcs15.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

src/tests/prngtest.c

@@ -6,7 +6,7 @@
  */
 
 #include "sc-test.h"
-#include "sc.h"
+#include "opensc.h"
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -51,7 +51,9 @@ int main(int argc, char *argv[])
 			       (foo - foo2)/100);
 			printf("Frequencies:\n");
 			for (i = 0; i < 256; i++) {
-				printf("%02X: %5d ", i, freq[i]);
+				if (i && (i & 0x07) == 0)
+					printf("\n");
+				printf("%02X: %3d ", i, freq[i]);
 			}
 			printf("\n");
 			c = 0;

src/tests/sc-test.c

@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "sc.h"
+#include "opensc.h"
 
 struct sc_context *ctx;
 struct sc_card *card;

src/tools/opensc-crypt.c

@@ -24,8 +24,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <sc.h>
-#include <sc-pkcs15.h>
+#include <opensc.h>
+#include <opensc-pkcs15.h>
 
 int opt_reader = 0, opt_pin = 0, quiet = 0;
 char * opt_pincode = NULL, * opt_key_id = NULL;

src/tools/opensc-tool.c

@@ -24,8 +24,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <sc.h>
-#include <sc-pkcs15.h>
+#include <opensc.h>
+#include <opensc-pkcs15.h>
 
 #define OPT_CHANGE_PIN	0x100
 #define OPT_LIST_PINS	0x101