[PATCH 13/27] netlink: decode crypto_user_alg attributes of CRYPTOCFGA_REPORT_AEAD

JingPiao Chen chenjingpiao at gmail.com
Sat Jul 22 12:43:43 UTC 2017


* configure.ac (AC_CHECK_TYPES): Add struct crypto_report_aead.
* netlink_crypto.c (decode_crypto_report_aead): New function.
(crypto_user_alg_nla_decoders): Add CRYPTOCFGA_REPORT_AEAD.
---
 configure.ac     |  1 +
 netlink_crypto.c | 29 ++++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 0d751f4..f574ce8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -321,6 +321,7 @@ AC_CHECK_TYPES(m4_normalize([
 #include <linux/fcntl.h>])
 
 AC_CHECK_TYPES(m4_normalize([
+	struct crypto_report_aead,
 	struct crypto_report_blkcipher,
 	struct crypto_report_hash,
 	struct crypto_report_larval
diff --git a/netlink_crypto.c b/netlink_crypto.c
index 0a3406a..c72fd9e 100644
--- a/netlink_crypto.c
+++ b/netlink_crypto.c
@@ -110,11 +110,38 @@ decode_crypto_report_blkcipher(struct tcb *const tcp,
 	return true;
 }
 
+static bool
+decode_crypto_report_aead(struct tcb *const tcp,
+			  const kernel_ulong_t addr,
+			  const unsigned int len,
+			  const void *const opaque_data)
+{
+# ifdef HAVE_STRUCT_CRYPTO_REPORT_AEAD
+	struct crypto_report_aead raead;
+
+	if (len < sizeof(raead))
+		printstrn(tcp, addr, len);
+	else if (!umove_or_printaddr(tcp, addr, &raead)) {
+		PRINT_FIELD_CSTRING("{", raead, type);
+		PRINT_FIELD_CSTRING(", ", raead, geniv);
+		PRINT_FIELD_U(", ", raead, blocksize);
+		PRINT_FIELD_U(", ", raead, maxauthsize);
+		PRINT_FIELD_U(", ", raead, ivsize);
+		tprints("}");
+	}
+# else
+	printstrn(tcp, addr, len);
+# endif
+
+	return true;
+}
+
 static const nla_decoder_t crypto_user_alg_nla_decoders[] = {
 	[CRYPTOCFGA_PRIORITY_VAL]	= decode_nla_u32,
 	[CRYPTOCFGA_REPORT_LARVAL]	= decode_crypto_report_larval,
 	[CRYPTOCFGA_REPORT_HASH]	= decode_crypto_report_hash,
-	[CRYPTOCFGA_REPORT_BLKCIPHER]	= decode_crypto_report_blkcipher
+	[CRYPTOCFGA_REPORT_BLKCIPHER]	= decode_crypto_report_blkcipher,
+	[CRYPTOCFGA_REPORT_AEAD]	= decode_crypto_report_aead
 };
 
 static void
-- 
2.7.4





More information about the Strace-devel mailing list