Use const and pointers to gnutls_datum_t in sign callback.

diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index 61b0b4d62d1b44f2966c452008173c364f9e41ac..801c82cafe32068306f4dc3bee8c42d1c1115f6c 100644 (file)
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -1051,8 +1051,8 @@ extern "C"
   typedef int (*gnutls_sign_func) (gnutls_session_t session,
                                   void *userdata,
                                   gnutls_certificate_type_t cert_type,
-                                  gnutls_datum_t cert,
-                                  const gnutls_datum_t hash,
+                                  const gnutls_datum_t * cert,
+                                  const gnutls_datum_t * hash,
                                   gnutls_datum_t * signature);
 
   void gnutls_sign_callback_set (gnutls_session_t session,

diff --git a/includes/gnutls/x509.h b/includes/gnutls/x509.h
index 8357dc28a6b1ae4b729e405c3fbfbf34d123ed0d..2955f75bf7c4bdb62afc3159c44b81c8c5974e20 100644 (file)
--- a/includes/gnutls/x509.h
+++ b/includes/gnutls/x509.h
@@ -606,8 +606,8 @@ extern "C"
                                   const gnutls_datum_t * signature);
 
   int gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
-                                    const gnutls_datum_t hash,
-                                    gnutls_datum_t *signature);
+                                    const gnutls_datum_t * hash,
+                                    gnutls_datum_t * signature);
 
 
 /* Certificate request stuff.

diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 23a0f3df163af97685edcc80a13b6ad252612949..b22d8a113a475c3fba38cc6b1625562339679725 100644 (file)
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -880,8 +880,8 @@ _gnutls_gcert_deinit (gnutls_cert * cert)
  * typedef int (*gnutls_sign_func) (gnutls_session_t session,
  *                                  void *userdata,
  *                                  gnutls_certificate_type_t cert_type,
- *                                  gnutls_datum_t cert,
- *                                  const gnutls_datum_t hash,
+ *                                  const gnutls_datum_t * cert,
+ *                                  const gnutls_datum_t * hash,
  *                                  gnutls_datum_t * signature);
  *
  * The @userdata parameter is passed to the @sign_func verbatim, and

diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index 1358b767b6360d9c22c912b080ee999614404314..862b08cd542f04fd6102a62aecd71fcb20b6bb94 100644 (file)
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -283,8 +283,8 @@ _gnutls_tls_sign (gnutls_session_t session,
 
       return (*session->internals.sign_func)
        (session, session->internals.sign_func_userdata,
-        cert->cert_type, cert->raw,
-        *hash_concat, signature);
+        cert->cert_type, &cert->raw,
+        hash_concat, signature);
     }
 
   return _gnutls_sign (pkey->pk_algorithm, pkey->params,

diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 504482892cc0b2f001e951fa437b45fb98496bf9..b9273932bf9a1c07ead40a4ed7443aeba680371d 100644 (file)
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -1568,8 +1568,8 @@ gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
  **/
 int
 gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
-                              const gnutls_datum_t hash,
-                              gnutls_datum_t *signature)
+                              const gnutls_datum_t * hash,
+                              gnutls_datum_t * signature)
 {
   int result;
 
@@ -1580,7 +1580,7 @@ gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
     }
 
   result = _gnutls_sign (key->pk_algorithm, key->params,
-                        key->params_size, &hash, signature);
+                        key->params_size, hash, signature);
   if (result < 0)
     {
       gnutls_assert ();

diff --git a/tests/x509signself.c b/tests/x509signself.c
index 45e11aaaef1cef644edbec03013533169ed1878e..b0361f9f7ef22de322fc39f666b26a053ba44513 100644 (file)
--- a/tests/x509signself.c
+++ b/tests/x509signself.c
@@ -134,8 +134,8 @@ int
 sign_func (gnutls_session_t session,
           void *userdata,
           gnutls_certificate_type_t cert_type,
-          gnutls_datum_t cert,
-          const gnutls_datum_t hash,
+          const gnutls_datum_t * cert,
+          const gnutls_datum_t * hash,
           gnutls_datum_t * signature)
 {
   gnutls_x509_privkey_t key;