Merge branch 'bugfixes' into nlattr

Conflicts:
	cryptodev_main.c
	examples/ncr.c
	examples/pk.c
	ncr-int.h
	ncr-key-wrap.c
	ncr-key.c
	ncr.c
	ncr.h

1 files changed, 2 insertions, 0 deletions

diff --git a/crypto.4 b/crypto.4
index 7ba8d9b..0dc21e9 100644
--- a/crypto.4
+++ b/crypto.4
@@ -437,6 +437,8 @@ Mandatory.
 Optional, an empty IV is used if not present.
 .IP \fBNCR_ATTR_KEY_FLAGS\fP
 Optional, flags are unchanged if not present.
+.IP \fBNCR_ATTR_KEY_TYPE\fP
+Mandatory.
 .IP \fBNCR_ATTR_WRAPPING_ALGORITHM\fP
 Mandatory.
 .RE