From 73374fdd27c7ba28b19f9672c68a6f5b72252fe5 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 13 Oct 2015 12:28:00 +0900 Subject: Fix declaration of return type. * src/gcrypt-int.h (_gcry_sexp_extract_param): Return gpg_error_t. * cipher/dsa.c (dsa_generate): Fix call to _gcry_sexp_extract_param. * src/g10lib.h (_gcry_vcontrol): Return gcry_err_code_t. * src/visibility.c (gcry_mpi_snatch): Fix call to _gcry_mpi_snatch. -- GnuPG-bug-id: 2074 --- cipher/dsa.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'cipher/dsa.c') diff --git a/cipher/dsa.c b/cipher/dsa.c index 09cd9693..723f6909 100644 --- a/cipher/dsa.c +++ b/cipher/dsa.c @@ -968,12 +968,14 @@ dsa_generate (const gcry_sexp_t genparms, gcry_sexp_t *r_skey) static gcry_err_code_t dsa_check_secret_key (gcry_sexp_t keyparms) { + gcry_error_t err; gcry_err_code_t rc; DSA_secret_key sk = {NULL, NULL, NULL, NULL, NULL}; - rc = _gcry_sexp_extract_param (keyparms, NULL, "pqgyx", - &sk.p, &sk.q, &sk.g, &sk.y, &sk.x, - NULL); + err = _gcry_sexp_extract_param (keyparms, NULL, "pqgyx", + &sk.p, &sk.q, &sk.g, &sk.y, &sk.x, + NULL); + rc = gpg_err_code (err); if (rc) goto leave; -- cgit v1.2.1