summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2010-05-24 19:37:57 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2010-06-03 19:54:55 +0200
commit9f4fae2679f34e0e42b86e38cce00cec60f149bb (patch)
tree8730deb5680a763997ac3f585c2be5d718077eb4 /src
parentdf646c6712a91db5e314268829d835c046d15b57 (diff)
downloadgnutls-9f4fae2679f34e0e42b86e38cce00cec60f149bb.tar.gz
Simplified internal API. The only question that remains now is how to handle
the gnutls_pkcs11_privkey_t. Currently it opens a session and maintains a handle to the object. This will require locks to be added on operations. Alternatively new sessions may be opened for each operation performed. This is guarranteed by PKCS #11 to be thread safe but will of course require to ask for the PIN again.
Diffstat (limited to 'src')
-rw-r--r--src/cli.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cli.c b/src/cli.c
index 4400843613..fd9a4e0b82 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -237,7 +237,7 @@ load_keys (void)
{
gnutls_pkcs11_privkey_init (&pkcs11_key);
- ret = gnutls_pkcs11_privkey_import_url (pkcs11_key, x509_keyfile);
+ ret = gnutls_pkcs11_privkey_import_url (pkcs11_key, x509_keyfile, 0);
}
else
{
@@ -293,7 +293,7 @@ load_keys (void)
{
gnutls_pkcs11_privkey_init (&pkcs11_key);
- ret = gnutls_pkcs11_privkey_import_url (pkcs11_key, pgp_keyfile);
+ ret = gnutls_pkcs11_privkey_import_url (pkcs11_key, pgp_keyfile, 0);
}
else
{