|
 |
519d7d |
diff --git a/src/p11tool.c b/src/p11tool.c
|
|
|
519d7d |
index 2abf23a27..a6fce78e3 100644
|
|
|
519d7d |
--- a/src/p11tool.c
|
|
|
519d7d |
+++ b/src/p11tool.c
|
|
|
519d7d |
@@ -68,7 +68,7 @@ int main(int argc, char **argv)
|
|
|
519d7d |
}
|
|
|
519d7d |
|
|
|
519d7d |
static
|
|
|
519d7d |
-unsigned opt_to_flags(void)
|
|
|
519d7d |
+unsigned opt_to_flags(common_info_st *cinfo)
|
|
|
519d7d |
{
|
|
|
519d7d |
unsigned flags = 0;
|
|
|
519d7d |
|
|
|
519d7d |
@@ -78,6 +78,12 @@ unsigned opt_to_flags(void)
|
|
|
519d7d |
} else {
|
|
|
519d7d |
flags |= GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_PRIVATE;
|
|
|
519d7d |
}
|
|
|
519d7d |
+ } else { /* if not given mark as private the private objects, and public the public ones */
|
|
|
519d7d |
+ if (cinfo->privkey)
|
|
|
519d7d |
+ flags |= GNUTLS_PKCS11_OBJ_FLAG_MARK_PRIVATE;
|
|
|
519d7d |
+ else if (cinfo->pubkey || cinfo->cert)
|
|
|
519d7d |
+ flags |= GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_PRIVATE;
|
|
|
519d7d |
+ /* else set the defaults of the token */
|
|
|
519d7d |
}
|
|
|
519d7d |
|
|
|
519d7d |
if (ENABLED_OPT(MARK_TRUSTED))
|
|
|
519d7d |
@@ -166,8 +172,6 @@ static void cmd_parser(int argc, char **argv)
|
|
|
519d7d |
|
|
|
519d7d |
memset(&cinfo, 0, sizeof(cinfo));
|
|
|
519d7d |
|
|
|
519d7d |
- flags = opt_to_flags();
|
|
|
519d7d |
-
|
|
|
519d7d |
if (HAVE_OPT(SECRET_KEY))
|
|
|
519d7d |
cinfo.secret_key = OPT_ARG(SECRET_KEY);
|
|
|
519d7d |
|
|
|
519d7d |
@@ -227,6 +231,8 @@ static void cmd_parser(int argc, char **argv)
|
|
|
519d7d |
sec_param = OPT_ARG(SEC_PARAM);
|
|
|
519d7d |
}
|
|
|
519d7d |
|
|
|
519d7d |
+ flags = opt_to_flags(&cinfo);
|
|
|
519d7d |
+
|
|
|
519d7d |
if (debug > 4) {
|
|
|
519d7d |
if (HAVE_OPT(MARK_PRIVATE))
|
|
|
519d7d |
fprintf(stderr, "Private: %s\n",
|
|
|
519d7d |
--
|
|
|
519d7d |
2.14.3
|
|
|
519d7d |
|