diff options
| author |   djm <djm@openbsd.org> | 2015-01-30 00:59:19 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-01-30 00:59:19 +0000 |
| commit | f265c03b844de8a8021bf3f48e6fffcbd6ccd3e6 (patch) | |
| tree | 379a55794968a35d6e9a11fcab8e2d486dc3e981 | |
| parent | Make sure every layout line contains at least one cell; (diff) | |
| download | wireguard-openbsd-f265c03b844de8a8021bf3f48e6fffcbd6ccd3e6.tar.xz wireguard-openbsd-f265c03b844de8a8021bf3f48e6fffcbd6ccd3e6.zip | |
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
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index e80d1b314a9..cbd60d73766 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/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 @@ -706,12 +706,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, |