|
Tomas Bzatek |
c48058f |
From 912891b83b297ac6af2b62f6c1f8c31b1d3cc8bd Mon Sep 17 00:00:00 2001
|
|
Tomas Bzatek |
c48058f |
From: Stef Walter <stef@memberwebs.com>
|
|
Tomas Bzatek |
c48058f |
Date: Sat, 13 Feb 2010 04:16:50 +0000
|
|
Tomas Bzatek |
c48058f |
Subject: [secret-store] Fix regression: secret value not stored properly.
|
|
Tomas Bzatek |
c48058f |
|
|
Tomas Bzatek |
c48058f |
---
|
|
Tomas Bzatek |
c48058f |
diff --git a/pkcs11/secret-store/gck-secret-item.c b/pkcs11/secret-store/gck-secret-item.c
|
|
Tomas Bzatek |
c48058f |
index b0c5659..5c77723 100644
|
|
Tomas Bzatek |
c48058f |
--- a/pkcs11/secret-store/gck-secret-item.c
|
|
Tomas Bzatek |
c48058f |
+++ b/pkcs11/secret-store/gck-secret-item.c
|
|
Tomas Bzatek |
c48058f |
@@ -141,6 +141,7 @@ factory_create_item (GckSession *session, GckTransaction *transaction,
|
|
Tomas Bzatek |
c48058f |
CK_ATTRIBUTE *attr;
|
|
Tomas Bzatek |
c48058f |
gboolean is_token;
|
|
Tomas Bzatek |
c48058f |
gchar *identifier;
|
|
Tomas Bzatek |
c48058f |
+ CK_ULONG i;
|
|
Tomas Bzatek |
c48058f |
|
|
Tomas Bzatek |
c48058f |
g_return_val_if_fail (GCK_IS_TRANSACTION (transaction), NULL);
|
|
Tomas Bzatek |
c48058f |
g_return_val_if_fail (attrs || !n_attrs, NULL);
|
|
Tomas Bzatek |
c48058f |
@@ -175,7 +176,11 @@ factory_create_item (GckSession *session, GckTransaction *transaction,
|
|
Tomas Bzatek |
c48058f |
gck_transaction_fail (transaction, CKR_TEMPLATE_INCONSISTENT);
|
|
Tomas Bzatek |
c48058f |
return NULL;
|
|
Tomas Bzatek |
c48058f |
} else {
|
|
Tomas Bzatek |
c48058f |
- gck_attributes_consume (attrs, n_attrs, CKA_ID, G_MAXULONG);
|
|
Tomas Bzatek |
c48058f |
+ gck_attributes_consume (attrs, n_attrs, CKA_ID, CKA_TOKEN, G_MAXULONG);
|
|
Tomas Bzatek |
c48058f |
+ for (i = 0; i < n_attrs && !gck_transaction_get_failed (transaction); ++i) {
|
|
Tomas Bzatek |
c48058f |
+ if (!gck_attribute_consumed (&attrs[i]))
|
|
Tomas Bzatek |
c48058f |
+ gck_object_set_attribute (GCK_OBJECT (item), session, transaction, &attrs[i]);
|
|
Tomas Bzatek |
c48058f |
+ }
|
|
Tomas Bzatek |
c48058f |
return g_object_ref (item);
|
|
Tomas Bzatek |
c48058f |
}
|
|
Tomas Bzatek |
c48058f |
}
|
|
Tomas Bzatek |
c48058f |
--
|
|
Tomas Bzatek |
c48058f |
cgit v0.8.3.1
|