]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
security: follow rename pack_hex_byte() to hex_byte_pack()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 1 Nov 2011 00:12:55 +0000 (17:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Nov 2011 00:30:56 +0000 (17:30 -0700)
There is no functional change.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Mimi Zohar <zohar@us.ibm.com>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
security/keys/encrypted-keys/encrypted.c
security/keys/trusted.c

index f33804c1b4c8105b3f66c4daa10475625b286723..dcc843cb0f80de0f899ada23d8bf80d25e023e5e 100644 (file)
@@ -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;
 }
index 0964fc236946c0ec310c63bd9b3159583835df34..0ed5fdf238a22c6712e5375207f5bd6d8a168ef6 100644 (file)
@@ -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;