diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-09 11:41:07 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-09 11:41:07 +1000 |
| commit | 97dd68d79625acc2d317379c325f5e763c69fcef (patch) | |
| tree | d782b774ae1993b1c0b59ce0a1b0d3f42471a48d /include | |
| parent | 99b40eb95676f62536347ae5015b48a07162598d (diff) | |
| parent | e36484b5ac315f477c9c4075a78753fa4c0e0cf1 (diff) | |
Merge remote-tracking branch 'keys/keys-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/key.h | 1 | ||||
| -rw-r--r-- | include/linux/mpi.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/keyctl.h | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index 0c9b93b0d1f7..78e25aabedaf 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -173,7 +173,6 @@ struct key { #ifdef KEY_DEBUGGING unsigned magic; #define KEY_DEBUG_MAGIC 0x18273645u -#define KEY_DEBUG_MAGIC_X 0xf8e9dacbu #endif unsigned long flags; /* status flags (change with bitops) */ diff --git a/include/linux/mpi.h b/include/linux/mpi.h index 1cc5ffb769af..1f679b632277 100644 --- a/include/linux/mpi.h +++ b/include/linux/mpi.h @@ -78,7 +78,7 @@ int mpi_fromstr(MPI val, const char *str); u32 mpi_get_keyid(MPI a, u32 *keyid); void *mpi_get_buffer(MPI a, unsigned *nbytes, int *sign); int mpi_read_buffer(MPI a, uint8_t *buf, unsigned buf_len, unsigned *nbytes, - int *sign); + int *sign, bool skip_lzeros); void *mpi_get_secure_buffer(MPI a, unsigned *nbytes, int *sign); int mpi_write_to_sgl(MPI a, struct scatterlist *sg, unsigned nbytes, int *sign); diff --git a/include/uapi/linux/keyctl.h b/include/uapi/linux/keyctl.h index 201c6644b237..ef16df06642a 100644 --- a/include/uapi/linux/keyctl.h +++ b/include/uapi/linux/keyctl.h @@ -70,8 +70,8 @@ struct keyctl_dh_params { }; struct keyctl_kdf_params { - char *hashname; - char *otherinfo; + char __user *hashname; + char __user *otherinfo; __u32 otherinfolen; __u32 __spare[8]; }; |