diff options
| author | Werner Koch <[email protected]> | 2025-11-15 16:45:12 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2025-11-15 16:45:12 +0000 |
| commit | 5d855f76c8af280f0a2b01d64283a9efa0f5d795 (patch) | |
| tree | 30f16f1053e6a37fed3aa14540c620aa502c363f /g10/parse-packet.c | |
| parent | gpg: Refactor an import function for better readability. (diff) | |
| download | gnupg-5d855f76c8af280f0a2b01d64283a9efa0f5d795.tar.gz gnupg-5d855f76c8af280f0a2b01d64283a9efa0f5d795.zip | |
gpg: Change the mode1003 format for composite keys.
* g10/export.c (secret_key_to_mode1003): Put both parts into one
container.
* g10/parse-packet.c (parse_key): Revert to old version.
--
Let's have a proper s-expression for composite keys.
Updates-commit: e5473262e88473a101241e7b4860882ebeb1ed97
Diffstat (limited to 'g10/parse-packet.c')
| -rw-r--r-- | g10/parse-packet.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/g10/parse-packet.c b/g10/parse-packet.c index aac3a988c..22db04291 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -3079,22 +3079,10 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen, if (mpi_print_mode) { char *tmpsxp = canon_sexp_to_string (tmpp, pktlen); - size_t len1 = gcry_sexp_canon_len (tmpp, pktlen, NULL, NULL); - const char *tp = tmpp; es_fprintf (listfp, "\tskey[%d]: %s\n", npkey, tmpsxp? trim_trailing_spaces (tmpsxp) /* */: "[invalid S-expression]"); - if (len1 && len1 < pktlen - && tp[len1] == '(' && tp[pktlen-1] == ')' ) - { - /* Second s-expression from a dual key. */ - xfree (tmpsxp); - tmpsxp = canon_sexp_to_string (tp+len1, pktlen-len1); - es_fprintf (listfp, "\t part-2: %s\n", - tmpsxp? trim_trailing_spaces (tmpsxp) - /* */: "[invalid S-expression]"); - } xfree (tmpsxp); } else |