summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2005-12-08 15:23:23 +0000
committerSimon Josefsson <simon@josefsson.org>2005-12-08 15:23:23 +0000
commitcabedb4471d3a14ba910f19e5e483d35b51b55f1 (patch)
tree0a0083c85153ceb38b2c835c537fa9252b6b6078
parent4e83221ad2ea10677135c1b8a0257dc43c985801 (diff)
downloadgnutls-cabedb4471d3a14ba910f19e5e483d35b51b55f1.tar.gz
Make --password work for PKCS#8 --key-info.
-rw-r--r--src/certtool.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/certtool.c b/src/certtool.c
index 381e91a2f1..104b887ef4 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -1662,7 +1662,10 @@ privkey_info (void)
}
else
{
- pass = get_pass ();
+ if (info.pass)
+ pass = info.pass;
+ else
+ pass = get_pass ();
ret =
gnutls_x509_privkey_import_pkcs8 (key, &pem, in_cert_format, pass, 0);
}