undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fs/ssh-signing-crlf'

Browse Source 
The code path that verifies signatures made with ssh were made to
work better on a system with CRLF line endings.

* fs/ssh-signing-crlf:
  gpg-interface: trim CR from ssh-keygen
This commit is contained in:
Junio C Hamano 2022-02-09 14:21:00 -08:00
commit bd75856ef7
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gpg-interface.c
View File

@ -433,7 +433,6 @@ static int verify_ssh_signed_buffer(struct signature_check *sigc,
struct tempfile *buffer_file; struct tempfile *buffer_file;
int ret = -1; int ret = -1;
const char *line; const char *line;
size_t trust_size;
char *principal; char *principal;
struct strbuf ssh_principals_out = STRBUF_INIT; struct strbuf ssh_principals_out = STRBUF_INIT;
struct strbuf ssh_principals_err = STRBUF_INIT; struct strbuf ssh_principals_err = STRBUF_INIT;
@ -502,15 +501,30 @@ static int verify_ssh_signed_buffer(struct signature_check *sigc,
ret = -1; ret = -1;
} else { } else {
/* Check every principal we found (one per line) */ /* Check every principal we found (one per line) */
for (line = ssh_principals_out.buf; *line; const char *next;
line = strchrnul(line + 1, '\n')) { for (line = ssh_principals_out.buf;
while (*line == '\n') *line;
line++; line = next) {
if (!*line) const char *end_of_text;
break;
trust_size = strcspn(line, "\n"); next = end_of_text = strchrnul(line, '\n');
principal = xmemdupz(line, trust_size);
/* Did we find a LF, and did we have CR before it? */
if (*end_of_text &&
line < end_of_text &&
end_of_text[-1] == '\r')
end_of_text--;
/* Unless we hit NUL, skip over the LF we found */
if (*next)
next++;
/* Not all lines are data. Skip empty ones */
if (line == end_of_text)
continue;
/* We now know we have an non-empty line. Process it */
principal = xmemdupz(line, end_of_text - line);
child_process_init(&ssh_keygen); child_process_init(&ssh_keygen);
strbuf_release(&ssh_keygen_out); strbuf_release(&ssh_keygen_out);