From 8ceb13ade4a53b8ec0318890f69ac8356ca6f62b Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Thu, 24 Feb 2000 13:37:41 +0000
Subject: Merge conflicts.

---
 crypto/heimdal/admin/ktutil_locl.h     | 3 ++-
 crypto/heimdal/appl/ftp/ftp/ftp_locl.h | 3 ++-
 crypto/heimdal/kadmin/kadmin_locl.h    | 3 ++-
 crypto/heimdal/kdc/headers.h           | 3 ++-
 crypto/heimdal/lib/des/rc4_enc.c       | 5 +++--
 crypto/heimdal/lib/des/rc4_skey.c      | 5 +++--
 crypto/heimdal/lib/hdb/hdb_locl.h      | 3 ++-
 crypto/heimdal/lib/krb5/crypto.c       | 7 ++++---
 crypto/heimdal/lib/krb5/krb5_locl.h    | 3 ++-
 9 files changed, 22 insertions(+), 13 deletions(-)

(limited to 'crypto/heimdal')

diff --git a/crypto/heimdal/admin/ktutil_locl.h b/crypto/heimdal/admin/ktutil_locl.h
index a9f41b57f836..030ec1f2f708 100644
--- a/crypto/heimdal/admin/ktutil_locl.h
+++ b/crypto/heimdal/admin/ktutil_locl.h
@@ -33,6 +33,7 @@
 
 /* 
  * $Id: ktutil_locl.h,v 1.11 2000/02/07 04:26:37 assar Exp $
+ * $FreeBSD$
  */
 
 #ifndef __KTUTIL_LOCL_H__
@@ -53,7 +54,7 @@
 #endif
 #include <roken.h>
 
-#include <des.h>
+#include <openssl/des.h>
 
 #include <krb5.h>
 #include <kadm5/admin.h>
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
index 49c2b2f45bcb..c0d6caeb448c 100644
--- a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
+++ b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
@@ -32,6 +32,7 @@
  */
 
 /* $Id: ftp_locl.h,v 1.34 1999/12/02 16:58:29 joda Exp $ */
+/* $FreeBSD$ */
 
 #ifndef __FTP_LOCL_H__
 #define __FTP_LOCL_H__
@@ -129,7 +130,7 @@ struct hostent  *gethostbyname(const char *);
 
 #include "roken.h"
 #include "security.h"
-#include <des.h> /* for des_read_pw_string */
+#include <openssl/des.h> /* for des_read_pw_string */
 
 #if defined(__sun__) && !defined(__svr4)
 int fclose(FILE*);
diff --git a/crypto/heimdal/kadmin/kadmin_locl.h b/crypto/heimdal/kadmin/kadmin_locl.h
index 536925476373..aa5ba13d1494 100644
--- a/crypto/heimdal/kadmin/kadmin_locl.h
+++ b/crypto/heimdal/kadmin/kadmin_locl.h
@@ -33,6 +33,7 @@
 
 /* 
  * $Id: kadmin_locl.h,v 1.25 2000/02/06 05:16:35 assar Exp $
+ * $FreeBSD$
  */
 
 #ifndef __ADMIN_LOCL_H__
@@ -73,7 +74,7 @@
 #endif
 #include <err.h>
 #include <roken.h>
-#include <des.h>
+#include <openssl/des.h>
 #include <krb5.h>
 #include <hdb.h>
 #include <hdb_err.h>
diff --git a/crypto/heimdal/kdc/headers.h b/crypto/heimdal/kdc/headers.h
index 845b2a524f30..118e0d8466b4 100644
--- a/crypto/heimdal/kdc/headers.h
+++ b/crypto/heimdal/kdc/headers.h
@@ -33,6 +33,7 @@
 
 /* 
  * $Id: headers.h,v 1.6 2000/02/06 06:04:36 assar Exp $ 
+ * $FreeBSD$ 
  */
 
 #ifndef __HEADERS_H__
@@ -79,7 +80,7 @@
 #include <getarg.h>
 #include <base64.h>
 #include <parse_units.h>
-#include <des.h>
+#include <openssl/des.h>
 #include <krb5.h>
 #include <hdb.h>
 #include <hdb_err.h>
diff --git a/crypto/heimdal/lib/des/rc4_enc.c b/crypto/heimdal/lib/des/rc4_enc.c
index 6b1686f569b9..7e02f8537e21 100644
--- a/crypto/heimdal/lib/des/rc4_enc.c
+++ b/crypto/heimdal/lib/des/rc4_enc.c
@@ -56,10 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
-#include "des_locl.h"
+/* #include "des_locl.h" */
 #include "rc4.h"
 
-RCSID("$Id: rc4_enc.c,v 1.2 1999/10/21 12:58:43 joda Exp $");
+/* RCSID("$Id: rc4_enc.c,v 1.2 1999/10/21 12:58:43 joda Exp $"); */
+/* RCSID("$FreeBSD$"); */
 
 /* RC4 as implemented from a posting from
  * Newsgroups: sci.crypt
diff --git a/crypto/heimdal/lib/des/rc4_skey.c b/crypto/heimdal/lib/des/rc4_skey.c
index f5bce4683f37..ec9e9da8c77a 100644
--- a/crypto/heimdal/lib/des/rc4_skey.c
+++ b/crypto/heimdal/lib/des/rc4_skey.c
@@ -56,10 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
-#include "des_locl.h"
+/* #include "des_locl.h" */
 #include "rc4.h"
 
-RCSID("$Id: rc4_skey.c,v 1.2 1999/10/21 12:58:52 joda Exp $");
+/* RCSID("$Id: rc4_skey.c,v 1.2 1999/10/21 12:58:52 joda Exp $"); */
+/* RCSID("$FreeBSD$"); */
 
 /* RC4 as implemented from a posting from
  * Newsgroups: sci.crypt
diff --git a/crypto/heimdal/lib/hdb/hdb_locl.h b/crypto/heimdal/lib/hdb/hdb_locl.h
index 5d0a6d01a4e5..2ce6be70ae58 100644
--- a/crypto/heimdal/lib/hdb/hdb_locl.h
+++ b/crypto/heimdal/lib/hdb/hdb_locl.h
@@ -32,6 +32,7 @@
  */
 
 /* $Id: hdb_locl.h,v 1.13 2000/02/06 05:17:05 assar Exp $ */
+/* $FreeBSD$ */
 
 #ifndef __HDB_LOCL_H__
 #define __HDB_LOCL_H__
@@ -56,7 +57,7 @@
 #endif
 #include <roken.h>
 
-#include <des.h>
+#include <openssl/des.h>
 #include <krb5.h>
 #include <hdb.h>
 #include <hdb-private.h>
diff --git a/crypto/heimdal/lib/krb5/crypto.c b/crypto/heimdal/lib/krb5/crypto.c
index aef45b1c869b..08ebdba65fa6 100644
--- a/crypto/heimdal/lib/krb5/crypto.c
+++ b/crypto/heimdal/lib/krb5/crypto.c
@@ -33,6 +33,7 @@
 
 #include "krb5_locl.h"
 RCSID("$Id: crypto.c,v 1.29 2000/01/25 23:06:55 assar Exp $");
+/* RCSID("$FreeBSD$"); */
 
 #undef CRYPTO_DEBUG
 #ifdef CRYPTO_DEBUG
@@ -1010,9 +1011,9 @@ SHA1_checksum(krb5_context context,
 {
     SHA1_CTX m;
 
-    SHA1Init(&m);
-    SHA1Update(&m, data, len);
-    SHA1Final(C->checksum.data, &m);
+    SHA_Init(&m);
+    SHA_Update(&m, data, len);
+    SHA_Final(C->checksum.data, &m);
 }
 
 /* HMAC according to RFC2104 */
diff --git a/crypto/heimdal/lib/krb5/krb5_locl.h b/crypto/heimdal/lib/krb5/krb5_locl.h
index b7093b1b14d0..6a4c7fd0dfdb 100644
--- a/crypto/heimdal/lib/krb5/krb5_locl.h
+++ b/crypto/heimdal/lib/krb5/krb5_locl.h
@@ -32,6 +32,7 @@
  */
 
 /* $Id: krb5_locl.h,v 1.63 1999/12/02 17:05:11 joda Exp $ */
+/* $FreeBSD$ */
 
 #ifndef __KRB5_LOCL_H__
 #define __KRB5_LOCL_H__
@@ -109,7 +110,7 @@ struct sockaddr_dl;
 #include <parse_time.h>
 #include <base64.h>
 
-#include <des.h>
+#include <openssl/des.h>
 #include <md4.h>
 #include <md5.h>
 #include <sha.h>
-- 
cgit v1.2.3