upstream commit

missing parentheses after if in do_convert_from() broke
 private key conversion from other formats some time in 2010; bz#2345 reported
 by jjelen AT redhat.com

1 files changed, 3 insertions, 3 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index b8489dc8b..b435498cb 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.259 2015/01/28 22:36:00 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.260 2015/01/30 00:59:19 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -721,12 +721,12 @@ do_convert_from(struct passwd *pw)
                 fatal("%s: unknown key format %d", __func__, convert_format);
         }
 
-        if (!private)
+        if (!private) {
                 if ((r = sshkey_write(k, stdout)) == 0)
                         ok = 1;
                 if (ok)
                         fprintf(stdout, "\n");
-        else {
+        } else {
                 switch (k->type) {
                 case KEY_DSA:
                         ok = PEM_write_DSAPrivateKey(stdout, k->dsa, NULL,