[git] GCRYPT - branch, master, updated. libgcrypt-1.6.0-263-g73374fd

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU crypto library".

The branch, master has been updated
       via  73374fdd27c7ba28b19f9672c68a6f5b72252fe5 (commit)
      from  3a3d5410cc83f7069c7cb1ab384905f382292d32 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 73374fdd27c7ba28b19f9672c68a6f5b72252fe5
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Oct 13 12:28:00 2015 +0900

    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

diff --git a/cipher/dsa.c b/cipher/dsa.c
index 09cd969..723f690 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;
 
diff --git a/src/g10lib.h b/src/g10lib.h
index 50a08ec..d1f9426 100644
--- a/src/g10lib.h
+++ b/src/g10lib.h
@@ -92,7 +92,7 @@
 
 /*-- src/global.c -*/
 int _gcry_global_is_operational (void);
-gcry_error_t _gcry_vcontrol (enum gcry_ctl_cmds cmd, va_list arg_ptr);
+gcry_err_code_t _gcry_vcontrol (enum gcry_ctl_cmds cmd, va_list arg_ptr);
 void  _gcry_check_heap (const void *a);
 int _gcry_get_debug_flag (unsigned int mask);
 
diff --git a/src/gcrypt-int.h b/src/gcrypt-int.h
index 29d4fd3..ea3c8d5 100644
--- a/src/gcrypt-int.h
+++ b/src/gcrypt-int.h
@@ -329,10 +329,10 @@ void *_gcry_sexp_nth_buffer (const gcry_sexp_t list, int number,
                              size_t *rlength);
 char *_gcry_sexp_nth_string (gcry_sexp_t list, int number);
 gcry_mpi_t _gcry_sexp_nth_mpi (gcry_sexp_t list, int number, int mpifmt);
-gpg_err_code_t _gcry_sexp_extract_param (gcry_sexp_t sexp,
-                                         const char *path,
-                                         const char *list,
-                                         ...) _GCRY_GCC_ATTR_SENTINEL(0);
+gpg_error_t _gcry_sexp_extract_param (gcry_sexp_t sexp,
+                                      const char *path,
+                                      const char *list,
+                                      ...) _GCRY_GCC_ATTR_SENTINEL(0);
 
 #define sexp_new(a, b, c, d)         _gcry_sexp_new ((a), (b), (c), (d))
 #define sexp_create(a, b, c, d, e)   _gcry_sexp_create ((a), (b), (c), (d), (e))
diff --git a/src/visibility.c b/src/visibility.c
index fa23e53..3e1f28b 100644
--- a/src/visibility.c
+++ b/src/visibility.c
@@ -292,7 +292,7 @@ gcry_mpi_copy (const gcry_mpi_t a)
 void
 gcry_mpi_snatch (gcry_mpi_t w, const gcry_mpi_t u)
 {
-  return _gcry_mpi_snatch (w, u);
+  _gcry_mpi_snatch (w, u);
 }
 
 gcry_mpi_t

-----------------------------------------------------------------------

Summary of changes:
 cipher/dsa.c     | 8 +++++---
 src/g10lib.h     | 2 +-
 src/gcrypt-int.h | 8 ++++----
 src/visibility.c | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org


_______________________________________________
Gnupg-commits mailing list
Gnupg-commits at gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits