← Back to branch summary

~ubuntu-branches/ubuntu/natty/gnome-keyring/natty

« back to all changes in this revision

Viewing changes to pkcs11/gkm/gkm-certificate.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-12-06 17:58:28 UTC
  • mfrom: (1.1.65 upstream)
  • Revision ID: james.westby@ubuntu.com-20101206175828-8xjojyxw89qacpq7
Tags: 2.92.92.is.2.32.1-0ubuntu1
* New upstream version
* debian/control.in:
  - updated the libglib requirement
* debian/libgcr0.symbols:
  - new version update
* debian/patches/02_uidir_relocate.patch:
  - updated for the new version
* debian/patches/10_git_fix_cka_trusted_collections.patch:
  - dropped, the patch is the new version
* debian/patches/90_git_pam_headers.patch:
  - dropped, the patch is the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
pkcs11/gkm/gkm-certificate.c
229
229
                        break;
230
230
 
231
231
                /* See if it's the same */
232
 
                exoid = egg_asn1x_get_oid_as_quark (egg_asn1x_node (self->pv->asn1, "extnID", NULL));
 
232
                exoid = egg_asn1x_get_oid_as_quark (egg_asn1x_node (node, "extnID", NULL));
233
233
 
234
234
                if(exoid == oid)
235
235
                        return index;
326
326
        case CKA_END_DATE:
327
327
                g_return_val_if_fail (self->pv->asn1, CKR_GENERAL_ERROR);
328
328
                when = egg_asn1x_get_time_as_long (egg_asn1x_node (self->pv->asn1,
329
 
                                                                 attr->type == CKA_START_DATE ?
330
 
                                                                       "tbsCertificate.validity.notBefore" :
331
 
                                                                       "tbsCertificate.validity.notAfter",
332
 
                                                                 NULL));
 
329
                                                                   "tbsCertificate", "validity",
 
330
                                                                   attr->type == CKA_START_DATE ? "notBefore" : "notAfter",
 
331
                                                                   NULL));
333
332
                if (when < 0)
334
333
                        return CKR_FUNCTION_FAILED;
335
334
                return gkm_attribute_set_date (attr, when);