diff options
Diffstat (limited to 'lib/pkcs11_int.h')
| -rw-r--r-- | lib/pkcs11_int.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/pkcs11_int.h b/lib/pkcs11_int.h index 23b45fe36a..de9afbdee5 100644 --- a/lib/pkcs11_int.h +++ b/lib/pkcs11_int.h @@ -82,7 +82,15 @@ struct gnutls_pkcs11_privkey_st { * directly. It can be provided a callback function to run when a reinitialization * occurs. */ typedef int (*pkcs11_reinit_function)(void *priv); -int _gnutls_pkcs11_check_init(unsigned trusted, void *priv, pkcs11_reinit_function cb); + +typedef enum init_level_t { + PROV_UNINITIALIZED = 0, + PROV_INIT_MANUAL, + PROV_INIT_TRUSTED, + PROV_INIT_ALL +} init_level_t; + +int _gnutls_pkcs11_check_init(init_level_t req_level, void *priv, pkcs11_reinit_function cb); #define FIX_KEY_USAGE(pk, usage) \ if (usage == 0) { \ @@ -93,17 +101,17 @@ int _gnutls_pkcs11_check_init(unsigned trusted, void *priv, pkcs11_reinit_functi } #define PKCS11_CHECK_INIT \ - ret = _gnutls_pkcs11_check_init(0, NULL, NULL); \ + ret = _gnutls_pkcs11_check_init(PROV_INIT_MANUAL, NULL, NULL); \ if (ret < 0) \ return gnutls_assert_val(ret) #define PKCS11_CHECK_INIT_TRUSTED \ - ret = _gnutls_pkcs11_check_init(1, NULL, NULL); \ + ret = _gnutls_pkcs11_check_init(PROV_INIT_TRUSTED, NULL, NULL); \ if (ret < 0) \ return gnutls_assert_val(ret) #define PKCS11_CHECK_INIT_RET(x) \ - ret = _gnutls_pkcs11_check_init(0, NULL, NULL); \ + ret = _gnutls_pkcs11_check_init(PROV_INIT_MANUAL, NULL, NULL); \ if (ret < 0) \ return gnutls_assert_val(x) |