[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_3_0_13-24-gf9ae61d
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_3_0_13-24-gf9ae61d |
|
Date: |
Mon, 20 Feb 2012 23:53:40 +0000 |
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=f9ae61d13e0915a303b6a69c8729bc6fc7b44088
The branch, master has been updated
via f9ae61d13e0915a303b6a69c8729bc6fc7b44088 (commit)
via 9cdbae48bc09ba6927a924574ce61195f0f75bc8 (commit)
via b6980d07184cbb1315eec992c67adf94ecff3c54 (commit)
via 7caea810423c07ca9a6a0cf13dbcf568199c4d2c (commit)
via 794aef61c09b1e1d8ed27e15e910199f83d23491 (commit)
via 97b1852f88379a29c9f6c92a0b80bdc2747828e9 (commit)
via 1c80b5a09fef3c3dbf675cc38141d7ddd65a0ea2 (commit)
from 7b3e70c11682b84885374eff8d42402540168994 (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 f9ae61d13e0915a303b6a69c8729bc6fc7b44088
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Tue Feb 21 00:58:58 2012 +0100
Always deinitialize.
commit 9cdbae48bc09ba6927a924574ce61195f0f75bc8
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Tue Feb 21 00:34:48 2012 +0100
check _gnutls_auth_cipher_add_auth for error codes.
commit b6980d07184cbb1315eec992c67adf94ecff3c54
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Mon Feb 20 23:54:15 2012 +0100
added reset
commit 7caea810423c07ca9a6a0cf13dbcf568199c4d2c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Mon Feb 20 23:52:32 2012 +0100
hash copy no longer needed.
commit 794aef61c09b1e1d8ed27e15e910199f83d23491
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Mon Feb 20 23:14:43 2012 +0100
initialize memory for siop
commit 97b1852f88379a29c9f6c92a0b80bdc2747828e9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Mon Feb 20 23:10:49 2012 +0100
simplified the _datum functions.
commit 1c80b5a09fef3c3dbf675cc38141d7ddd65a0ea2
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Mon Feb 20 22:52:14 2012 +0100
bumped versions
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
lib/accelerated/cryptodev.c | 40 ++++++++++++++++++++++++++++++++----
lib/accelerated/x86/sha-padlock.c | 23 ---------------------
lib/crypto-backend.h | 1 -
lib/gnutls_cipher.c | 17 ++++++++++++---
lib/gnutls_constate.c | 16 +++++++-------
lib/gnutls_datum.c | 17 +++++++--------
lib/gnutls_datum.h | 14 ++++--------
lib/gnutls_hash_int.c | 19 -----------------
lib/gnutls_hash_int.h | 4 ---
lib/nettle/mac.c | 22 --------------------
lib/openpgp/gnutls_openpgp.c | 4 +--
m4/hooks.m4 | 2 +-
13 files changed, 72 insertions(+), 109 deletions(-)
diff --git a/configure.ac b/configure.ac
index a54988e..2b45265 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl Process this file with autoconf to produce a configure
script.
# USA
AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [3.0.13], address@hidden)
+AC_INIT([GnuTLS], [3.0.14], address@hidden)
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/lib/accelerated/cryptodev.c b/lib/accelerated/cryptodev.c
index ca28d62..4e0f7ac 100644
--- a/lib/accelerated/cryptodev.c
+++ b/lib/accelerated/cryptodev.c
@@ -49,6 +49,7 @@ struct cryptodev_ctx
struct session_op sess;
struct crypt_op cryp;
uint8_t iv[EALG_MAX_BLOCK_LEN];
+ unsigned int hash_reset;
int cfd;
};
@@ -117,6 +118,7 @@ cryptodev_encrypt (void *_ctx, const void *plain, size_t
plainsize,
void *encr, size_t encrsize)
{
struct cryptodev_ctx *ctx = _ctx;
+
ctx->cryp.len = plainsize;
ctx->cryp.src = (void *) plain;
ctx->cryp.dst = encr;
@@ -175,6 +177,8 @@ register_crypto (int cfd)
int ret;
#ifdef CIOCGSESSINFO
struct session_info_op siop;
+
+ memset(&siop, 0, sizeof(siop));
#endif
memset (&sess, 0, sizeof (sess));
@@ -347,7 +351,14 @@ cryptodev_mac_hash (void *_ctx, const void *text, size_t
textsize)
ctx->cryp.src = (void *) text;
ctx->cryp.dst = NULL;
ctx->cryp.op = COP_ENCRYPT;
- ctx->cryp.flags = COP_FLAG_UPDATE;
+
+ if (ctx->hash_reset == 0)
+ ctx->cryp.flags = COP_FLAG_UPDATE;
+ else
+ {
+ ctx->cryp.flags = 0;
+ ctx->hash_reset = 0;
+ }
if (ioctl (ctx->cfd, CIOCCRYPT, &ctx->cryp))
{
gnutls_assert ();
@@ -374,6 +385,14 @@ cryptodev_mac_output (void *_ctx, void *digest, size_t
digestsize)
return 0;
}
+static void
+cryptodev_mac_reset (void *_ctx)
+{
+ struct cryptodev_ctx *ctx = _ctx;
+
+ ctx->hash_reset = 1;
+}
+
static int
cryptodev_mac_fast (gnutls_mac_algorithm_t algo,
const void *key, size_t key_size, const void *text,
@@ -382,6 +401,7 @@ cryptodev_mac_fast (gnutls_mac_algorithm_t algo,
int mac = gnutls_mac_map[algo];
struct session_op sess;
struct crypt_op cryp;
+int ret;
memset(&sess, 0, sizeof(sess));
memset(&cryp, 0, sizeof(cryp));
@@ -402,12 +422,14 @@ struct crypt_op cryp;
cryp.mac = digest;
cryp.op = COP_ENCRYPT;
- if (ioctl (cryptodev_fd, CIOCCRYPT, &cryp))
+ ret = ioctl (cryptodev_fd, CIOCCRYPT, &cryp);
+ ioctl (cryptodev_fd, CIOCFSESSION, &sess.ses);
+
+ if (ret)
{
gnutls_assert ();
return GNUTLS_E_CRYPTODEV_IOCTL_ERROR;
}
- ioctl (cryptodev_fd, CIOCFSESSION, &sess.ses);
return 0;
}
@@ -420,6 +442,7 @@ static const gnutls_crypto_mac_st mac_struct = {
.hash = cryptodev_mac_hash,
.output = cryptodev_mac_output,
.deinit = cryptodev_mac_deinit,
+ .reset = cryptodev_mac_reset,
.fast = cryptodev_mac_fast
};
@@ -464,6 +487,7 @@ cryptodev_digest_init (gnutls_digest_algorithm_t algorithm,
void **_ctx)
#define cryptodev_digest_hash cryptodev_mac_hash
#define cryptodev_digest_output cryptodev_mac_output
+#define cryptodev_digest_reset cryptodev_mac_reset
static int
cryptodev_digest_fast (gnutls_digest_algorithm_t algo,
@@ -473,6 +497,7 @@ cryptodev_digest_fast (gnutls_digest_algorithm_t algo,
int dig = gnutls_digest_map[algo];
struct session_op sess;
struct crypt_op cryp;
+int ret;
memset(&sess, 0, sizeof(sess));
memset(&cryp, 0, sizeof(cryp));
@@ -490,12 +515,14 @@ struct crypt_op cryp;
cryp.mac = digest;
cryp.op = COP_ENCRYPT;
- if (ioctl (cryptodev_fd, CIOCCRYPT, &cryp))
+ ret = ioctl (cryptodev_fd, CIOCCRYPT, &cryp);
+ ioctl (cryptodev_fd, CIOCFSESSION, &sess.ses);
+
+ if (ret)
{
gnutls_assert ();
return GNUTLS_E_CRYPTODEV_IOCTL_ERROR;
}
- ioctl (cryptodev_fd, CIOCFSESSION, &sess.ses);
return 0;
}
@@ -507,6 +534,7 @@ static const gnutls_crypto_digest_st digest_struct = {
.hash = cryptodev_digest_hash,
.output = cryptodev_digest_output,
.deinit = cryptodev_digest_deinit,
+ .reset = cryptodev_digest_reset,
.fast = cryptodev_digest_fast
};
@@ -519,6 +547,8 @@ register_mac_digest (int cfd)
int ret;
#ifdef CIOCGSESSINFO
struct session_info_op siop;
+
+ memset(&siop, 0, sizeof(siop));
#endif
memset (&sess, 0, sizeof (sess));
diff --git a/lib/accelerated/x86/sha-padlock.c
b/lib/accelerated/x86/sha-padlock.c
index ddb74cf..44f3a43 100644
--- a/lib/accelerated/x86/sha-padlock.c
+++ b/lib/accelerated/x86/sha-padlock.c
@@ -299,28 +299,6 @@ wrap_padlock_hash_init (gnutls_digest_algorithm_t algo,
void **_ctx)
}
static int
-wrap_padlock_hash_copy (void **bhd, void *ahd)
-{
- struct padlock_hash_ctx *ctx = ahd;
- struct padlock_hash_ctx *dst_ctx;
- int ret;
-
- ret = wrap_padlock_hash_init (ctx->algo, bhd);
- if (ret < 0)
- {
- gnutls_assert ();
- return ret;
- }
-
- dst_ctx = *bhd;
-
- memcpy (&dst_ctx->ctx, &ctx->ctx, sizeof (ctx->ctx));
-
- return 0;
-}
-
-
-static int
wrap_padlock_hash_output (void *src_ctx, void *digest, size_t digestsize)
{
struct padlock_hash_ctx *ctx;
@@ -406,7 +384,6 @@ const gnutls_crypto_digest_st sha_padlock_nano_struct = {
.init = wrap_padlock_hash_init,
.hash = wrap_padlock_hash_update,
.reset = wrap_padlock_hash_reset,
- .copy = wrap_padlock_hash_copy,
.output = wrap_padlock_hash_output,
.deinit = wrap_padlock_hash_deinit,
.fast = wrap_padlock_hash_fast,
diff --git a/lib/crypto-backend.h b/lib/crypto-backend.h
index a05359d..1044f00 100644
--- a/lib/crypto-backend.h
+++ b/lib/crypto-backend.h
@@ -67,7 +67,6 @@
int (*init) (gnutls_digest_algorithm_t, void **ctx);
void (*reset) (void *ctx);
int (*hash) (void *ctx, const void *src, size_t srcsize);
- int (*copy) (void **dst_ctx, void *src_ctx);
int (*output) (void *src_ctx, void *digest, size_t digestsize);
void (*deinit) (void *ctx);
int (*fast)(gnutls_digest_algorithm_t, const void *src, size_t srcsize,
void *digest);
diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
index 2b66103..cd1d96b 100644
--- a/lib/gnutls_cipher.c
+++ b/lib/gnutls_cipher.c
@@ -409,7 +409,9 @@ compressed_to_ciphertext (gnutls_session_t session,
}
/* add the authenticate data */
- _gnutls_auth_cipher_add_auth(¶ms->write.cipher_state, preamble,
preamble_size);
+ ret = _gnutls_auth_cipher_add_auth(¶ms->write.cipher_state, preamble,
preamble_size);
+ if (ret < 0)
+ return gnutls_assert_val(ret);
/* Actual encryption (inplace).
*/
@@ -493,7 +495,9 @@ ciphertext_to_compressed (gnutls_session_t session,
make_preamble (UINT64DATA(*sequence), type,
length, ver, preamble);
- _gnutls_auth_cipher_add_auth (¶ms->read.cipher_state, preamble,
preamble_size);
+ ret = _gnutls_auth_cipher_add_auth (¶ms->read.cipher_state,
preamble, preamble_size);
+ if (ret < 0)
+ return gnutls_assert_val(ret);
if ((ret =
_gnutls_auth_cipher_decrypt (¶ms->read.cipher_state,
@@ -573,8 +577,13 @@ ciphertext_to_compressed (gnutls_session_t session,
preamble_size =
make_preamble (UINT64DATA(*sequence), type,
length, ver, preamble);
- _gnutls_auth_cipher_add_auth (¶ms->read.cipher_state, preamble,
preamble_size);
- _gnutls_auth_cipher_add_auth (¶ms->read.cipher_state,
ciphertext->data, length);
+ ret = _gnutls_auth_cipher_add_auth (¶ms->read.cipher_state,
preamble, preamble_size);
+ if (ret < 0)
+ return gnutls_assert_val(ret);
+
+ ret = _gnutls_auth_cipher_add_auth (¶ms->read.cipher_state,
ciphertext->data, length);
+ if (ret < 0)
+ return gnutls_assert_val(ret);
break;
default:
diff --git a/lib/gnutls_constate.c b/lib/gnutls_constate.c
index deac62d..7303010 100644
--- a/lib/gnutls_constate.c
+++ b/lib/gnutls_constate.c
@@ -121,13 +121,13 @@ _gnutls_set_keys (gnutls_session_t session,
record_parameters_st * params,
if (hash_size > 0)
{
- if (_gnutls_sset_datum
+ if (_gnutls_set_datum
(&client_write->mac_secret, &key_block[pos], hash_size) < 0)
return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR);
pos += hash_size;
- if (_gnutls_sset_datum
+ if (_gnutls_set_datum
(&server_write->mac_secret, &key_block[pos], hash_size) < 0)
return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR);
@@ -211,7 +211,7 @@ _gnutls_set_keys (gnutls_session_t session,
record_parameters_st * params,
pos += key_size;
}
- if (_gnutls_sset_datum
+ if (_gnutls_set_datum
(&client_write->key, client_write_key, client_write_key_size) < 0)
return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR);
@@ -221,7 +221,7 @@ _gnutls_set_keys (gnutls_session_t session,
record_parameters_st * params,
client_write_key_size, buf,
sizeof (buf), NULL));
- if (_gnutls_sset_datum
+ if (_gnutls_set_datum
(&server_write->key, server_write_key, server_write_key_size) < 0)
return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR);
@@ -238,13 +238,13 @@ _gnutls_set_keys (gnutls_session_t session,
record_parameters_st * params,
*/
if (IV_size > 0 && export_flag == 0)
{
- if (_gnutls_sset_datum
+ if (_gnutls_set_datum
(&client_write->IV, &key_block[pos], IV_size) < 0)
return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR);
pos += IV_size;
- if (_gnutls_sset_datum
+ if (_gnutls_set_datum
(&server_write->IV, &key_block[pos], IV_size) < 0)
return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR);
@@ -280,10 +280,10 @@ _gnutls_set_keys (gnutls_session_t session,
record_parameters_st * params,
if (ret < 0)
return gnutls_assert_val (ret);
- if (_gnutls_sset_datum (&client_write->IV, iv_block, IV_size) < 0)
+ if (_gnutls_set_datum (&client_write->IV, iv_block, IV_size) < 0)
return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR);
- if (_gnutls_sset_datum
+ if (_gnutls_set_datum
(&server_write->IV, &iv_block[IV_size], IV_size) < 0)
return gnutls_assert_val (GNUTLS_E_MEMORY_ERROR);
}
diff --git a/lib/gnutls_datum.c b/lib/gnutls_datum.c
index 25d459f..9a6d55d 100644
--- a/lib/gnutls_datum.c
+++ b/lib/gnutls_datum.c
@@ -65,8 +65,8 @@ _gnutls_write_datum8 (uint8_t * dest, gnutls_datum_t dat)
int
-_gnutls_set_datum_m (gnutls_datum_t * dat, const void *data,
- size_t data_size, gnutls_alloc_function galloc_func)
+_gnutls_set_datum (gnutls_datum_t * dat, const void *data,
+ size_t data_size)
{
if (data_size == 0 || data == NULL)
{
@@ -75,7 +75,7 @@ _gnutls_set_datum_m (gnutls_datum_t * dat, const void *data,
return 0;
}
- dat->data = galloc_func (data_size);
+ dat->data = gnutls_malloc (data_size);
if (dat->data == NULL)
return GNUTLS_E_MEMORY_ERROR;
@@ -86,12 +86,11 @@ _gnutls_set_datum_m (gnutls_datum_t * dat, const void *data,
}
int
-_gnutls_datum_append_m (gnutls_datum_t * dst, const void *data,
- size_t data_size,
- gnutls_realloc_function grealloc_func)
+_gnutls_datum_append (gnutls_datum_t * dst, const void *data,
+ size_t data_size)
{
- dst->data = grealloc_func (dst->data, data_size + dst->size);
+ dst->data = gnutls_realloc (dst->data, data_size + dst->size);
if (dst->data == NULL)
return GNUTLS_E_MEMORY_ERROR;
@@ -102,10 +101,10 @@ _gnutls_datum_append_m (gnutls_datum_t * dst, const void
*data,
}
void
-_gnutls_free_datum_m (gnutls_datum_t * dat, gnutls_free_function gfree_func)
+_gnutls_free_datum (gnutls_datum_t * dat)
{
if (dat->data != NULL)
- gfree_func (dat->data);
+ gnutls_free (dat->data);
dat->data = NULL;
dat->size = 0;
diff --git a/lib/gnutls_datum.h b/lib/gnutls_datum.h
index 775a5ca..bf8e650 100644
--- a/lib/gnutls_datum.h
+++ b/lib/gnutls_datum.h
@@ -28,16 +28,12 @@ void _gnutls_write_datum24 (uint8_t * dest, gnutls_datum_t
dat);
void _gnutls_write_datum32 (uint8_t * dest, gnutls_datum_t dat);
void _gnutls_write_datum8 (uint8_t * dest, gnutls_datum_t dat);
-int _gnutls_set_datum_m (gnutls_datum_t * dat, const void *data,
- size_t data_size, gnutls_alloc_function);
-#define _gnutls_set_datum( x, y, z) _gnutls_set_datum_m(x,y,z, gnutls_malloc)
-#define _gnutls_sset_datum( x, y, z) _gnutls_set_datum_m(x,y,z,
gnutls_secure_malloc)
+int _gnutls_set_datum (gnutls_datum_t * dat, const void *data,
+ size_t data_size);
-int _gnutls_datum_append_m (gnutls_datum_t * dat, const void *data,
- size_t data_size, gnutls_realloc_function);
-#define _gnutls_datum_append(x,y,z) _gnutls_datum_append_m(x,y,z,
gnutls_realloc)
+int _gnutls_datum_append (gnutls_datum_t * dat, const void *data,
+ size_t data_size);
-void _gnutls_free_datum_m (gnutls_datum_t * dat, gnutls_free_function);
-#define _gnutls_free_datum(x) _gnutls_free_datum_m(x, gnutls_free)
+void _gnutls_free_datum (gnutls_datum_t * dat);
#endif
diff --git a/lib/gnutls_hash_int.c b/lib/gnutls_hash_int.c
index 277d21d..543369e 100644
--- a/lib/gnutls_hash_int.c
+++ b/lib/gnutls_hash_int.c
@@ -77,7 +77,6 @@ _gnutls_hash_init (digest_hd_st * dig,
gnutls_digest_algorithm_t algorithm)
}
dig->hash = cc->hash;
- dig->copy = cc->copy;
dig->reset = cc->reset;
dig->output = cc->output;
dig->deinit = cc->deinit;
@@ -93,7 +92,6 @@ _gnutls_hash_init (digest_hd_st * dig,
gnutls_digest_algorithm_t algorithm)
}
dig->hash = _gnutls_digest_ops.hash;
- dig->copy = _gnutls_digest_ops.copy;
dig->reset = _gnutls_digest_ops.reset;
dig->output = _gnutls_digest_ops.output;
dig->deinit = _gnutls_digest_ops.deinit;
@@ -125,23 +123,6 @@ _gnutls_hash_get_algo_len (gnutls_digest_algorithm_t
algorithm)
}
int
-_gnutls_hash_copy (digest_hd_st * dst, digest_hd_st * src)
-{
-
- memset (dst, 0, sizeof (*dst));
- dst->algorithm = src->algorithm;
-
- dst->hash = src->hash;
- dst->copy = src->copy;
- dst->output = src->output;
- dst->deinit = src->deinit;
-
- return src->copy (&dst->handle, src->handle);
-}
-
-
-
-int
_gnutls_hash_fast (gnutls_digest_algorithm_t algorithm,
const void *text, size_t textlen, void *digest)
{
diff --git a/lib/gnutls_hash_int.h b/lib/gnutls_hash_int.h
index 40a4f3d..565d6a6 100644
--- a/lib/gnutls_hash_int.h
+++ b/lib/gnutls_hash_int.h
@@ -37,7 +37,6 @@ extern int crypto_digest_prio;
extern gnutls_crypto_digest_st _gnutls_digest_ops;
typedef int (*hash_func) (void *handle, const void *text, size_t size);
-typedef int (*copy_func) (void **dst_ctx, void *src_ctx);
typedef void (*reset_func) (void *ctx);
typedef int (*output_func) (void *src_ctx, void *digest, size_t digestsize);
typedef void (*deinit_func) (void *handle);
@@ -49,7 +48,6 @@ typedef struct
int keysize;
hash_func hash;
- copy_func copy;
reset_func reset;
output_func output;
deinit_func deinit;
@@ -169,8 +167,6 @@ void _gnutls_mac_reset_ssl3 (digest_hd_st * handle);
int _gnutls_mac_deinit_ssl3_handshake (digest_hd_st * handle, void *digest,
uint8_t * key, uint32_t key_size);
-int _gnutls_hash_copy (digest_hd_st * dst_handle, digest_hd_st * src_handle);
-
inline static int IS_SHA(gnutls_digest_algorithm_t algo)
{
if (algo == GNUTLS_DIG_SHA1 || algo == GNUTLS_DIG_SHA224 ||
diff --git a/lib/nettle/mac.c b/lib/nettle/mac.c
index 52e63b4..acaacf4 100644
--- a/lib/nettle/mac.c
+++ b/lib/nettle/mac.c
@@ -268,27 +268,6 @@ wrap_nettle_hash_update (void *_ctx, const void *text,
size_t textsize)
return GNUTLS_E_SUCCESS;
}
-static int
-wrap_nettle_hash_copy (void **bhd, void *ahd)
-{
- struct nettle_hash_ctx *ctx = ahd;
- struct nettle_hash_ctx *dst_ctx;
- int ret;
-
- ret = wrap_nettle_hash_init (ctx->algo, bhd);
- if (ret < 0)
- {
- gnutls_assert ();
- return ret;
- }
-
- dst_ctx = *bhd;
-
- memcpy (&dst_ctx->ctx, &ctx->ctx, sizeof (ctx->ctx));
-
- return 0;
-}
-
static void
wrap_nettle_hash_deinit (void *hd)
{
@@ -459,7 +438,6 @@ gnutls_crypto_digest_st _gnutls_digest_ops = {
.init = wrap_nettle_hash_init,
.hash = wrap_nettle_hash_update,
.reset = wrap_nettle_hash_reset,
- .copy = wrap_nettle_hash_copy,
.output = wrap_nettle_hash_output,
.deinit = wrap_nettle_hash_deinit,
.fast = wrap_nettle_hash_fast,
diff --git a/lib/openpgp/gnutls_openpgp.c b/lib/openpgp/gnutls_openpgp.c
index b6cc797..7065bf2 100644
--- a/lib/openpgp/gnutls_openpgp.c
+++ b/lib/openpgp/gnutls_openpgp.c
@@ -34,8 +34,6 @@
#include <stdio.h>
#include <sys/stat.h>
-#define datum_append(x, y, z) _gnutls_datum_append_m (x, y, z, gnutls_realloc)
-
/* Map an OpenCDK error type to a GnuTLS error type. */
int
_gnutls_map_cdk_rc (int rc)
@@ -236,7 +234,7 @@ gnutls_openpgp_get_key (gnutls_datum_t * key,
to call the function twice. */
rc = cdk_kbnode_write_to_mem_alloc (knode, &buf, &len);
if (!rc)
- datum_append (key, buf, len);
+ _gnutls_datum_append (key, buf, len);
gnutls_free (buf);
leave:
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index 09b6500..6c5139f 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -40,7 +40,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
# Interfaces added: AGE++
# Interfaces removed: AGE=0
AC_SUBST(LT_CURRENT, 34)
- AC_SUBST(LT_REVISION, 0)
+ AC_SUBST(LT_REVISION, 1)
AC_SUBST(LT_AGE, 6)
AC_SUBST(LT_SSL_CURRENT, 27)
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_3_0_13-24-gf9ae61d,
Nikos Mavrogiannopoulos <=