← Back to branch summary

~mrooney/ecryptfs/nautilus-integration

« back to all changes in this revision

Viewing changes to src/key_mod/ecryptfs_key_mod_pkcs11_helper.c

  • Committer: Dustin Kirkland
  • Date: 2009-05-02 19:39:09 UTC
  • Revision ID: kirkland@canonical.com-20090502193909-3741n5ddkf6eswph
Fix warnings, initialize a few variables, drop unused ones

  [ Arfrever Frehtes Taifersar Arahesis ]
  * key_mod/ecryptfs_key_mod_gpg.c,
    key_mod/ecryptfs_key_mod_pkcs11_helper.c,
    libecryptfs/key_management.c, utils/ecryptfs_unwrap_passphrase.c:
    Fix warnings, initialize a few variables, drop unused ones

Signed-off-by: Dustin Kirkland <kirkland@canonical.com>

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/key_mod/ecryptfs_key_mod_pkcs11_helper.c
592
592
                char dn[1024] = {0};
593
593
                char serial[1024] = {0};
594
594
                char *ser = NULL;
595
 
                char *ssh_key = NULL;
596
595
                size_t ser_len = 0;
597
596
                int n;
598
597
 
1538
1537
        struct ecryptfs_ctx *ctx = &_ctx;
1539
1538
        struct ecryptfs_name_val_pair nvp_head;
1540
1539
        struct val_node *dummy_mnt_params;
1541
 
        uid_t id;
1542
1540
        struct passwd *pw;
1543
1541
        char *rcfile_fullpath = NULL;
1544
1542
        int fd;
1649
1647
        if (pkcs11h_key_param_nodes[PKCS11H_KEY_TOK_ID].suggested_val)
1650
1648
                free(pkcs11h_key_param_nodes[PKCS11H_KEY_TOK_ID].suggested_val);
1651
1649
        pkcs11h_terminate ();
 
1650
        return 0;
1652
1651
}
1653
1652
 
1654
1653
static struct ecryptfs_key_mod_ops ecryptfs_pkcs11h_ops = {