summaryrefslogtreecommitdiff
path: root/libextra
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2009-12-05 11:47:33 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2009-12-05 11:47:33 +0200
commit0d3a8537747e8460459a9a97a6f68c1510a65c1f (patch)
treec17cfe798503679e703cad8eb235dfde38287f62 /libextra
parente64d8f55e46fe0638191e1c01f6bde303753d91b (diff)
downloadgnutls-0d3a8537747e8460459a9a97a6f68c1510a65c1f.tar.gz
Reverted all previous changes to combine hashes with MAC algorithms.
It is now permissible to register a hash algorithm separately from a MAC.
Diffstat (limited to 'libextra')
-rw-r--r--libextra/fipsmd5.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libextra/fipsmd5.c b/libextra/fipsmd5.c
index 43939c82b1..2bf319f324 100644
--- a/libextra/fipsmd5.c
+++ b/libextra/fipsmd5.c
@@ -28,7 +28,7 @@
#include <hmac.h>
static int
-md5init (void **ctx)
+md5init (gnutls_mac_algorithm_t mac, void **ctx)
{
*ctx = gnutls_malloc (sizeof (struct md5_ctx));
if (!*ctx)
@@ -78,7 +78,7 @@ struct hmacctx
};
static int
-hmacmd5init (void **ctx)
+hmacmd5init (gnutls_mac_algorithm_t mac, void **ctx)
{
struct hmacctx *p;
@@ -195,7 +195,7 @@ hmacmd5deinit (void *ctx)
gnutls_free (p);
}
-static gnutls_crypto_single_digest_st dig = {
+static gnutls_crypto_digest_st dig = {
md5init,
NULL,
md5hash,
@@ -204,7 +204,7 @@ static gnutls_crypto_single_digest_st dig = {
md5deinit
};
-static gnutls_crypto_single_mac_st mac = {
+static gnutls_crypto_mac_st mac = {
hmacmd5init,
hmacmd5setkey,
hmacmd5hash,