From 3f39a24a2c40e25b839b0393976e72dfed527f66 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Mon, 31 Oct 2011 17:12:55 -0700 Subject: [PATCH] --- yaml --- r: 272222 b: refs/heads/master c: 02473119bc54b0b239c2501064c7a37314347f87 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/keys/encrypted-keys/encrypted.c | 2 +- trunk/security/keys/trusted.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 04394055084d..03a9b2d9b3eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50e1499f468fd74c6db95deb2e1e6bfee578ae70 +refs/heads/master: 02473119bc54b0b239c2501064c7a37314347f87 diff --git a/trunk/security/keys/encrypted-keys/encrypted.c b/trunk/security/keys/encrypted-keys/encrypted.c index f33804c1b4c8..dcc843cb0f80 100644 --- a/trunk/security/keys/encrypted-keys/encrypted.c +++ b/trunk/security/keys/encrypted-keys/encrypted.c @@ -293,7 +293,7 @@ static char *datablob_format(struct encrypted_key_payload *epayload, /* convert the hex encoded iv, encrypted-data and HMAC to ascii */ bufp = &ascii_buf[len]; for (i = 0; i < (asciiblob_len - len) / 2; i++) - bufp = pack_hex_byte(bufp, iv[i]); + bufp = hex_byte_pack(bufp, iv[i]); out: return ascii_buf; } diff --git a/trunk/security/keys/trusted.c b/trunk/security/keys/trusted.c index 0964fc236946..0ed5fdf238a2 100644 --- a/trunk/security/keys/trusted.c +++ b/trunk/security/keys/trusted.c @@ -1098,7 +1098,7 @@ static long trusted_read(const struct key *key, char __user *buffer, bufp = ascii_buf; for (i = 0; i < p->blob_len; i++) - bufp = pack_hex_byte(bufp, p->blob[i]); + bufp = hex_byte_pack(bufp, p->blob[i]); if ((copy_to_user(buffer, ascii_buf, 2 * p->blob_len)) != 0) { kfree(ascii_buf); return -EFAULT;