diff --git a/lib/gssapi/get_mic.c b/lib/gssapi/get_mic.c
index c435c4f1b..2d1da4e07 100644
--- a/lib/gssapi/get_mic.c
+++ b/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. 
  *
@@ -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, (viod *)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,
diff --git a/lib/gssapi/krb5/get_mic.c b/lib/gssapi/krb5/get_mic.c
index c435c4f1b..2d1da4e07 100644
--- a/lib/gssapi/krb5/get_mic.c
+++ b/lib/gssapi/krb5/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. 
  *
@@ -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, (viod *)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,
diff --git a/lib/gssapi/krb5/unwrap.c b/lib/gssapi/krb5/unwrap.c
index f36bce52b..65c52bce4 100644
--- a/lib/gssapi/krb5/unwrap.c
+++ b/lib/gssapi/krb5/unwrap.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. 
  *
@@ -70,7 +70,7 @@ OM_uint32 gss_unwrap
 {
   u_char *p, *pad;
   size_t len;
-  struct md5 md5;
+  MD5_CTX md5;
   u_char hash[16], seq_data[8];
   des_key_schedule schedule;
   des_cblock key;
@@ -114,8 +114,8 @@ OM_uint32 gss_unwrap
 	  key[i] ^= 0xf0;
       des_set_key (&key, schedule);
       memset (&zero, 0, sizeof(zero));
-      des_cbc_encrypt ((des_cblock *)p,
-		       (des_cblock *)p,
+      des_cbc_encrypt ((const void *)p,
+		       (void *)p,
 		       input_message_buffer->length - len,
 		       schedule,
 		       &zero,
@@ -134,16 +134,16 @@ OM_uint32 gss_unwrap
   if (i != 0)
     return GSS_S_BAD_MIC;
 
-  md5_init (&md5);
-  md5_update (&md5, p - 24, 8);
-  md5_update (&md5, p, input_message_buffer->length - len);
-  md5_finito (&md5, hash);
+  MD5Init (&md5);
+  MD5Update (&md5, p - 24, 8);
+  MD5Update (&md5, p, input_message_buffer->length - len);
+  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);
   if (memcmp (p - 8, hash, 8) != 0)
     return GSS_S_BAD_MIC;
 
@@ -162,7 +162,7 @@ OM_uint32 gss_unwrap
 
   p -= 16;
   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 *)hash, DES_DECRYPT);
 
   memset (key, 0, sizeof(key));
diff --git a/lib/gssapi/krb5/verify_mic.c b/lib/gssapi/krb5/verify_mic.c
index ef1c6c4f8..86f410c3e 100644
--- a/lib/gssapi/krb5/verify_mic.c
+++ b/lib/gssapi/krb5/verify_mic.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -44,7 +44,7 @@ OM_uint32 gss_verify_mic
 	    )
 {
   u_char *p;
-  struct md5 md5;
+  MD5_CTX md5;
   u_char hash[16], seq_data[8];
   des_key_schedule schedule;
   des_cblock key;
@@ -68,11 +68,11 @@ OM_uint32 gss_verify_mic
   p += 16;
 
   /* verify 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));
 #if 0
@@ -83,8 +83,8 @@ OM_uint32 gss_verify_mic
 	  sizeof(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);
   if (memcmp (p - 8, hash, 8) != 0) {
     memset (key, 0, sizeof(key));
     memset (schedule, 0, sizeof(schedule));
@@ -106,7 +106,7 @@ OM_uint32 gss_verify_mic
 
   p -= 16;
   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 *)hash, DES_DECRYPT);
 
   memset (key, 0, sizeof(key));
diff --git a/lib/gssapi/krb5/wrap.c b/lib/gssapi/krb5/wrap.c
index 8a7403262..317498840 100644
--- a/lib/gssapi/krb5/wrap.c
+++ b/lib/gssapi/krb5/wrap.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. 
  *
@@ -63,7 +63,7 @@ OM_uint32 gss_wrap
            )
 {
   u_char *p;
-  struct md5 md5;
+  MD5_CTX md5;
   u_char hash[16];
   des_key_schedule schedule;
   des_cblock key;
@@ -110,16 +110,16 @@ OM_uint32 gss_wrap
   memset (p + 8 + input_message_buffer->length, padlength, padlength);
 
   /* checksum */
-  md5_init (&md5);
-  md5_update (&md5, p - 24, 8);
-  md5_update (&md5, p, input_message_buffer->length + padlength + 8);
-  md5_finito (&md5, hash);
+  MD5Init (&md5);
+  MD5Update (&md5, p - 24, 8);
+  MD5Update (&md5, p, input_message_buffer->length + padlength + 8);
+  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 */
@@ -137,7 +137,7 @@ OM_uint32 gss_wrap
 	  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,
@@ -153,8 +153,8 @@ OM_uint32 gss_wrap
 	  key[i] ^= 0xf0;
       des_set_key (&key, schedule);
       memset (&zero, 0, sizeof(zero));
-      des_cbc_encrypt ((des_cblock *)p,
-		       (des_cblock *)p,
+      des_cbc_encrypt ((const void *)p,
+		       (void *)p,
 		       8 + input_message_buffer->length + padlength,
 		       schedule,
 		       &zero,
diff --git a/lib/gssapi/unwrap.c b/lib/gssapi/unwrap.c
index f36bce52b..65c52bce4 100644
--- a/lib/gssapi/unwrap.c
+++ b/lib/gssapi/unwrap.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. 
  *
@@ -70,7 +70,7 @@ OM_uint32 gss_unwrap
 {
   u_char *p, *pad;
   size_t len;
-  struct md5 md5;
+  MD5_CTX md5;
   u_char hash[16], seq_data[8];
   des_key_schedule schedule;
   des_cblock key;
@@ -114,8 +114,8 @@ OM_uint32 gss_unwrap
 	  key[i] ^= 0xf0;
       des_set_key (&key, schedule);
       memset (&zero, 0, sizeof(zero));
-      des_cbc_encrypt ((des_cblock *)p,
-		       (des_cblock *)p,
+      des_cbc_encrypt ((const void *)p,
+		       (void *)p,
 		       input_message_buffer->length - len,
 		       schedule,
 		       &zero,
@@ -134,16 +134,16 @@ OM_uint32 gss_unwrap
   if (i != 0)
     return GSS_S_BAD_MIC;
 
-  md5_init (&md5);
-  md5_update (&md5, p - 24, 8);
-  md5_update (&md5, p, input_message_buffer->length - len);
-  md5_finito (&md5, hash);
+  MD5Init (&md5);
+  MD5Update (&md5, p - 24, 8);
+  MD5Update (&md5, p, input_message_buffer->length - len);
+  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);
   if (memcmp (p - 8, hash, 8) != 0)
     return GSS_S_BAD_MIC;
 
@@ -162,7 +162,7 @@ OM_uint32 gss_unwrap
 
   p -= 16;
   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 *)hash, DES_DECRYPT);
 
   memset (key, 0, sizeof(key));
diff --git a/lib/gssapi/verify_mic.c b/lib/gssapi/verify_mic.c
index ef1c6c4f8..86f410c3e 100644
--- a/lib/gssapi/verify_mic.c
+++ b/lib/gssapi/verify_mic.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -44,7 +44,7 @@ OM_uint32 gss_verify_mic
 	    )
 {
   u_char *p;
-  struct md5 md5;
+  MD5_CTX md5;
   u_char hash[16], seq_data[8];
   des_key_schedule schedule;
   des_cblock key;
@@ -68,11 +68,11 @@ OM_uint32 gss_verify_mic
   p += 16;
 
   /* verify 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));
 #if 0
@@ -83,8 +83,8 @@ OM_uint32 gss_verify_mic
 	  sizeof(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);
   if (memcmp (p - 8, hash, 8) != 0) {
     memset (key, 0, sizeof(key));
     memset (schedule, 0, sizeof(schedule));
@@ -106,7 +106,7 @@ OM_uint32 gss_verify_mic
 
   p -= 16;
   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 *)hash, DES_DECRYPT);
 
   memset (key, 0, sizeof(key));
diff --git a/lib/gssapi/wrap.c b/lib/gssapi/wrap.c
index 8a7403262..317498840 100644
--- a/lib/gssapi/wrap.c
+++ b/lib/gssapi/wrap.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. 
  *
@@ -63,7 +63,7 @@ OM_uint32 gss_wrap
            )
 {
   u_char *p;
-  struct md5 md5;
+  MD5_CTX md5;
   u_char hash[16];
   des_key_schedule schedule;
   des_cblock key;
@@ -110,16 +110,16 @@ OM_uint32 gss_wrap
   memset (p + 8 + input_message_buffer->length, padlength, padlength);
 
   /* checksum */
-  md5_init (&md5);
-  md5_update (&md5, p - 24, 8);
-  md5_update (&md5, p, input_message_buffer->length + padlength + 8);
-  md5_finito (&md5, hash);
+  MD5Init (&md5);
+  MD5Update (&md5, p - 24, 8);
+  MD5Update (&md5, p, input_message_buffer->length + padlength + 8);
+  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 */
@@ -137,7 +137,7 @@ OM_uint32 gss_wrap
 	  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,
@@ -153,8 +153,8 @@ OM_uint32 gss_wrap
 	  key[i] ^= 0xf0;
       des_set_key (&key, schedule);
       memset (&zero, 0, sizeof(zero));
-      des_cbc_encrypt ((des_cblock *)p,
-		       (des_cblock *)p,
+      des_cbc_encrypt ((const void *)p,
+		       (void *)p,
 		       8 + input_message_buffer->length + padlength,
 		       schedule,
 		       &zero,