[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-3-gf3f63ae

[Simon Josefsson]

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 "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=f3f63ae9984190aecc9e7ad9b2831c95ffebead0

The branch, master has been updated
       via  f3f63ae9984190aecc9e7ad9b2831c95ffebead0 (commit)
      from  7ec7262a3e8829a43cd7ee2b8d75a04bac0b4427 (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 f3f63ae9984190aecc9e7ad9b2831c95ffebead0
Author: Simon Josefsson <address@hidden>
Date:   Tue Dec 7 20:42:45 2010 +0100

    C++ fixes, tiny patch from "Brendan Doherty" <address@hidden>.

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

Summary of changes:
 lib/includes/gnutls/crypto.h |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/includes/gnutls/crypto.h b/lib/includes/gnutls/crypto.h
index 072434d..13ddf20 100644
--- a/lib/includes/gnutls/crypto.h
+++ b/lib/includes/gnutls/crypto.h
@@ -25,6 +25,11 @@
 #ifndef GNUTLS_CRYPTO_H
 #define GNUTLS_CRYPTO_H
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 typedef struct cipher_hd_st *gnutls_cipher_hd_t;
 
 int gnutls_cipher_init (gnutls_cipher_hd_t * handle,
@@ -282,17 +287,17 @@ typedef struct gnutls_crypto_pk
    * parameters, depending on the operation */
   int (*encrypt) (gnutls_pk_algorithm_t, gnutls_datum_t * ciphertext,
                  const gnutls_datum_t * plaintext,
-                 const gnutls_pk_params_st * public);
+                 const gnutls_pk_params_st * pub);
   int (*decrypt) (gnutls_pk_algorithm_t, gnutls_datum_t * plaintext,
                  const gnutls_datum_t * ciphertext,
-                 const gnutls_pk_params_st * private);
+                 const gnutls_pk_params_st * priv);
 
   int (*sign) (gnutls_pk_algorithm_t, gnutls_datum_t * signature,
               const gnutls_datum_t * data,
-              const gnutls_pk_params_st * private);
+              const gnutls_pk_params_st * priv);
   int (*verify) (gnutls_pk_algorithm_t, const gnutls_datum_t * data,
                 const gnutls_datum_t * signature,
-                const gnutls_pk_params_st * public);
+                const gnutls_pk_params_st * pub);
 
   int (*generate) (gnutls_pk_algorithm_t, unsigned int nbits,
                   gnutls_pk_params_st *);
@@ -362,4 +367,8 @@ int gnutls_crypto_pk_register2 (int priority, int version,
 int gnutls_crypto_bigint_register2 (int priority, int version,
                                    const gnutls_crypto_bigint_st * s);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif


hooks/post-receive
-- 
GNU gnutls