← Back to branch summary

~ubuntu-branches/ubuntu/saucy/libp11/saucy-proposed

« back to all changes in this revision

Viewing changes to src/p11_load.c

  • Committer: Bazaar Package Importer
  • Author(s): Eric Dorland
  • Date: 2009-08-16 23:45:00 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090816234500-h3irq01nr9fccokc
Tags: 0.2.6-1
* New upstream release.
* debian/compat: Upgrade to version 7.
* debian/rules, debian/control: Use dh instead of debhelper.
* debian/control: Upgrade Standards-Version to 3.8.3.
* debian/libp11-1.install,  debian/libp11-1.shlibs, debian/libp11-1.symbols,
  debian/control: Rename libp11-0 to libp11-1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/p11_load.c
43
43
/*
44
44
 * Set private init args for module
45
45
 */
46
 
void *PKCS11_CTX_init_args(PKCS11_CTX * ctx, const char *init_args)
 
46
void PKCS11_CTX_init_args(PKCS11_CTX * ctx, const char *init_args)
47
47
{
48
48
        PKCS11_CTX_private *priv = PRIVCTX(ctx);
49
49
        priv->init_args = init_args ? strdup(init_args) : NULL;
55
55
int PKCS11_CTX_load(PKCS11_CTX * ctx, const char *name)
56
56
{
57
57
        PKCS11_CTX_private *priv = PRIVCTX(ctx);
58
 
        CK_C_INITIALIZE_ARGS args = { .pReserved = priv->init_args, };
 
58
        CK_C_INITIALIZE_ARGS args;
59
59
        CK_INFO ck_info;
60
60
        int rv;
61
61
 
70
70
        }
71
71
 
72
72
        /* Tell the PKCS11 to initialize itself */
 
73
        memset(&args, 0, sizeof(args));
 
74
        args.pReserved = priv->init_args;
73
75
        rv = priv->method->C_Initialize(&args);
74
76
        CRYPTOKI_checkerr(PKCS11_F_PKCS11_CTX_LOAD, rv);
75
77