projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
be60457
)
libceph: introduce ceph_x_encrypt_offset()
author
Ilya Dryomov
<idryomov@gmail.com>
Fri, 2 Dec 2016 15:35:07 +0000
(16:35 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 26 Jan 2017 07:24:41 +0000
(08:24 +0100)
commit
55d9cc834f933698fc864f0d36f3cca533d30a8d
upstream.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ceph/auth_x.c
patch
|
blob
|
history
diff --git
a/net/ceph/auth_x.c
b/net/ceph/auth_x.c
index
28bde93
..
de30c58
100644
(file)
--- a/
net/ceph/auth_x.c
+++ b/
net/ceph/auth_x.c
@@
-39,10
+39,14
@@
static int ceph_x_should_authenticate(struct ceph_auth_client *ac)
return need != 0;
}
+static int ceph_x_encrypt_offset(void)
+{
+ return sizeof(u32) + sizeof(struct ceph_x_encrypt_header);
+}
+
static int ceph_x_encrypt_buflen(int ilen)
{
- return sizeof(struct ceph_x_encrypt_header) + ilen + 16 +
- sizeof(u32);
+ return ceph_x_encrypt_offset() + ilen + 16;
}
static int ceph_x_encrypt(struct ceph_crypto_key *secret,