diff options
| author | Simon Josefsson <simon@josefsson.org> | 2004-08-22 12:42:34 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2004-08-22 12:42:34 +0000 |
| commit | 6add17333e7f22b47ca5ea24e9790f4cebe00ec1 (patch) | |
| tree | 1623ea8a4088adb07704531c6b657c4873e0bea1 /src | |
| parent | 66c3c4dbda932182338205ca0b037d89bde3c2fb (diff) | |
| download | gnutls-6add17333e7f22b47ca5ea24e9790f4cebe00ec1.tar.gz | |
Fix --password.
Diffstat (limited to 'src')
| -rw-r--r-- | src/certtool.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/certtool.c b/src/certtool.c index cf09a2e536..fb5b183b98 100644 --- a/src/certtool.c +++ b/src/certtool.c @@ -2251,7 +2251,10 @@ void generate_pkcs12(void) name = get_pkcs12_key_name(); - password = get_pass(); + if (info.pass) + password = info.pass; + else + password = get_pass(); result = gnutls_pkcs12_bag_init(&bag); if (result < 0) { @@ -2487,7 +2490,10 @@ void pkcs12_info(void) data.data = buffer; data.size = size; - password = get_pass(); + if (info.pass) + password = info.pass; + else + password = get_pass(); result = gnutls_pkcs12_init(&pkcs12); if (result < 0) { |