this patch is against cryptodev-2.6, and have passed scripts/checkpatch.pl
KERN_DEBUG is stripped out, this acts more like the original in tcrypto.c
and the last parameter "bool ascii" set to zero to disable ascii output,
this could keep it happy on Unicode terminals.
Cc: Randy Dunlap <[email protected]>
Signed-off-by: Denis Cheng <[email protected]>
---
crypto/tcrypt.c | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 24141fb..665aa87 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -81,14 +81,6 @@ static char *check[] = {
"camellia", "seed", NULL
};
-static void hexdump(unsigned char *buf, unsigned int len)
-{
- while (len--)
- printk("%02x", *buf++);
-
- printk("\n");
-}
-
static void tcrypt_complete(struct crypto_async_request *req, int err)
{
struct tcrypt_result *res = req->data;
@@ -156,7 +148,9 @@ static void test_hash(char *algo, struct hash_testvec *template,
goto out;
}
- hexdump(result, crypto_hash_digestsize(tfm));
+ print_hex_dump("", "", DUMP_PREFIX_OFFSET, 16, 1,
+ result, crypto_hash_digestsize(tfm), 0);
+
printk("%s\n",
memcmp(result, hash_tv[i].digest,
crypto_hash_digestsize(tfm)) ?
@@ -203,7 +197,9 @@ static void test_hash(char *algo, struct hash_testvec *template,
goto out;
}
- hexdump(result, crypto_hash_digestsize(tfm));
+ print_hex_dump("", "", DUMP_PREFIX_OFFSET,
+ 16, 1,
+ result, crypto_hash_digestsize(tfm), 0);
printk("%s\n",
memcmp(result, hash_tv[i].digest,
crypto_hash_digestsize(tfm)) ?
@@ -319,7 +315,9 @@ static void test_cipher(char *algo, int enc,
}
q = kmap(sg_page(&sg[0])) + sg[0].offset;
- hexdump(q, cipher_tv[i].rlen);
+ print_hex_dump("", "", DUMP_PREFIX_OFFSET,
+ 16, 1,
+ q, cipher_tv[i].rlen, 0);
printk("%s\n",
memcmp(q, cipher_tv[i].result,
@@ -393,7 +391,9 @@ static void test_cipher(char *algo, int enc,
for (k = 0; k < cipher_tv[i].np; k++) {
printk("page %u\n", k);
q = kmap(sg_page(&sg[k])) + sg[k].offset;
- hexdump(q, cipher_tv[i].tap[k]);
+ print_hex_dump("", "", DUMP_PREFIX_OFFSET,
+ 16, 1,
+ q, cipher_tv[i].tap[k], 0);
printk("%s\n",
memcmp(q, cipher_tv[i].result + temp,
cipher_tv[i].tap[k]) ? "fail" :
@@ -839,7 +839,8 @@ static void test_deflate(void)
printk("fail: ret=%d\n", ret);
continue;
}
- hexdump(result, dlen);
+ print_hex_dump("", "", DUMP_PREFIX_OFFSET, 16, 1,
+ result, dlen, 0);
printk("%s (ratio %d:%d)\n",
memcmp(result, tv[i].output, dlen) ? "fail" : "pass",
ilen, dlen);
@@ -870,7 +871,8 @@ static void test_deflate(void)
printk("fail: ret=%d\n", ret);
continue;
}
- hexdump(result, dlen);
+ print_hex_dump("", "", DUMP_PREFIX_OFFSET, 16, 1,
+ result, dlen, 0);
printk("%s (ratio %d:%d)\n",
memcmp(result, tv[i].output, dlen) ? "fail" : "pass",
ilen, dlen);
--
1.5.3.4
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
