summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2007-08-12 10:49:31 +0200
committerSimon Josefsson <simon@josefsson.org>2007-08-12 10:49:31 +0200
commit33847ff6e41daeb269ba756def4d3316e0cef417 (patch)
treee9b2fef6a65a74cca41c1d4ef4d6f73592a8501c
parent071e52c20326fa26664faaf877751c9205180f53 (diff)
downloadgnutls-33847ff6e41daeb269ba756def4d3316e0cef417.tar.gz
Use const and pointers to gnutls_datum_t in sign callback.
-rw-r--r--includes/gnutls/gnutls.h.in4
-rw-r--r--includes/gnutls/x509.h4
-rw-r--r--lib/gnutls_cert.c4
-rw-r--r--lib/gnutls_sig.c4
-rw-r--r--lib/x509/privkey.c6
-rw-r--r--tests/x509signself.c4
6 files changed, 13 insertions, 13 deletions
diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index 61b0b4d62d..801c82cafe 100644
--- 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 8357dc28a6..2955f75bf7 100644
--- 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 23a0f3df16..b22d8a113a 100644
--- 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 1358b767b6..862b08cd54 100644
--- 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 504482892c..b9273932bf 100644
--- 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 45e11aaaef..b0361f9f7e 100644
--- 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;