diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-02-28 07:55:39 +0000 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-02-28 07:55:39 +0000 |
commit | 26e71744ee63abbff4d9ee5947d30be86972712e (patch) | |
tree | 8182f4bb7d09178cd6d4005da46ad24a99992eb1 | |
parent | 36a0179d9d946e733ad0eb74f62f5914962f4075 (diff) | |
parent | e74a6aed1bf04d9abad57a0c71a964047145d4d5 (diff) | |
download | gnutls-26e71744ee63abbff4d9ee5947d30be86972712e.tar.gz |
Merge branch 'tmp-token-modname-clarifications' into 'master'
pkcs11: clarify GNUTLS_PKCS11_TOKEN_MODNAME presence [ci skip]
Closes #633
See merge request gnutls/gnutls!938
-rw-r--r-- | lib/includes/gnutls/pkcs11.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h index 3a442c8284..9541ee333f 100644 --- a/lib/includes/gnutls/pkcs11.h +++ b/lib/includes/gnutls/pkcs11.h @@ -324,7 +324,8 @@ int gnutls_pkcs11_obj_set_info(gnutls_pkcs11_obj_t obj, * @GNUTLS_PKCS11_TOKEN_SERIAL: The token's serial number (string) * @GNUTLS_PKCS11_TOKEN_MANUFACTURER: The token's manufacturer (string) * @GNUTLS_PKCS11_TOKEN_MODEL: The token's model (string) - * @GNUTLS_PKCS11_TOKEN_MODNAME: The token's module name (string - since 3.4.3) + * @GNUTLS_PKCS11_TOKEN_MODNAME: The token's module name (string - since 3.4.3). This value is + * unavailable for providers which were manually loaded. * * Enumeration of types for retrieving token information. */ |