From 13e3f4d6d9d9c48a270a1a18a92e57a56f0a7059 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Thu, 24 Feb 2000 11:07:16 +0000
Subject: Vendor import of Heimdal 0.2n
---
crypto/heimdal/lib/gssapi/get_mic.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
(limited to 'crypto/heimdal/lib/gssapi/get_mic.c')
diff --git a/crypto/heimdal/lib/gssapi/get_mic.c b/crypto/heimdal/lib/gssapi/get_mic.c
index 2b779c798e49..8dd1b6f9a1e7 100644
--- a/crypto/heimdal/lib/gssapi/get_mic.c
+++ b/crypto/heimdal/lib/gssapi/get_mic.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 1998 Kungliga Tekniska H�gskolan
+ * Copyright (c) 1997 - 2000 Kungliga Tekniska H�gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -33,7 +33,7 @@
#include "gssapi_locl.h"
-RCSID("$Id: get_mic.c,v 1.9 1999/12/02 17:05:03 joda Exp $");
+RCSID("$Id: get_mic.c,v 1.11 2000/01/25 23:19:22 assar Exp $");
OM_uint32 gss_get_mic
(OM_uint32 * minor_status,
@@ -44,7 +44,7 @@ OM_uint32 gss_get_mic
)
{
u_char *p;
- struct md5 md5;
+ MD5_CTX md5;
u_char hash[16];
des_key_schedule schedule;
des_cblock key;
@@ -73,17 +73,17 @@ OM_uint32 gss_get_mic
p += 16;
/* checksum */
- md5_init (&md5);
- md5_update (&md5, p - 24, 8);
- md5_update (&md5, message_buffer->value,
- message_buffer->length);
- md5_finito (&md5, hash);
+ MD5Init (&md5);
+ MD5Update (&md5, p - 24, 8);
+ MD5Update (&md5, message_buffer->value,
+ message_buffer->length);
+ MD5Final (hash, &md5);
memset (&zero, 0, sizeof(zero));
gss_krb5_getsomekey(context_handle, &key);
des_set_key (&key, schedule);
- des_cbc_cksum ((des_cblock *)hash,
- (des_cblock *)hash, sizeof(hash), schedule, &zero);
+ des_cbc_cksum ((const void *)hash, (void *)hash, sizeof(hash),
+ schedule, &zero);
memcpy (p - 8, hash, 8);
/* sequence number */
@@ -101,7 +101,7 @@ OM_uint32 gss_get_mic
4);
des_set_key (&key, schedule);
- des_cbc_encrypt ((des_cblock *)p, (des_cblock *)p, 8,
+ des_cbc_encrypt ((const void *)p, (void *)p, 8,
schedule, (des_cblock *)(p + 8), DES_ENCRYPT);
krb5_auth_setlocalseqnumber (gssapi_krb5_context,
--
cgit v1.2.3