diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-04-01 16:52:48 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-04-01 16:52:48 +0200 |
| commit | 0ac2dbb43cdc545d5d9078aa1998df6539a9d102 (patch) | |
| tree | 5b099e6bcc86a77f42f85f7f58f9f091703dacbb /lib/gnutls_privkey.c | |
| parent | fe89508b501d84c16662db6a8c6fbfb9edb332ea (diff) | |
| download | gnutls-0ac2dbb43cdc545d5d9078aa1998df6539a9d102.tar.gz | |
gnutls_priv/pubkey_import_url replace: gnutls_privkey_import_pkcs11_url and gnutls_pubkey_import_pkcs11_url
Diffstat (limited to 'lib/gnutls_privkey.c')
| -rw-r--r-- | lib/gnutls_privkey.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c index 2f54683ad0..a07cba7d8e 100644 --- a/lib/gnutls_privkey.c +++ b/lib/gnutls_privkey.c @@ -374,6 +374,7 @@ gnutls_privkey_import_pkcs11(gnutls_privkey_t pkey, return 0; } +#if 0 /** * gnutls_privkey_import_pkcs11_url: * @key: A key of type #gnutls_pubkey_t @@ -387,8 +388,15 @@ gnutls_privkey_import_pkcs11(gnutls_privkey_t pkey, * * Since: 3.1.0 **/ + int gnutls_privkey_import_pkcs11_url(gnutls_privkey_t key, const char *url) { +} +#endif + +static +int _gnutls_privkey_import_pkcs11_url(gnutls_privkey_t key, const char *url, unsigned flags) +{ gnutls_pkcs11_privkey_t pkey; int ret; @@ -402,7 +410,7 @@ int gnutls_privkey_import_pkcs11_url(gnutls_privkey_t key, const char *url) gnutls_pkcs11_privkey_set_pin_function(pkey, key->pin.cb, key->pin.data); - ret = gnutls_pkcs11_privkey_import_url(pkey, url, 0); + ret = gnutls_pkcs11_privkey_import_url(pkey, url, flags); if (ret < 0) { gnutls_assert(); goto cleanup; @@ -1252,7 +1260,7 @@ gnutls_privkey_import_url(gnutls_privkey_t key, const char *url, if (strncmp(url, PKCS11_URL, PKCS11_URL_SIZE) == 0) { #ifdef ENABLE_PKCS11 - ret = gnutls_privkey_import_pkcs11_url(key, url); + ret = _gnutls_privkey_import_pkcs11_url(key, url, flags); #else ret = gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE); #endif |