summaryrefslogtreecommitdiffstats
path: root/crypto/userspace/ncr-pk.h
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2010-07-27 17:49:21 +0200
committerMiloslav Trmač <mitr@redhat.com>2010-07-27 17:49:21 +0200
commitd5c2b894102e59efe499c231a32065afcf37e463 (patch)
tree4140b45a2d4290c10eb3d20e39ac63eafcc051eb /crypto/userspace/ncr-pk.h
parenta04fd1aa4f807e2f97632a46070306e1389264ed (diff)
parent9a2369d426b23f77884b01666370140d10b41c19 (diff)
downloadkernel-crypto-d5c2b894102e59efe499c231a32065afcf37e463.tar.gz
kernel-crypto-d5c2b894102e59efe499c231a32065afcf37e463.tar.xz
kernel-crypto-d5c2b894102e59efe499c231a32065afcf37e463.zip
Merge branch 'standalone-master' into standalone-rename
Conflicts: COPYING examples/pk.c
Diffstat (limited to 'crypto/userspace/ncr-pk.h')
-rw-r--r--crypto/userspace/ncr-pk.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/userspace/ncr-pk.h b/crypto/userspace/ncr-pk.h
index fdc5e1c005b..f234f735b45 100644
--- a/crypto/userspace/ncr-pk.h
+++ b/crypto/userspace/ncr-pk.h
@@ -51,4 +51,9 @@ int ncr_pk_cipher_verify(const struct ncr_pk_ctx* ctx,
const struct scatterlist* sign_sg, unsigned int sign_sg_cnt, size_t sign_sg_size,
const void* hash, size_t hash_size, ncr_error_t* err);
+int _ncr_tomerr(int err);
+
+int ncr_pk_derive(struct key_item_st* newkey, struct key_item_st* oldkey,
+ struct ncr_key_derivation_params_st * params);
+
#endif