--- cardcomm/pkcs11/src/log.h.orig	2015-10-21 10:16:26 UTC
+++ cardcomm/pkcs11/src/log.h
@@ -64,42 +64,42 @@ typedef struct P11_MAP_TYPE 
 
 static P11_MAP_TYPE const P11_CLASS_TYPES[]= 
 {  
-   { CKO_DATA,              "CKO_DATA"                }, 
-   { CKO_CERTIFICATE,       "CKO_CERTIFICATE"         },  
-   { CKO_PUBLIC_KEY,        "CKO_PUBLIC_KEY"          },  
-   { CKO_PRIVATE_KEY,       "CKO_PRIVATE_KEY"         },  
-   { CKO_SECRET_KEY,        "CKO_SECRET_KEY"          },  
-   { CKO_HW_FEATURE,        "CKO_HW_FEATURE"          },  
-   { CKO_DOMAIN_PARAMETERS, "CKO_DOMAIN_PARAMETERS"   },  
-   { CKO_VENDOR_DEFINED,    "CKO_VENDOR_DEFINED"      },
-   {0,0}  
+   { CKO_DATA,              "CKO_DATA",              0 },
+   { CKO_CERTIFICATE,       "CKO_CERTIFICATE",       0 },
+   { CKO_PUBLIC_KEY,        "CKO_PUBLIC_KEY",        0 },
+   { CKO_PRIVATE_KEY,       "CKO_PRIVATE_KEY",       0 },
+   { CKO_SECRET_KEY,        "CKO_SECRET_KEY",        0 },
+   { CKO_HW_FEATURE,        "CKO_HW_FEATURE",        0 },
+   { CKO_DOMAIN_PARAMETERS, "CKO_DOMAIN_PARAMETERS", 0 },
+   { CKO_VENDOR_DEFINED,    "CKO_VENDOR_DEFINED",    0 },
+   {0,0,0}
 };
 
 static P11_MAP_TYPE const P11_CERTIFICATE_TYPES[]= 
 {   
-   { CKC_X_509,            "CKC_X_509"             },  
-   { CKC_X_509_ATTR_CERT,  "CKC_X_509_ATTR_CERT"   },  
-   {0,0}
+   { CKC_X_509,            "CKC_X_509",           0 },
+   { CKC_X_509_ATTR_CERT,  "CKC_X_509_ATTR_CERT", 0 },
+   {0,0,0}
 };
 
 static P11_MAP_TYPE const P11_KEY_TYPES[]= 
 {  
-   { CKK_RSA,        "CKK_RSA"      },  
-	{ CKK_DSA,        "CKK_DSA"      },  
-	{ CKK_DH,         "CKK_DH"       },  
-	{ CKK_ECDSA,      "CKK_ECDSA"    },  
-	{ CKK_EC,         "CKK_EC"       },  
-	{ CKK_RC2,        "CKK_RC2"      },  
-	{ CKK_RC4,        "CKK_RC4"      },  
-	{ CKK_RC5,        "CKK_RC5"      },  
-	{ CKK_DES,        "CKK_DES"      },  
-	{ CKK_DES3,       "CKK_DES3"     },  
-	{ CKK_CAST,       "CKK_CAST"     },  
-	{ CKK_CAST3,      "CKK_CAST3"    },  
-	{ CKK_CAST128,    "CKK_CAST128"  },  
-	{ CKK_IDEA,       "CKK_IDEA"     },  
-	{ CKK_AES,        "CKK_AES"      },  
-	{0,0}
+	{ CKK_RSA,        "CKK_RSA",     0 },
+	{ CKK_DSA,        "CKK_DSA",     0 },
+	{ CKK_DH,         "CKK_DH",      0 },
+	{ CKK_ECDSA,      "CKK_ECDSA",   0 },
+	{ CKK_EC,         "CKK_EC",      0 },
+	{ CKK_RC2,        "CKK_RC2",     0 },
+	{ CKK_RC4,        "CKK_RC4",     0 },
+	{ CKK_RC5,        "CKK_RC5",     0 },
+	{ CKK_DES,        "CKK_DES",     0 },
+	{ CKK_DES3,       "CKK_DES3",    0 },
+	{ CKK_CAST,       "CKK_CAST",    0 },
+	{ CKK_CAST3,      "CKK_CAST3",   0 },
+	{ CKK_CAST128,    "CKK_CAST128", 0 },
+	{ CKK_IDEA,       "CKK_IDEA",    0 },
+	{ CKK_AES,        "CKK_AES",     0 },
+	{0,0,0}
 };
 
 static P11_MAP_TYPE const P11_ATTR_TYPES[]= {  
@@ -163,7 +163,7 @@ static P11_MAP_TYPE const P11_ATTR_TYPES
 	{ CKA_RESET_ON_INIT,    "CKA_RESET_ON_INIT",       0            },  
 	{ CKA_HAS_RESET,        "CKA_HAS_RESET",           0            },  
 	{ CKA_VENDOR_DEFINED,   "CKA_VENDOR_DEFINED",      0            },  
-	{0,0}  
+	{0,0,0}
 };