diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2024-12-04 15:24:20 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-12-04 15:28:55 +0100 |
| commit | 6993d9f0959534b0b7d52e17b95e9e79fb0b3d0a (patch) | |
| tree | fefc6247c72c479245b26b90b6b5a0e4b890dcf8 | |
| parent | upstream: spelling; ok djm@ (diff) | |
| download | openssh-6993d9f0959534b0b7d52e17b95e9e79fb0b3d0a.tar.xz openssh-6993d9f0959534b0b7d52e17b95e9e79fb0b3d0a.zip | |
upstream: don't screw up ssh-keygen -l output when the file
contains CR characters; GHPR236 bz3385, fix from Dmitry Belyavskiy
OpenBSD-Commit-ID: e458cf6b0adcea5b69ef4c7ba38e590841d02ef4
| -rw-r--r-- | ssh-keygen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index f7ea06968..89c3ed287 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.476 2024/10/18 05:37:24 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.477 2024/12/04 14:24:20 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1008,7 +1008,7 @@ do_fingerprint(struct passwd *pw) while (getline(&line, &linesize, f) != -1) { lnum++; cp = line; - cp[strcspn(cp, "\n")] = '\0'; + cp[strcspn(cp, "\r\n")] = '\0'; /* Trim leading space and comments */ cp = line + strspn(line, " \t"); if (*cp == '#' || *cp == '\0') |