diff options
| author | Werner Koch <wk@gnupg.org> | 2013-10-16 16:20:56 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-10-16 16:20:56 +0200 |
| commit | a329b6abf00c990faf1986f9fbad7b4d71c13bcb (patch) | |
| tree | 52b1f995cbc863404fb8a01005f3d17c29706655 /cipher/ecc-curves.c | |
| parent | 45aa6131e93fac89d46733b3436d960f35fb99b2 (diff) | |
| download | libgcrypt-a329b6abf00c990faf1986f9fbad7b4d71c13bcb.tar.gz | |
sexp: Add function gcry_sexp_extract_param.
* src/gcrypt.h.in (_GCRY_GCC_ATTR_SENTINEL): New.
(gcry_sexp_extract_param): New.
* src/visibility.c (gcry_sexp_extract_param): New.
* src/visibility.h (gcry_sexp_extract_param): Add hack to detect
internal use.
* cipher/pubkey-util.c (_gcry_pk_util_extract_mpis): Move and split
into ...
* src/sexp.c (_gcry_sexp_vextract_param)
(_gcry_sexp_extract_param): this. Change all callers. Add support for buffer
descriptors and a path option/
* tests/tsexp.c (die, hex2buffer, hex2mpi, hex2mpiopa): New.
(cmp_mpihex, cmp_bufhex): New.
(check_extract_param): New.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'cipher/ecc-curves.c')
| -rw-r--r-- | cipher/ecc-curves.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cipher/ecc-curves.c b/cipher/ecc-curves.c index 53433a2c..2cdb9b4d 100644 --- a/cipher/ecc-curves.c +++ b/cipher/ecc-curves.c @@ -436,9 +436,9 @@ _gcry_ecc_get_curve (gcry_sexp_t keyparms, int iterator, unsigned int *r_nbits) /* * Extract the curve parameters.. */ - if (_gcry_pk_util_extract_mpis (keyparms, "-pabgn", - &E.p, &E.a, &E.b, &mpi_g, &E.n, - NULL)) + if (_gcry_sexp_extract_param (keyparms, NULL, "-pabgn", + &E.p, &E.a, &E.b, &mpi_g, &E.n, + NULL)) goto leave; if (mpi_g) { |