diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2024-10-18 07:37:24 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-10-18 07:37:53 +0200 |
| commit | d9cd208e89a471a3ff8adfcec68d6210af9e9fd5 (patch) | |
| tree | d41b3cf01d47b1a197ed5e76bb7774354bf6313b | |
| parent | upstream: ssh-keyscan doesn't need it's own sshfatal() definition, it (diff) | |
| download | openssh-d9cd208e89a471a3ff8adfcec68d6210af9e9fd5.tar.xz openssh-d9cd208e89a471a3ff8adfcec68d6210af9e9fd5.zip | |
upstream: allow "-" as output file for moduli screening
based on GHPR393
OpenBSD-Commit-ID: 1517763764eb55d03a6092dd120d2909c6fef0e1
| -rw-r--r-- | ssh-keygen.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 8396c4036..f7ea06968 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.475 2024/09/15 00:47:01 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.476 2024/10/18 05:37:24 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -3028,7 +3028,9 @@ do_moduli_gen(const char *out_file, char **opts, size_t nopts) } } - if ((out = fopen(out_file, "w")) == NULL) { + if (strcmp(out_file, "-") == 0) + out = stdout; + else if ((out = fopen(out_file, "w")) == NULL) { fatal("Couldn't open modulus candidate file \"%s\": %s", out_file, strerror(errno)); } @@ -3093,7 +3095,9 @@ do_moduli_screen(const char *out_file, char **opts, size_t nopts) } } - if ((out = fopen(out_file, "a")) == NULL) { + if (strcmp(out_file, "-") == 0) + out = stdout; + else if ((out = fopen(out_file, "a")) == NULL) { fatal("Couldn't open moduli file \"%s\": %s", out_file, strerror(errno)); } |