summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2010-10-27 01:21:32 +0200
committerMiloslav Trmač <mitr@redhat.com>2010-10-27 01:21:32 +0200
commit7241ddaa5924bc10c7a813c9163443e67b04e8d1 (patch)
tree36d04e7bdc377137e43eb8308d94e37c63fa37a9
parent6b0f9b3bc540b2512b4fc2dc9195570239799b92 (diff)
parent8f1254b8085ba2b189457e8f04abf19b5027f6a5 (diff)
downloadncrypto-7241ddaa5924bc10c7a813c9163443e67b04e8d1.tar.gz
ncrypto-7241ddaa5924bc10c7a813c9163443e67b04e8d1.tar.xz
ncrypto-7241ddaa5924bc10c7a813c9163443e67b04e8d1.zip
Merge branch 'local'
-rw-r--r--include/ncrypto/ncrypto.h2
-rw-r--r--lib/ncrypto_local.c1
2 files changed, 0 insertions, 3 deletions
diff --git a/include/ncrypto/ncrypto.h b/include/ncrypto/ncrypto.h
index 24d8e8e..f82cf0e 100644
--- a/include/ncrypto/ncrypto.h
+++ b/include/ncrypto/ncrypto.h
@@ -120,8 +120,6 @@ CK_RV ncr_public_key_verify (CK_MECHANISM_TYPE mech,
struct ncr_digest_session;
-/* FIXME: support HMAC */
-
/* Session lifetime management. */
CK_RV ncr_digest_alloc (struct ncr_digest_session **sess,
CK_MECHANISM_TYPE mech);
diff --git a/lib/ncrypto_local.c b/lib/ncrypto_local.c
index 1bd4245..0dc9cbe 100644
--- a/lib/ncrypto_local.c
+++ b/lib/ncrypto_local.c
@@ -144,7 +144,6 @@ ncr_symm_key_generate (struct ncr_symm_key **key, CK_MECHANISM_TYPE mech,
CK_RV res;
g_return_val_if_fail (key != NULL, CKR_ARGUMENTS_BAD);
- /* FIXME: PKCS#11 modules should refuse keys with incorrect parity here */
switch (mech)
{