git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 1/5] gpg-interface: simplify ssh fingerprint parsing

From
Christian Couder <christian.couder@gmail.com>
Date
Oct 30, 2025, 12:33 UTC
Message-ID
<20251030123332.3337684-2-christian.couder@gmail.com>
In-Reply-To
<20251030123332.3337684-1-christian.couder@gmail.com>

In "gpg-interface.c", the 'parse_ssh_output()' function takes a 'struct signature_check *sigc' argument and populates many members of this 'sigc' using information parsed from 'sigc->output' which contains the ouput of an `ssh-keygen -Y ...` command that was used to verify an SSH signature.

When it populates 'sigc->fingerprint' though, it uses `xstrdup(strstr(line, "key ") + 4)` while `strstr(line, "key ")` has already been computed a few lines above and is already available in the `key` variable.

Let's simplify this.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 gpg-interface.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gpg-interface.c b/gpg-interface.c
index 2f4f0e32cb..91d1b58cb4 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -443,7 +443,7 @@ static void parse_ssh_output(struct signature_check *sigc)
 
 	key = strstr(line, "key ");
 	if (key) {
-		sigc->fingerprint = xstrdup(strstr(line, "key ") + 4);
+		sigc->fingerprint = xstrdup(key + 4);
 		sigc->key = xstrdup(sigc->fingerprint);
 	} else {
 		/*
-- 
2.51.2.617.g2aaa867cd1
Previous: Christian CouderNext: Christian Couder
Message 14 of 22 in “fast-export/import: cleanups and translation”
  1. 0/5 fast-export/import: cleanups and translationChristian Couder, Oct 28, 2025
  2. 1/5 gpg-interface: simplify ssh fingerprint parsingChristian Couder, Oct 28, 2025
  3. Junio C HamanoOct 28, 2025
  4. 2/5 gpg-interface: use left shift to define GPG_VERIFY_*Christian Couder, Oct 28, 2025
  5. 3/5 fast-export: mark strings for translationChristian Couder, Oct 28, 2025
  6. Junio C HamanoOct 28, 2025
  7. Christian CouderOct 29, 2025
  8. Junio C HamanoOct 29, 2025
  9. Christian CouderOct 30, 2025
  10. 4/5 fast-import: mark strings for translationChristian Couder, Oct 28, 2025
  11. Junio C HamanoOct 28, 2025
  12. 5/5 gpg-interface: mark a string for translationChristian Couder, Oct 28, 2025
  13. 0/5 fast-export/import: cleanups and translationChristian Couder, Oct 30, 2025
  14. 1/5 gpg-interface: simplify ssh fingerprint parsingChristian Couder, Oct 30, 2025
  15. 2/5 gpg-interface: use left shift to define GPG_VERIFY_*Christian Couder, Oct 30, 2025
  16. 3/5 fast-export: mark strings for translationChristian Couder, Oct 30, 2025
  17. 4/5 fast-import: mark strings for translationChristian Couder, Oct 30, 2025
  18. Elijah NewrenOct 31, 2025
  19. 5/5 gpg-interface: mark a string for translationChristian Couder, Oct 30, 2025
  20. Junio C HamanoOct 30, 2025
  21. Elijah NewrenOct 31, 2025
  22. Christian CouderNov 1, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.