← Back to branch summary

~noskcaj/ubuntu/vivid/gnome-keyring/3.15.90

« back to all changes in this revision

Viewing changes to pkcs11/xdg-store/gkm-xdg-module.c

  • Committer: Package Import Robot
  • Author(s): Jordi Mallach
  • Date: 2012-05-14 22:13:02 UTC
  • mfrom: (1.3.1)
  • mto: (80.2.8 experimental) (1.1.77)
  • mto: This revision was merged to the branch mainline in revision 148.
  • Revision ID: package-import@ubuntu.com-20120514221302-0l3gjmqpe6xopond
Import upstream version 3.4.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
pkcs11/xdg-store/gkm-xdg-module.c
39
39
#include "gkm/gkm-transaction.h"
40
40
#include "gkm/gkm-util.h"
41
41
 
 
42
#include "pkcs11x.h"
 
43
 
42
44
#include <string.h>
43
45
 
44
46
struct _GkmXdgModule {
314
316
                name = name_for_subject (data, n_data);
315
317
        g_free (data);
316
318
 
 
319
        /* Next we try and see if it has a peer (is a trust assertion) */
 
320
        if (name == NULL) {
 
321
                data = gkm_object_get_attribute_data (object, NULL, CKA_X_PEER, &n_data);
 
322
                if (data && n_data)
 
323
                        name = g_strndup ((gchar *)data, n_data);
 
324
                g_free (data);
 
325
        }
 
326
 
317
327
        /* Next we try hex encoding the ID */
318
328
        if (name == NULL) {
319
329
                data = gkm_object_get_attribute_data (object, NULL, CKA_ID, &n_data);