Changeset 2958 for releases

Timestamp:

05/20/06 16:06:50 (3 years ago)

Author:

aj

Message:

make objects on piv card public.

Location:

releases/opensc-0.11.1/src

Files:

• libopensc/pkcs15-piv.c (modified) (1 diff)
• pkcs11/framework-pkcs15.c (modified) (1 diff)

releases/opensc-0.11.1/src/libopensc/pkcs15-piv.c

@@ -204 +204 @@
         const prdata prkeys[] = {
                 { "1", "AUTH key", 1024, USAGE_AUT, "",
-                  0x9A, "1", SC_ALGORITHM_RSA_RAW | SC_ALGORITHM_RSA_PAD_NONE | SC_PKCS15_CO_FLAG_PRIVATE},
+                  0x9A, "1", 0},
                 { "2", " SIGN key", 1024, USAGE_AUT, "",
-                  0x9B, "1", SC_ALGORITHM_RSA_RAW | SC_ALGORITHM_RSA_PAD_NONE | SC_PKCS15_CO_FLAG_PRIVATE},
+                  0x9B, "1", 0},
                 { "3", "KEY MAN key", 1024, USAGE_AUT, "",
-                  0x9C, "1", SC_ALGORITHM_RSA_RAW | SC_ALGORITHM_RSA_PAD_NONE | SC_PKCS15_CO_FLAG_PRIVATE},
+                  0x9C, "1", 0},
                 { "4", "ADMIN key", 1024, USAGE_AUT, "",
-                  0x9D, "1", SC_ALGORITHM_RSA_RAW | SC_ALGORITHM_RSA_PAD_NONE | SC_PKCS15_CO_FLAG_PRIVATE},
+                  0x9D, "1", 0},
                 { NULL, NULL, 0, 0, NULL, 0, NULL, 0}
         };

releases/opensc-0.11.1/src/pkcs11/framework-pkcs15.c

@@ -1804 +1804 @@
         case CKA_ALWAYS_SENSITIVE:
         case CKA_NEVER_EXTRACTABLE:
+                check_attribute_buffer(attr, sizeof(CK_BBOOL));
+                *(CK_BBOOL*)attr->pValue = TRUE;
+                break;
         case CKA_PRIVATE:
                 check_attribute_buffer(attr, sizeof(CK_BBOOL));
-                *(CK_BBOOL*)attr->pValue = TRUE;
+                *(CK_BBOOL*)attr->pValue = (prkey->prv_p15obj->flags & SC_PKCS15_CO_FLAG_PRIVATE) != 0;
                 break;
         case CKA_MODIFIABLE: