diff options
| author | Werner Koch <wk@gnupg.org> | 2021-09-14 13:00:40 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2021-09-14 13:00:40 +0200 |
| commit | dbfb7f809b89cfe05bdacafdb91a2d485b9fe2e0 (patch) | |
| tree | b57ad420cd76b45e882b8283cdfb1dfdfc8871d4 /g10 | |
| parent | Update release signing keys. (diff) | |
| download | gnupg2-dbfb7f809b89cfe05bdacafdb91a2d485b9fe2e0.tar.xz gnupg2-dbfb7f809b89cfe05bdacafdb91a2d485b9fe2e0.zip | |
gpg: Print a warning when importing a bad cv25519 secret key.
* g10/import.c (transfer_secret_keys): Add simple check.
--
Note that the requirement for a set high bit is not yet checked.
GnuPG-bug-id: 5464
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/import.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/g10/import.c b/g10/import.c index 951c33d81..bb0bf6793 100644 --- a/g10/import.c +++ b/g10/import.c @@ -2566,7 +2566,6 @@ transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats, gcry_sexp_release (curve); err = gcry_sexp_build (&curve, NULL, "(curve %s)", curvename?curvename:curvestr); - xfree (curvestr); if (!err) { j = 0; @@ -2583,7 +2582,24 @@ transfer_secret_keys (ctrl_t ctrl, struct import_stats_s *stats, else put_membuf_str (&mbuf, " _ %m"); format_args[j++] = pk->pkey + i; + + /* Simple hack to print a warning for an invalid key + * in case of cv25519. We have only opaque MPIs here. */ + if (pk->pubkey_algo == PUBKEY_ALGO_ECDH + && !strcmp (curvestr, "1.3.6.1.4.1.3029.1.5.1") + && gcry_mpi_get_flag (pk->pkey[i], GCRYMPI_FLAG_OPAQUE)) + { + const unsigned char *pp; + unsigned int nn; + + pp = gcry_mpi_get_opaque (pk->pkey[i], &nn); + nn = (nn+7)/8; + if (pp && nn && (pp[nn-1] & 7)) + log_info ("warning: lower 3 bits of the secret key" + " are not cleared\n"); + } } + xfree (curvestr); } } else |