Thanks to visit codestin.com
Credit goes to github.com

Skip to content

First #2079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

First #2079

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e23a735
gpg-interface: do not use misdesigned strbuf_split*()
cloobTech Oct 22, 2025
c9fcade
gpg-interface: do not use misdesigned strbuf_split*()
cloobTech Oct 22, 2025
2166c9c
gpg-interface: do not use misdesigned strbuf_split*()
cloobTech Oct 22, 2025
97d7c65
gpg-interface: do not use misdesigned strbuf_split*()
cloobTech Oct 22, 2025
d141528
Merge branch 'first' of github.com:cloobTech/git into first
cloobTech Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions gpg-interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,8 +821,7 @@ static char *get_ssh_key_fingerprint(const char *signing_key)
struct child_process ssh_keygen = CHILD_PROCESS_INIT;
int ret = -1;
struct strbuf fingerprint_stdout = STRBUF_INIT;
struct strbuf **fingerprint;
char *fingerprint_ret;
char *fingerprint_ret, *begin, *delim;
const char *literal_key = NULL;

/*
Expand All @@ -845,13 +844,17 @@ static char *get_ssh_key_fingerprint(const char *signing_key)
die_errno(_("failed to get the ssh fingerprint for key '%s'"),
signing_key);

fingerprint = strbuf_split_max(&fingerprint_stdout, ' ', 3);
if (!fingerprint[1])
die_errno(_("failed to get the ssh fingerprint for key '%s'"),
begin = fingerprint_stdout.buf;
delim = strchr(begin, ' ');
if (!delim)
die(_("failed to get the ssh fingerprint for key %s"),
signing_key);

fingerprint_ret = strbuf_detach(fingerprint[1], NULL);
strbuf_list_free(fingerprint);
begin = delim + 1;
delim = strchr(begin, ' ');
if (!delim)
die(_("failed to get the ssh fingerprint for key %s"),
signing_key);
fingerprint_ret = xmemdupz(begin, delim - begin);
strbuf_release(&fingerprint_stdout);
return fingerprint_ret;
}
Expand All @@ -862,12 +865,12 @@ static char *get_default_ssh_signing_key(void)
struct child_process ssh_default_key = CHILD_PROCESS_INIT;
int ret = -1;
struct strbuf key_stdout = STRBUF_INIT, key_stderr = STRBUF_INIT;
struct strbuf **keys;
char *key_command = NULL;
const char **argv;
int n;
char *default_key = NULL;
const char *literal_key = NULL;
char *begin, *new_line, *first_line, *end;

if (!ssh_default_key_command)
die(_("either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"));
Expand All @@ -884,19 +887,22 @@ static char *get_default_ssh_signing_key(void)
&key_stderr, 0);

if (!ret) {
keys = strbuf_split_max(&key_stdout, '\n', 2);
if (keys[0] && is_literal_ssh_key(keys[0]->buf, &literal_key)) {
begin = key_stdout.buf;
new_line = strchr(begin, '\n');
end = new_line ? new_line : strchr(begin, '\0');
first_line = xmemdupz(begin, end - begin);
if (is_literal_ssh_key(first_line, &literal_key)) {
/*
* We only use `is_literal_ssh_key` here to check validity
* The prefix will be stripped when the key is used.
*/
default_key = strbuf_detach(keys[0], NULL);
default_key = first_line;
} else {
free(first_line);
warning(_("gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"),
key_stderr.buf, key_stdout.buf);
}

strbuf_list_free(keys);
} else {
warning(_("gpg.ssh.defaultKeyCommand failed: %s %s"),
key_stderr.buf, key_stdout.buf);
Expand Down
Loading