From 465ad8fda93f0aeb678615f43b8e086fb7b073c8 Mon Sep 17 00:00:00 2001
From: assar <assar@NetBSD.org>
Date: Sun, 11 Feb 2001 16:08:41 +0000
Subject: [PATCH] fix merge-ups

---
 crypto/dist/heimdal/lib/krb5/changepw.c |  7 ++----
 crypto/dist/heimdal/lib/krb5/crypto.c   | 30 ++++++++++++-------------
 crypto/dist/heimdal/lib/krb5/mcache.c   |  3 +--
 crypto/dist/heimdal/lib/sl/lex.l        |  4 +---
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/crypto/dist/heimdal/lib/krb5/changepw.c b/crypto/dist/heimdal/lib/krb5/changepw.c
index 231d3e806f8b..cf050dcfc76a 100644
--- a/crypto/dist/heimdal/lib/krb5/changepw.c
+++ b/crypto/dist/heimdal/lib/krb5/changepw.c
@@ -33,11 +33,8 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id: changepw.c,v 1.3 2001/02/11 14:13:12 assar Exp $");
+RCSID("$Id: changepw.c,v 1.4 2001/02/11 16:08:41 assar Exp $");
 
-static void str2data (krb5_data *d, char *fmt, ...)
-	__attribute__((__format__(__printf__, 2, 3)));
-	
 static krb5_error_code
 get_kdc_address (krb5_context context,
 		 krb5_realm realm,
@@ -144,7 +141,7 @@ out2:
 static void
 str2data (krb5_data *d,
 	  const char *fmt,
-	  ...) __attribute__ ((format (printf, 2, 3)));
+	  ...) __attribute__ ((__format__ (__printf__, 2, 3)));
 
 static void
 str2data (krb5_data *d,
diff --git a/crypto/dist/heimdal/lib/krb5/crypto.c b/crypto/dist/heimdal/lib/krb5/crypto.c
index 2a0f50e80a9c..1a07e3e5f17e 100644
--- a/crypto/dist/heimdal/lib/krb5/crypto.c
+++ b/crypto/dist/heimdal/lib/krb5/crypto.c
@@ -32,7 +32,7 @@
  */
 
 #include "krb5_locl.h"
-RCSID("$Id: crypto.c,v 1.3 2001/02/11 14:13:12 assar Exp $");
+RCSID("$Id: crypto.c,v 1.4 2001/02/11 16:08:41 assar Exp $");
 
 #undef CRYPTO_DEBUG
 #ifdef CRYPTO_DEBUG
@@ -439,11 +439,11 @@ ARCFOUR_string_to_key(krb5_context context,
 	*p++ = ((char *)password.data)[i];
 	*p++ = 0;
     }
-    MD4_Init (&m);
-    MD4_Update (&m, s, len);
+    MD4Init (&m);
+    MD4Update (&m, s, len);
     key->keytype = enctype;
     krb5_data_alloc (&key->keyvalue, 16);
-    MD4_Final (key->keyvalue.data, &m);
+    MD4Final (key->keyvalue.data, &m);
     memset (s, 0, len);
     free (s);
     return 0;
@@ -838,9 +838,9 @@ RSA_MD4_checksum(krb5_context context,
 {
     MD4_CTX m;
 
-    MD4_Init (&m);
-    MD4_Update (&m, data, len);
-    MD4_Final (C->checksum.data, &m);
+    MD4Init (&m);
+    MD4Update (&m, data, len);
+    MD4Final (C->checksum.data, &m);
 }
 
 static void
@@ -856,10 +856,10 @@ RSA_MD4_DES_checksum(krb5_context context,
     unsigned char *p = cksum->checksum.data;
     
     krb5_generate_random_block(p, 8);
-    MD4_Init (&md4);
-    MD4_Update (&md4, p, 8);
-    MD4_Update (&md4, data, len);
-    MD4_Final (p + 8, &md4);
+    MD4Init (&md4);
+    MD4Update (&md4, p, 8);
+    MD4Update (&md4, data, len);
+    MD4Final (p + 8, &md4);
     memset (&ivec, 0, sizeof(ivec));
     des_cbc_encrypt((const void *)p, 
 		    (void *)p, 
@@ -890,10 +890,10 @@ RSA_MD4_DES_verify(krb5_context context,
 		    key->schedule->data,
 		    &ivec,
 		    DES_DECRYPT);
-    MD4_Init (&md4);
-    MD4_Update (&md4, tmp, 8); /* confounder */
-    MD4_Update (&md4, data, len);
-    MD4_Final (res, &md4);
+    MD4Init (&md4);
+    MD4Update (&md4, tmp, 8); /* confounder */
+    MD4Update (&md4, data, len);
+    MD4Final (res, &md4);
     if(memcmp(res, tmp + 8, sizeof(res)) != 0)
 	ret = KRB5KRB_AP_ERR_BAD_INTEGRITY;
     memset(tmp, 0, sizeof(tmp));
diff --git a/crypto/dist/heimdal/lib/krb5/mcache.c b/crypto/dist/heimdal/lib/krb5/mcache.c
index fe7a36c0be42..1e4d45d28c58 100644
--- a/crypto/dist/heimdal/lib/krb5/mcache.c
+++ b/crypto/dist/heimdal/lib/krb5/mcache.c
@@ -33,7 +33,7 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id: mcache.c,v 1.6 2001/02/11 14:13:12 assar Exp $");
+RCSID("$Id: mcache.c,v 1.7 2001/02/11 16:08:42 assar Exp $");
 
 typedef struct krb5_mcache {
     char *name;
@@ -115,7 +115,6 @@ static krb5_error_code
 mcc_gen_new(krb5_context context, krb5_ccache *id)
 {
     krb5_mcache *m;
-    char *file;
 
     m = mcc_alloc(NULL);
 
diff --git a/crypto/dist/heimdal/lib/sl/lex.l b/crypto/dist/heimdal/lib/sl/lex.l
index c639d1b6433b..abc02f0db367 100644
--- a/crypto/dist/heimdal/lib/sl/lex.l
+++ b/crypto/dist/heimdal/lib/sl/lex.l
@@ -32,12 +32,10 @@
  * SUCH DAMAGE. 
  */
 
-#undef ECHO
-
 #include "make_cmds.h"
 #include "parse.h"
 
-RCSID("$Id: lex.l,v 1.1.1.3 2001/02/11 13:51:50 assar Exp $");
+RCSID("$Id: lex.l,v 1.2 2001/02/11 16:08:42 assar Exp $");
 
 static unsigned lineno = 1;
 static int getstring(void);