diff options
Diffstat (limited to 'security/keys/internal.h')
-rw-r--r-- | security/keys/internal.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h index 7d894ef70370..3cc04c2afe1c 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h | |||
@@ -109,7 +109,8 @@ extern int install_process_keyring(struct task_struct *tsk); | |||
109 | 109 | ||
110 | extern struct key *request_key_and_link(struct key_type *type, | 110 | extern struct key *request_key_and_link(struct key_type *type, |
111 | const char *description, | 111 | const char *description, |
112 | const char *callout_info, | 112 | const void *callout_info, |
113 | size_t callout_len, | ||
113 | void *aux, | 114 | void *aux, |
114 | struct key *dest_keyring, | 115 | struct key *dest_keyring, |
115 | unsigned long flags); | 116 | unsigned long flags); |
@@ -120,13 +121,15 @@ extern struct key *request_key_and_link(struct key_type *type, | |||
120 | struct request_key_auth { | 121 | struct request_key_auth { |
121 | struct key *target_key; | 122 | struct key *target_key; |
122 | struct task_struct *context; | 123 | struct task_struct *context; |
123 | char *callout_info; | 124 | void *callout_info; |
125 | size_t callout_len; | ||
124 | pid_t pid; | 126 | pid_t pid; |
125 | }; | 127 | }; |
126 | 128 | ||
127 | extern struct key_type key_type_request_key_auth; | 129 | extern struct key_type key_type_request_key_auth; |
128 | extern struct key *request_key_auth_new(struct key *target, | 130 | extern struct key *request_key_auth_new(struct key *target, |
129 | const char *callout_info); | 131 | const void *callout_info, |
132 | size_t callout_len); | ||
130 | 133 | ||
131 | extern struct key *key_get_instantiation_authkey(key_serial_t target_id); | 134 | extern struct key *key_get_instantiation_authkey(key_serial_t target_id); |
132 | 135 | ||