diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-06-03 15:01:59 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-06-03 15:01:59 +0200 |
| commit | 00b33ed7bc2caddd74a950985c381a2fde8771e9 (patch) | |
| tree | 923faad539ebc2e67fb02745bfd9e5d6f9d35b71 | |
| parent | a295fd5dee1b8cc1d1043cbe31339a93786259a0 (diff) | |
| download | gnutls-00b33ed7bc2caddd74a950985c381a2fde8771e9.tar.gz | |
doc clarify the version since when GNUTLS_PKCS11_OBJ_FLAG_OVERWRITE_TRUSTMOD_EXT is accepted
| -rw-r--r-- | lib/pkcs11.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pkcs11.c b/lib/pkcs11.c index e61a45606c..7304170a5d 100644 --- a/lib/pkcs11.c +++ b/lib/pkcs11.c @@ -2996,7 +2996,7 @@ find_objs_cb(struct ck_function_list *module, struct pkcs11_session_info *sinfo, * %GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO, %GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE, * %GNUTLS_PKCS11_OBJ_FLAG_CRT, %GNUTLS_PKCS11_OBJ_FLAG_PUBKEY, %GNUTLS_PKCS11_OBJ_FLAG_PRIVKEY, * %GNUTLS_PKCS11_OBJ_FLAG_WITH_PRIVKEY, %GNUTLS_PKCS11_OBJ_FLAG_MARK_CA, - * %GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED, %GNUTLS_PKCS11_OBJ_FLAG_OVERWRITE_TRUSTMOD_EXT. + * %GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED, and since 3.5.1 the %GNUTLS_PKCS11_OBJ_FLAG_OVERWRITE_TRUSTMOD_EXT. * * On versions of GnuTLS prior to 3.4.0 the equivalent function was * gnutls_pkcs11_obj_list_import_url(). That is also available on this version @@ -3056,7 +3056,7 @@ gnutls_pkcs11_obj_list_import_url3(gnutls_pkcs11_obj_t * p_list, * %GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO, %GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE, * %GNUTLS_PKCS11_OBJ_FLAG_CRT, %GNUTLS_PKCS11_OBJ_FLAG_PUBKEY, %GNUTLS_PKCS11_OBJ_FLAG_PRIVKEY, * %GNUTLS_PKCS11_OBJ_FLAG_WITH_PRIVKEY, %GNUTLS_PKCS11_OBJ_FLAG_MARK_CA, - * %GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED, %GNUTLS_PKCS11_OBJ_FLAG_OVERWRITE_TRUSTMOD_EXT. + * %GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED, and since 3.5.1 the %GNUTLS_PKCS11_OBJ_FLAG_OVERWRITE_TRUSTMOD_EXT. * * On versions of GnuTLS prior to 3.4.0 the equivalent function was * gnutls_pkcs11_obj_list_import_url2(). That is also available on this version |