summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2015-10-23 03:07:52 +0200
committerJames Morris <james.l.morris@oracle.com>2015-10-23 03:07:52 +0200
commitba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7 (patch)
tree8f94d0fcb68cdcff0d00a7911ddb494705cf7c72 /lib
parentMerge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into... (diff)
parentKEYS: Merge the type-specific data with the payload data (diff)
downloadlinux-ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7.tar.xz
linux-ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7.zip
Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'lib')
-rw-r--r--lib/digsig.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/digsig.c b/lib/digsig.c
index ae05ea393fc8..07be6c1ef4e2 100644
--- a/lib/digsig.c
+++ b/lib/digsig.c
@@ -79,12 +79,13 @@ static int digsig_verify_rsa(struct key *key,
unsigned char *out1 = NULL;
const char *m;
MPI in = NULL, res = NULL, pkey[2];
- uint8_t *p, *datap, *endp;
- struct user_key_payload *ukp;
+ uint8_t *p, *datap;
+ const uint8_t *endp;
+ const struct user_key_payload *ukp;
struct pubkey_hdr *pkh;
down_read(&key->sem);
- ukp = key->payload.data;
+ ukp = user_key_payload(key);
if (ukp->datalen < sizeof(*pkh))
goto err1;