diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-08-07 10:54:02 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-08-07 13:32:55 +0200 |
| commit | f633f0b5f9dd144226c3d53a115d9a8bea17f845 (patch) | |
| tree | ad318537f6f4f387fdb663e7c4dc7d7fb75b49ce /src | |
| parent | d4be364b6186c2b1c612866964c0e00ab14baece (diff) | |
| download | gnutls-f633f0b5f9dd144226c3d53a115d9a8bea17f845.tar.gz | |
pkcs11: added new functions to query the object's flags
gnutls_pkcs11_obj_get_flags() allows obtaining an object's flags,
and gnutls_pkcs11_flags_get_str() allows printing them.
Diffstat (limited to 'src')
| -rw-r--r-- | src/p11tool.c | 2 | ||||
| -rw-r--r-- | src/pkcs11.c | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/p11tool.c b/src/p11tool.c index 5980d7f58b..93fe15153f 100644 --- a/src/p11tool.c +++ b/src/p11tool.c @@ -89,7 +89,7 @@ unsigned opt_to_flags(void) GNUTLS_PKCS11_OBJ_FLAG_MARK_CA; if (ENABLED_OPT(MARK_WRAP)) - flags |= GNUTLS_PKCS11_OBJ_FLAG_KEY_WRAP; + flags |= GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP; if (ENABLED_OPT(LOGIN)) flags |= GNUTLS_PKCS11_OBJ_FLAG_LOGIN; diff --git a/src/pkcs11.c b/src/pkcs11.c index 401ce7b133..893fc1ef9c 100644 --- a/src/pkcs11.c +++ b/src/pkcs11.c @@ -94,7 +94,7 @@ pkcs11_list(FILE * outfile, const char *url, int type, unsigned int flags, gnutls_pkcs11_obj_t *crt_list; unsigned int crt_list_size = 0, i; int ret, otype; - char *output; + char *output, *str; int attrs; unsigned int obj_flags = flags; @@ -133,6 +133,7 @@ pkcs11_list(FILE * outfile, const char *url, int type, unsigned int flags, for (i = 0; i < crt_list_size; i++) { char buf[128]; size_t size; + unsigned int oflags; ret = gnutls_pkcs11_obj_export_url(crt_list[i], detailed, @@ -161,6 +162,19 @@ pkcs11_list(FILE * outfile, const char *url, int type, unsigned int flags, } fprintf(outfile, "\tLabel: %s\n", buf); + oflags = 0; + ret = gnutls_pkcs11_obj_get_flags(crt_list[i], &oflags); + if (ret < 0) { + fprintf(stderr, "Error in %s:%d: %s\n", __func__, + __LINE__, gnutls_strerror(ret)); + exit(1); + } + str = gnutls_pkcs11_flags_get_str(oflags); + if (str != NULL) { + fprintf(outfile, "\tFlags: %s\n", str); + gnutls_free(str); + } + size = sizeof(buf); ret = gnutls_pkcs11_obj_get_info(crt_list[i], |