* configure.ac (AC_CHECK_TYPES): Add struct crypto_report_blkcipher. * netlink_crypto.c (decode_crypto_report_blkcipher): New function. (crypto_user_alg_nla_decoders): Add CRYPTOCFGA_REPORT_BLKCIPHER. --- configure.ac | 1 + netlink_crypto.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac index 0a0625f..0d751f4 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_blkcipher, struct crypto_report_hash, struct crypto_report_larval ]),,, [#include <linux/cryptouser.h>]) diff --git a/netlink_crypto.c b/netlink_crypto.c index 9bde8a5..0a3406a 100644 --- a/netlink_crypto.c +++ b/netlink_crypto.c @@ -83,10 +83,38 @@ decode_crypto_report_hash(struct tcb *const tcp, return true; } +static bool +decode_crypto_report_blkcipher(struct tcb *const tcp, + const kernel_ulong_t addr, + const unsigned int len, + const void *const opaque_data) +{ +# ifdef HAVE_STRUCT_CRYPTO_REPORT_BLKCIPHER + struct crypto_report_blkcipher rblkcipher; + + if (len < sizeof(rblkcipher)) + printstrn(tcp, addr, len); + else if (!umove_or_printaddr(tcp, addr, &rblkcipher)) { + PRINT_FIELD_CSTRING("{", rblkcipher, type); + PRINT_FIELD_CSTRING(", ", rblkcipher, geniv); + PRINT_FIELD_U(", ", rblkcipher, blocksize); + PRINT_FIELD_U(", ", rblkcipher, min_keysize); + PRINT_FIELD_U(", ", rblkcipher, max_keysize); + PRINT_FIELD_U(", ", rblkcipher, 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_HASH] = decode_crypto_report_hash, + [CRYPTOCFGA_REPORT_BLKCIPHER] = decode_crypto_report_blkcipher }; static void -- 2.7.4 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel