From a56b79b598902c7393fd79c63373a8b4eba4833c Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Thu, 9 Jan 2020 19:52:19 +0000 Subject: [PATCH] Change line ending wording in PPK format spec. This doesn't affect what files are _legal_: the spec said we tolerated three kinds of line ending, and it still says we tolerate the same three. But I noticed that we're actually outputting \n by preference, whereas the spec said we prefer \r\n. I'd rather change the docs than the code. (cherry picked from commit cbfd7dadacbed92ed25d132cdc04cee819e9202a) --- sshpubk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sshpubk.c b/sshpubk.c index 442fb5ed..c9423192 100644 --- a/sshpubk.c +++ b/sshpubk.c @@ -400,8 +400,8 @@ bool rsa_ssh1_savekey(const Filename *filename, RSAKey *key, /* * PuTTY's own format for SSH-2 keys is as follows: * - * The file is text. Lines are terminated by CRLF, although CR-only - * and LF-only are tolerated on input. + * The file is text. Lines are terminated by LF by preference, + * although CRLF and CR-only are tolerated on input. * * The first line says "PuTTY-User-Key-File-2: " plus the name of the * algorithm ("ssh-dss", "ssh-rsa" etc).