diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-11-06 20:13:58 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-11-06 20:13:58 +0100 |
| commit | 5106073ce1160a9441d49e22b31f279c473808be (patch) | |
| tree | 376bbdb607e48e80dd9fac1b760e30062e22f492 /lib/pkcs11x.c | |
| parent | e1a0af1915d25bd9c73668e1611a9ea898cad85f (diff) | |
| download | gnutls-5106073ce1160a9441d49e22b31f279c473808be.tar.gz | |
pkcs11: eliminated the need for struct token_info
Diffstat (limited to 'lib/pkcs11x.c')
| -rw-r--r-- | lib/pkcs11x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pkcs11x.c b/lib/pkcs11x.c index 7fe6fcdda7..86657cd253 100644 --- a/lib/pkcs11x.c +++ b/lib/pkcs11x.c @@ -160,7 +160,7 @@ int pkcs11_override_cert_exts(struct pkcs11_session_info *sinfo, gnutls_datum_t static int find_ext_cb(struct pkcs11_session_info *sinfo, - struct token_info *info, struct ck_info *lib_info, + struct ck_token_info *tinfo, struct ck_info *lib_info, void *input) { struct find_ext_data_st *find_data = input; @@ -172,7 +172,7 @@ find_ext_cb(struct pkcs11_session_info *sinfo, int ret; gnutls_datum_t ext; - if (info == NULL) { /* we don't support multiple calls */ + if (tinfo == NULL) { /* we don't support multiple calls */ gnutls_assert(); return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE; } @@ -180,7 +180,7 @@ find_ext_cb(struct pkcs11_session_info *sinfo, /* do not bother reading the token if basic fields do not match */ if (!p11_kit_uri_match_token_info - (find_data->obj->info, &info->tinfo) + (find_data->obj->info, tinfo) || !p11_kit_uri_match_module_info(find_data->obj->info, lib_info)) { gnutls_assert(); |