Changeset 3126

Timestamp:

03/12/07 20:15:39 (22 months ago)

Author:

aj

Message:

changes by Douglas E. Engert:
change the do_decompress* to sc_decompress* and the initialize_* to
sc_pkcs15emu_initialize_* in the new code.

Location:

trunk

Files:

• etc/opensc.conf.in (modified) (3 diffs)
• src/libopensc/card-piv.c (modified) (1 diff)
• src/libopensc/compression.c (modified) (6 diffs)
• src/libopensc/compression.h (modified) (1 diff)
• src/libopensc/p15card-helper.c (modified) (6 diffs)
• src/libopensc/p15card-helper.h (modified) (1 diff)
• src/libopensc/pkcs15-piv.c (modified) (1 diff)
• src/pkcs11/Makefile.mak (modified) (1 diff)

trunk/etc/opensc.conf.in

@@ -154 +154 @@
         #  belpic           Belpic cards
         #  emv              EMV compatible cards
+        #  piv              U.S. NIST 800-73-1 PIV
 
         # Generic format: card_atr <hex encoded ATR (case-sensitive!)>
@@ -229 +230 @@
                 # name = "PIV-II";
                 # driver = "piv";
-                # pkcs15emu = "PIV-II";
         # }
 
@@ -280 +280 @@
                 # enable_builtin_emulation = yes;
                 # list of the builtin pkcs15 emulators to test
-                builtin_emulators = esteid, openpgp, tcos, starcert, infocamere, postecert, actalis, atrust-acos, gemsafe, tccardos;
+                builtin_emulators = esteid, openpgp, tcos, starcert, infocamere, postecert, actalis, atrust-acos, gemsafe, tccardos, PIV-II;
 
                 # additional settings per driver

trunk/src/libopensc/card-piv.c

@@ -679 +679 @@
                 size_t len = count;
                 u8* newBuf = NULL;
-                if(SC_SUCCESS != do_decompress_alloc(&newBuf, &len, tag, taglen, COMPRESSION_AUTO)) {
+                if(SC_SUCCESS != sc_decompress_alloc(&newBuf, &len, tag, taglen, COMPRESSION_AUTO)) {
                         return SC_ERROR_OBJECT_NOT_VALID;
                 } else {

trunk/src/libopensc/compression.c

@@ -59 +59 @@
 }
 
-static int do_decompress_gzip(u8* out, size_t* outLen, const u8* in, size_t inLen) {
+static int sc_decompress_gzip(u8* out, size_t* outLen, const u8* in, size_t inLen) {
         /* Since uncompress does not offer a way to make it uncompress gzip... manually set it up */
         z_stream gz;
@@ -84 +84 @@
 }
 
-int do_decompress(u8* out, size_t* outLen, const u8* in, size_t inLen, int method) {
+int sc_decompress(u8* out, size_t* outLen, const u8* in, size_t inLen, int method) {
         if(method == COMPRESSION_AUTO) {
                 method = detect_method(in, inLen);
@@ -95 +95 @@
                 return zerr_to_opensc(uncompress(out, outLen, in, inLen));
         case COMPRESSION_GZIP:
-                return do_decompress_gzip(out, outLen, in, inLen);
+                return sc_decompress_gzip(out, outLen, in, inLen);
         default:
                 return SC_ERROR_INVALID_ARGUMENTS;
@@ -101 +101 @@
 }
 
-static int do_decompress_zlib_alloc(u8** out, size_t* outLen, const u8* in, size_t inLen, int gzip) {
+static int sc_decompress_zlib_alloc(u8** out, size_t* outLen, const u8* in, size_t inLen, int gzip) {
         /* Since uncompress does not offer a way to make it uncompress gzip... manually set it up */
         z_stream gz;
@@ -158 +158 @@
         return zerr_to_opensc(err);
 }
-int do_decompress_alloc(u8** out, size_t* outLen, const u8* in, size_t inLen, int method) {
+int sc_decompress_alloc(u8** out, size_t* outLen, const u8* in, size_t inLen, int method) {
         if(method == COMPRESSION_AUTO) {
                 method = detect_method(in, inLen);
@@ -167 +167 @@
         switch(method) {
         case COMPRESSION_ZLIB:
-                return do_decompress_zlib_alloc(out, outLen, in, inLen, 0);
+                return sc_decompress_zlib_alloc(out, outLen, in, inLen, 0);
         case COMPRESSION_GZIP:
-                return do_decompress_zlib_alloc(out, outLen, in, inLen, 1);
+                return sc_decompress_zlib_alloc(out, outLen, in, inLen, 1);
         default:
                 return SC_ERROR_INVALID_ARGUMENTS;

trunk/src/libopensc/compression.h

@@ -29 +29 @@
 #define COMPRESSION_UNKNOWN (-1)
 
-int do_decompress_alloc(u8** out, size_t* outLen, const u8* in, size_t inLen, int method);
-int do_decompress(u8* out, size_t* outLen, const u8* in, size_t inLen, int method);
+int sc_decompress_alloc(u8** out, size_t* outLen, const u8* in, size_t inLen, int method);
+int sc_decompress(u8* out, size_t* outLen, const u8* in, size_t inLen, int method);
 
 #endif

trunk/src/libopensc/p15card-helper.c

@@ -30 +30 @@
 #include <openssl/x509.h>
 
-int initialize_objects(sc_pkcs15_card_t *p15card, p15data_items *items) {
+int sc_pkcs15emu_initialize_objects(sc_pkcs15_card_t *p15card, p15data_items *items) {
         sc_card_t* card = p15card->card;
         const objdata* objects = items->objects;
@@ -203 +203 @@
 }
 
-int initialize_certificates(sc_pkcs15_card_t *p15card, p15data_items* items) {
+int sc_pkcs15emu_initialize_certificates(sc_pkcs15_card_t *p15card, p15data_items* items) {
         /* set certs */
         sc_card_t* card = p15card->card;
@@ -267 +267 @@
 }
 
-int initialize_pins(sc_pkcs15_card_t *p15card, p15data_items* items) {
+int sc_pkcs15emu_initialize_pins(sc_pkcs15_card_t *p15card, p15data_items* items) {
         /* set pins */
         int i,r;
@@ -299 +299 @@
 }
 
-int initialize_private_keys(sc_pkcs15_card_t *p15card, p15data_items* items) {
+int sc_pkcs15emu_initialize_private_keys(sc_pkcs15_card_t *p15card, p15data_items* items) {
         const prdata *prkeys = items->private_keys;
         int i, r;
@@ -312 +312 @@
 }
 
-int initialize_public_keys(sc_pkcs15_card_t *p15card, p15data_items *items) {
+int sc_pkcs15emu_initialize_public_keys(sc_pkcs15_card_t *p15card, p15data_items *items) {
         const pubdata *keys = items->public_keys;
         int i, r;
@@ -326 +326 @@
 }
 
-int initialize_all(sc_pkcs15_card_t *p15card, p15data_items* items) {
+int sc_pkcs15emu_initialize_all(sc_pkcs15_card_t *p15card, p15data_items* items) {
         int r;
-        if(SC_SUCCESS != (r = initialize_objects(p15card, items)))
-                return r;
-        if(SC_SUCCESS != (r = initialize_certificates(p15card, items)))
-                return r;
-        if(SC_SUCCESS != (r = initialize_pins(p15card, items)))
-                return r;
-
-        if(items->forced_private && (SC_SUCCESS != (r = initialize_private_keys(p15card, items))))
-                return r;
-        if(items->forced_public && (SC_SUCCESS != (r = initialize_public_keys(p15card, items))))
-                return r;
-        return SC_SUCCESS;
-}
+        if(SC_SUCCESS != (r = sc_pkcs15emu_initialize_objects(p15card, items)))
+                return r;
+        if(SC_SUCCESS != (r = sc_pkcs15emu_initialize_certificates(p15card, items)))
+                return r;
+        if(SC_SUCCESS != (r = sc_pkcs15emu_initialize_pins(p15card, items)))
+                return r;
+
+        if(items->forced_private && (SC_SUCCESS != (r = sc_pkcs15emu_initialize_private_keys(p15card, items))))
+                return r;
+        if(items->forced_public && (SC_SUCCESS != (r = sc_pkcs15emu_initialize_public_keys(p15card, items))))
+                return r;
+        return SC_SUCCESS;
+}

trunk/src/libopensc/p15card-helper.h

@@ -127 +127 @@
 CERT_HANDLE_FUNCTION(default_cert_handle);
 
-int initialize_objects(sc_pkcs15_card_t *p15card, p15data_items* items);
-int initialize_certificates(sc_pkcs15_card_t *p15card, p15data_items* items);
-int initialize_pins(sc_pkcs15_card_t *p15card, p15data_items *items);
-int initialize_private_keys(sc_pkcs15_card_t *p15card, p15data_items *items);
-int initialize_public_keys(sc_pkcs15_card_t *p15card, p15data_items *items);
-int initialize_all(sc_pkcs15_card_t *p15card, p15data_items *items);
+int sc_pkcs15emu_initialize_objects(sc_pkcs15_card_t *p15card, p15data_items* items);
+int sc_pkcs15emu_initialize_certificates(sc_pkcs15_card_t *p15card, p15data_items* items);
+int sc_pkcs15emu_initialize_pins(sc_pkcs15_card_t *p15card, p15data_items *items);
+int sc_pkcs15emu_initialize_private_keys(sc_pkcs15_card_t *p15card, p15data_items *items);
+int sc_pkcs15emu_initialize_public_keys(sc_pkcs15_card_t *p15card, p15data_items *items);
+int sc_pkcs15emu_initialize_all(sc_pkcs15_card_t *p15card, p15data_items *items);
 
 #endif

trunk/src/libopensc/pkcs15-piv.c

@@ -205 +205 @@
         sc_debug(card->ctx, "PIV-II adding objects...");
         
-        r = initialize_all(p15card, &items);
+        r = sc_pkcs15emu_initialize_all(p15card, &items);
 
         SC_FUNC_RETURN(card->ctx, 1, SC_SUCCESS);

trunk/src/pkcs11/Makefile.mak

@@ -15 +15 @@
 OBJECTS3                = pkcs11-spy.obj pkcs11-display.obj libpkcs11.obj
 
-all: install-headers install-headers-dir $(TARGET) $(TARGET2) $(TARGET3)
+all: install-headers $(TARGET) $(TARGET2) $(TARGET3)
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak