summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-11-06 09:20:58 +0100
committerSimon Josefsson <simon@josefsson.org>2008-11-06 09:20:58 +0100
commit015aa8bcd3d1ae29a68800651598146ce259e5b4 (patch)
tree4012421b4ef33a6a76472f83ca41ba86b18b3994
parent6ba193bb10782d38f5a68475c38040d03c2fbfe5 (diff)
downloadgnutls-015aa8bcd3d1ae29a68800651598146ce259e5b4.tar.gz
Cosmetic fixes.
-rw-r--r--NEWS2
-rw-r--r--src/certtool.c9
2 files changed, 5 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 2e9b77c922..758d9a8989 100644
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,7 @@ Ucko <ucko@ncbi.nlm.nih.gov>.
It incorrectly returned the subject DN instead of issuer DN in v2.6.0.
Thanks to Thomas Viehmann <tv@beamnet.de> for report.
-** certtool: print a PKCS #8 key even if it is not encrypted.
+** certtool: Print a PKCS #8 key even if it is not encrypted.
** tests: Make tests compile when using internal libtasn1.
Patch by ludo@gnu.org (Ludovic Courtès).
diff --git a/src/certtool.c b/src/certtool.c
index 2b48984914..eaecf3fb8d 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -1381,15 +1381,14 @@ privkey_info (void)
ret =
gnutls_x509_privkey_import_pkcs8 (key, &pem, info.incert_format,
NULL, GNUTLS_PKCS_PLAIN);
- if (ret < 0)
- {
+ if (ret < 0)
+ {
if (info.pass)
pass = info.pass;
else
pass = get_pass ();
- ret =
- gnutls_x509_privkey_import_pkcs8 (key, &pem, info.incert_format,
- pass, 0);
+ ret = gnutls_x509_privkey_import_pkcs8 (key, &pem,
+ info.incert_format, pass, 0);
}
}
if (ret < 0)