mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-04 20:38:50 +01:00
b203325ce1
* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Factor extraction
part out to ...
(extract_secret_x): new. Allow for x-only coordinate.
(pk_ecdh_encrypt_with_shared_point): Change arg shared_mpi
to (shared,nshared). Move param check to the top. Add extra safety
check.
(pk_ecdh_decrypt): Adjust for change.
* g10/pkglue.c (get_data_from_sexp): New.
(pk_encrypt): Use it for "s" and adjusted for changed
pk_ecdh_encrypt_with_shared_point.
* g10/pubkey-enc.c (get_it): Remove conversion to an MPI and call
pk_ecdh_decrypt with the frame buffer.
--
Backported-from-master: f129b0e977)
Signed-off-by: Werner Koch <wk@gnupg.org>
52 lines
2.0 KiB
C
52 lines
2.0 KiB
C
/* pkglue.h - public key operations definitions
|
|
* Copyright (C) 2003, 2010 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef GNUPG_G10_PKGLUE_H
|
|
#define GNUPG_G10_PKGLUE_H
|
|
|
|
#include "packet.h" /* For PKT_public_key. */
|
|
|
|
/*-- pkglue.c --*/
|
|
gcry_mpi_t get_mpi_from_sexp (gcry_sexp_t sexp, const char *item, int mpifmt);
|
|
|
|
int pk_verify (pubkey_algo_t algo, gcry_mpi_t hash, gcry_mpi_t *data,
|
|
gcry_mpi_t *pkey);
|
|
int pk_encrypt (pubkey_algo_t algo, gcry_mpi_t *resarr, gcry_mpi_t data,
|
|
PKT_public_key *pk, gcry_mpi_t *pkey);
|
|
int pk_check_secret_key (pubkey_algo_t algo, gcry_mpi_t *skey);
|
|
|
|
|
|
/*-- ecdh.c --*/
|
|
gcry_mpi_t pk_ecdh_default_params (unsigned int qbits);
|
|
gpg_error_t pk_ecdh_generate_ephemeral_key (gcry_mpi_t *pkey, gcry_mpi_t *r_k);
|
|
gpg_error_t pk_ecdh_encrypt_with_shared_point
|
|
/* */ (int is_encrypt, const char *shared, size_t nshared,
|
|
const byte pk_fp[MAX_FINGERPRINT_LEN],
|
|
gcry_mpi_t data, gcry_mpi_t *pkey,
|
|
gcry_mpi_t *out);
|
|
|
|
int pk_ecdh_encrypt (gcry_mpi_t *resarr, const byte pk_fp[MAX_FINGERPRINT_LEN],
|
|
gcry_mpi_t data, gcry_mpi_t * pkey);
|
|
int pk_ecdh_decrypt (gcry_mpi_t *result, const byte sk_fp[MAX_FINGERPRINT_LEN],
|
|
gcry_mpi_t data, const char *shared, size_t nshared,
|
|
gcry_mpi_t *skey);
|
|
|
|
|
|
#endif /*GNUPG_G10_PKGLUE_H*/
|