Merge branch 'local'

2 files changed, 2 insertions, 28 deletions

diff --git a/include/ncrypto/ncrypto.h b/include/ncrypto/ncrypto.h
index ff20d8c..329d12a 100644
--- a/include/ncrypto/ncrypto.h
+++ b/include/ncrypto/ncrypto.h
@@ -77,12 +77,10 @@ CK_RV ncr_public_key_create (struct ncr_public_key **key, const void *der,
 CK_RV ncr_public_key_export (struct ncr_public_key *key, void *dest,
 			     size_t *dest_size_ptr);
 CK_RV ncr_public_key_destroy (struct ncr_public_key *key);
+
 /* The PKCS#8 privateKeyInfo structure is used for private keys. "Sensitive"
    corresponds to CKA_SENSITIVE. */
-CK_RV ncr_private_key_create (struct ncr_private_key **key, CK_KEY_TYPE type,
-			      _Bool sensitive, const void *der, size_t der_size,
-			      const void *public_value,
-			      size_t public_value_size);
+/* Use algorithm-specific ncr_private_key_create_* for key creation. */
 CK_RV ncr_private_key_set_sensitive (struct ncr_private_key *key);
 CK_RV ncr_private_key_export (struct ncr_private_key *key, void *dest,
 			      size_t *dest_size_ptr);
diff --git a/lib/ncrypto_nss.c b/lib/ncrypto_nss.c
index 46716ea..6207149 100644
--- a/lib/ncrypto_nss.c
+++ b/lib/ncrypto_nss.c
@@ -518,30 +518,6 @@ private_key_export_components (struct ncr_private_key *key, PRArenaPool *arena,
   return CKR_OK;
 }
 
-/* FIXME: public_value should not be necessary, it is somewhere inside "der". */
-CK_RV
-ncr_private_key_create (struct ncr_private_key **key, CK_KEY_TYPE type,
-			_Bool sensitive, const void *der, size_t der_size,
-			const void *public_value, size_t public_value_size)
-{
-  SECItem der_key;
-  SECItem public;
-  CK_RV res;
-
-  res = ensure_ncr_is_open ();
-  if (res != CKR_OK)
-    return res;
-
-  g_return_val_if_fail (key != NULL, CKR_ARGUMENTS_BAD);
-  g_return_val_if_fail (der != NULL, CKR_ARGUMENTS_BAD);
-
-  der_key.data = (void *)der;
-  der_key.len = der_size;
-  public.data = (void *)public_value;
-  public.len = public_value_size;
-  return private_key_create (key, type, sensitive, &der_key, &public);
-}
-
 CK_RV
 ncr_private_key_set_sensitive (struct ncr_private_key *key)
 {