gnutls_priv/pubkey_import_url replace: gnutls_privkey_import_pkcs11_url and gnutls_pu...

diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index 2f54683ad02386a848fc9665f4c3574afee78535..a07cba7d8ed110cff0993917ad1b7582b9d2f352 100644 (file)
--- 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,7 +388,14 @@ 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

diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index 54e08db488a7c880181a1cbdf7969ee6b8c773e6..6a019fc2e9c5bd34a8fbb30629d313238521e097 100644 (file)
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -1210,6 +1210,7 @@ int gnutls_pubkey_set_key_usage(gnutls_pubkey_t key, unsigned int usage)
 
 #ifdef ENABLE_PKCS11
 
+#if 0
 /**
  * gnutls_pubkey_import_pkcs11_url:
  * @key: A key of type #gnutls_pubkey_t
@@ -1227,6 +1228,13 @@ int gnutls_pubkey_set_key_usage(gnutls_pubkey_t key, unsigned int usage)
 int
 gnutls_pubkey_import_pkcs11_url(gnutls_pubkey_t key, const char *url,
                                unsigned int flags)
+{
+}
+#endif
+
+static int
+_gnutls_pubkey_import_pkcs11_url(gnutls_pubkey_t key, const char *url,
+                               unsigned int flags)
 {
        gnutls_pkcs11_obj_t pcrt;
        int ret;
@@ -1284,7 +1292,7 @@ gnutls_pubkey_import_url(gnutls_pubkey_t key, const char *url,
 
        if (strncmp(url, PKCS11_URL, PKCS11_URL_SIZE) == 0)
 #ifdef ENABLE_PKCS11
-               return gnutls_pubkey_import_pkcs11_url(key, url, flags);
+               return _gnutls_pubkey_import_pkcs11_url(key, url, flags);
 #else
                return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
 #endif

diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index e6059c009a4bb4aeed51b4c3cbcc8dc801490d97..c3cf7e957c84590990fc5757db729ebf2bce1f16 100644 (file)
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -183,10 +183,8 @@ int gnutls_pubkey_import(gnutls_pubkey_t key,
                         gnutls_x509_crt_fmt_t format);
 
 
-int gnutls_pubkey_import_pkcs11_url(gnutls_pubkey_t key,
-                                   const char *url, unsigned int flags
-                                   /* GNUTLS_PKCS11_OBJ_FLAG_* */
-    );
+#define gnutls_pubkey_import_pkcs11_url(key, url, flags) gnutls_pubkey_import_url(key, url, flags)
+
 int gnutls_pubkey_import_dsa_raw(gnutls_pubkey_t key,
                                 const gnutls_datum_t * p,
                                 const gnutls_datum_t * q,
@@ -325,8 +323,7 @@ gnutls_privkey_import_tpm_url(gnutls_privkey_t pkey,
 int gnutls_privkey_import_url(gnutls_privkey_t key,
                              const char *url, unsigned int flags);
 
-int gnutls_privkey_import_pkcs11_url(gnutls_privkey_t key,
-                                    const char *url);
+#define gnutls_privkey_import_pkcs11_url(key, url) gnutls_privkey_import_url(key, url, 0)
 
 int
 gnutls_privkey_import_ext(gnutls_privkey_t pkey,

diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 78e9efbdf2348da887ddf1fb308c162048671814..5b0fa4ec789f33e4dd4990c46c3af9bf3774f439 100644 (file)
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -573,7 +573,6 @@ GNUTLS_3_4
        gnutls_pubkey_import_pkcs11;
        gnutls_pubkey_import_dsa_raw;
        gnutls_pubkey_import_rsa_raw;
-       gnutls_pubkey_import_pkcs11_url;
        gnutls_pubkey_import;
        gnutls_x509_crt_set_pubkey;
        gnutls_x509_crq_set_pubkey;
@@ -732,7 +731,6 @@ GNUTLS_3_4
        gnutls_pkcs12_simple_parse;
        gnutls_privkey_import_openpgp_raw;
        gnutls_privkey_import_x509_raw;
-       gnutls_privkey_import_pkcs11_url;
        gnutls_load_file;
        gnutls_x509_privkey_import_openssl;
        gnutls_x509_privkey_import2;