diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2010-12-10 22:26:41 +0000 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2010-12-10 22:26:41 +0000 |
| commit | eeeaa5c0c2a3589488a20b370bcc65ed679b0ddf (patch) | |
| tree | 80af8995056b908dfcf2a567bdedc9b624330b56 /pkcs11/gkm/gkm-assertion.c | |
| parent | 2ac2d39cfd9b4fa265f560f1b0f57b006f019ad0 (diff) | |
Rename CKA_G_ trust prefix to CKA_X_ and move to own file.
Move the PKCS#11 trust extensions to its own file and give it
its own prefix.
Diffstat (limited to 'pkcs11/gkm/gkm-assertion.c')
| -rw-r--r-- | pkcs11/gkm/gkm-assertion.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkcs11/gkm/gkm-assertion.c b/pkcs11/gkm/gkm-assertion.c index c35e3f55..fcda26c1 100644 --- a/pkcs11/gkm/gkm-assertion.c +++ b/pkcs11/gkm/gkm-assertion.c @@ -27,8 +27,8 @@ #include "gkm-trust.h" #include "gkm-util.h" -#include "pkcs11/pkcs11g.h" #include "pkcs11/pkcs11i.h" +#include "pkcs11/pkcs11x.h" #include <glib/gi18n.h> @@ -68,16 +68,16 @@ gkm_assertion_get_attribute (GkmObject *base, GkmSession *session, CK_ATTRIBUTE_ case CKA_PRIVATE: return gkm_attribute_set_bool (attr, CK_FALSE); case CKA_CLASS: - return gkm_attribute_set_ulong (attr, CKO_G_TRUST_ASSERTION); + return gkm_attribute_set_ulong (attr, CKO_X_TRUST_ASSERTION); case CKA_MODIFIABLE: return gkm_attribute_set_bool (attr, CK_FALSE); /* Various trust flags */ - case CKA_G_ASSERTION_TYPE: + case CKA_X_ASSERTION_TYPE: return gkm_attribute_set_ulong (attr, self->pv->type); - case CKA_G_PURPOSE: + case CKA_X_PURPOSE: return gkm_attribute_set_string (attr, self->pv->purpose); - case CKA_G_PEER: + case CKA_X_PEER: if (!self->pv->peer) return CKR_ATTRIBUTE_TYPE_INVALID; return gkm_attribute_set_string (attr, self->pv->peer); @@ -85,7 +85,7 @@ gkm_assertion_get_attribute (GkmObject *base, GkmSession *session, CK_ATTRIBUTE_ /* Certificate reference values */ case CKA_SERIAL_NUMBER: case CKA_ISSUER: - case CKA_G_CERTIFICATE_VALUE: + case CKA_X_CERTIFICATE_VALUE: return gkm_object_get_attribute (GKM_OBJECT (self->pv->trust), session, attr); default: |