diff options
| author | NIIBE Yutaka <[email protected]> | 2014-04-28 01:36:16 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2014-04-28 01:36:16 +0000 |
| commit | 21dab64030c95a909767bf6d8f99e8476f9df8a2 (patch) | |
| tree | 78338ccea643a67aadb268d96980e4e917ef5360 /g10/pubkey-enc.c | |
| parent | gpg: Pass --homedir to gpg-agent. (diff) | |
| download | gnupg-21dab64030c95a909767bf6d8f99e8476f9df8a2.tar.gz gnupg-21dab64030c95a909767bf6d8f99e8476f9df8a2.zip | |
ECC Fixes.
* agent/cvt-openpgp.c (get_keygrip, convert_secret_key)
(convert_transfer_key): Follow newer (>= 1.6) libgcrypt API, which
does not distinguish the detail.
(do_unprotect, convert_from_openpgp_main): Don't call
map_pk_openpgp_to_gcry, as it's the value of libgcrypt API already and
not the value defined by OpenPGP.
(convert_to_openpgp): It's "ecc".
* agent/gpg-agent.c (map_pk_openpgp_to_gcry): Remove.
* g10/call-agent.c (agent_pkdecrypt): Fix off-by-one error.
* g10/pubkey-enc.c (get_it): Fix swapping the fields error.
Diffstat (limited to 'g10/pubkey-enc.c')
| -rw-r--r-- | g10/pubkey-enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c index a563ec0bf..60f761130 100644 --- a/g10/pubkey-enc.c +++ b/g10/pubkey-enc.c @@ -185,7 +185,7 @@ get_it (PKT_pubkey_enc *enc, DEK *dek, PKT_public_key *sk, u32 *keyid) err = gpg_error (GPG_ERR_BAD_MPI); else err = gcry_sexp_build (&s_data, NULL, "(enc-val(ecdh(s%m)(e%m)))", - enc->data[0], enc->data[1]); + enc->data[1], enc->data[0]); } else err = gpg_error (GPG_ERR_BUG); |