Use libcrypto instead of libdes.

15 files changed, 28 insertions, 15 deletions

diff --git a/crypto/kerberosIV/admin/adm_locl.h b/crypto/kerberosIV/admin/adm_locl.h
index 9a41b4b..8004d0a 100644
--- a/crypto/kerberosIV/admin/adm_locl.h
+++ b/crypto/kerberosIV/admin/adm_locl.h
@@ -32,6 +32,7 @@
  */
 
 /* $Id: adm_locl.h,v 1.17 1999/12/02 16:58:27 joda Exp $ */
+/* $FreeBSD$ */
 
 #ifndef __adm_locl_h
 #define __adm_locl_h
@@ -77,7 +78,7 @@
 
 #include <roken.h>
 
-#include <des.h>
+#include <openssl/des.h>
 #include <krb.h>
 #include <krb_db.h>
 #include <kdc.h>
diff --git a/crypto/kerberosIV/appl/afsutil/kstring2key.c b/crypto/kerberosIV/appl/afsutil/kstring2key.c
index c0c76ae..70246f9 100644
--- a/crypto/kerberosIV/appl/afsutil/kstring2key.c
+++ b/crypto/kerberosIV/appl/afsutil/kstring2key.c
@@ -30,6 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+/* $FreeBSD$ */
 
 #include "config.h"
 
@@ -42,7 +43,7 @@ RCSID("$Id: kstring2key.c,v 1.16 1999/12/02 16:58:28 joda Exp $");
 
 #include <roken.h>
 
-#include <des.h>
+#include <openssl/des.h>
 #include <krb.h>
 
 #define VERIFY 0
diff --git a/crypto/kerberosIV/appl/bsd/bsd_locl.h b/crypto/kerberosIV/appl/bsd/bsd_locl.h
index 787b77b..19285e9 100644
--- a/crypto/kerberosIV/appl/bsd/bsd_locl.h
+++ b/crypto/kerberosIV/appl/bsd/bsd_locl.h
@@ -270,7 +270,7 @@ struct tm *localtime(const time_t *);
 struct hostent  *gethostbyname(const char *);
 #endif
 
-#include <des.h>
+#include <openssl/des.h>
 #include <krb.h>
 #include <kafs.h>
 
diff --git a/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h b/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h
index 49c2b2f..c0d6cae 100644
--- a/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h
+++ b/crypto/kerberosIV/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/kerberosIV/appl/telnet/libtelnet/enc_des.c b/crypto/kerberosIV/appl/telnet/libtelnet/enc_des.c
index a24bfa7..ec13b3f 100644
--- a/crypto/kerberosIV/appl/telnet/libtelnet/enc_des.c
+++ b/crypto/kerberosIV/appl/telnet/libtelnet/enc_des.c
@@ -30,6 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+/* $FreeBSD$ */
 
 #include <config.h>
 
@@ -50,7 +51,7 @@ RCSID("$Id: enc_des.c,v 1.16 1998/07/09 23:16:23 assar Exp $");
 #include "encrypt.h"
 #include "misc-proto.h"
 
-#include <des.h>
+#include <openssl/des.h>
 
 extern int encrypt_debug_mode;
 
diff --git a/crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c b/crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c
index b5c0953..0dade62 100644
--- a/crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c
+++ b/crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c
@@ -30,6 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+/* $FreeBSD$ */
 
 /*
  * Copyright (C) 1990 by the Massachusetts Institute of Technology
@@ -65,7 +66,7 @@ RCSID("$Id: kerberos.c,v 1.45 1999/03/13 21:18:55 assar Exp $");
 #include <arpa/telnet.h>
 #endif
 #include <stdio.h>
-#include <des.h>	/* BSD wont include this in krb.h, so we do it here */
+#include <openssl/des.h>	/* BSD wont include this in krb.h, so we do it here */
 #include <krb.h>
 #include <pwd.h>
 #include <stdlib.h>
diff --git a/crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c b/crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c
index ee1eee2..9e66d6f 100644
--- a/crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c
+++ b/crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c
@@ -30,6 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+/* $FreeBSD$ */
 
 #include <config.h>
 
@@ -74,7 +75,7 @@ RCSID("$Id: krb4encpwd.c,v 1.17 1998/07/09 23:16:29 assar Exp $");
 #include <pwd.h>
 #include <stdio.h>
 
-#include <des.h>
+#include <openssl/des.h>
 #include <krb.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/crypto/kerberosIV/appl/telnet/telnetd/telnetd.h b/crypto/kerberosIV/appl/telnet/telnetd/telnetd.h
index 5ad5bd8..82402b5 100644
--- a/crypto/kerberosIV/appl/telnet/telnetd/telnetd.h
+++ b/crypto/kerberosIV/appl/telnet/telnetd/telnetd.h
@@ -32,6 +32,7 @@
  *
  *	@(#)telnetd.h	8.1 (Berkeley) 6/4/93
  */
+/* $FreeBSD$ */
 
 
 #include <config.h>
@@ -166,7 +167,7 @@ struct hostent  *gethostbyname(const char *);
 #endif
 
 #ifdef KRB4
-#include <des.h>
+#include <openssl/des.h>
 #include <krb.h>
 #endif
 
diff --git a/crypto/kerberosIV/kadmin/kadm_locl.h b/crypto/kerberosIV/kadmin/kadm_locl.h
index 960c564..98d07ae 100644
--- a/crypto/kerberosIV/kadmin/kadm_locl.h
+++ b/crypto/kerberosIV/kadmin/kadm_locl.h
@@ -32,6 +32,7 @@
  */
 
 /* $Id: kadm_locl.h,v 1.31 1999/12/02 16:58:36 joda Exp $ */
+/* $FreeBSD$ */
 
 #include "config.h"
 #include "protos.h"
@@ -111,7 +112,7 @@ struct hostent  *gethostbyname(const char *);
 #include <com_err.h>
 #include <sl.h>
 
-#include <des.h>
+#include <openssl/des.h>
 #include <krb.h>
 #include <krb_err.h>
 #include <krb_db.h>
diff --git a/crypto/kerberosIV/lib/kadm/kadm_locl.h b/crypto/kerberosIV/lib/kadm/kadm_locl.h
index 709a224..6740709 100644
--- a/crypto/kerberosIV/lib/kadm/kadm_locl.h
+++ b/crypto/kerberosIV/lib/kadm/kadm_locl.h
@@ -32,6 +32,7 @@
  */
 
 /* $Id: kadm_locl.h,v 1.12 1999/12/02 16:58:39 joda Exp $ */
+/* $FreeBSD$ */
 
 #include "config.h"
 #include "protos.h"
@@ -69,7 +70,7 @@ struct hostent  *gethostbyname(const char *);
 
 #include <roken.h>
 
-#include <des.h>
+#include <openssl/des.h>
 #include <krb.h>
 #include <krb_err.h>
 #include <krb_db.h>
diff --git a/crypto/kerberosIV/lib/krb/krb.h b/crypto/kerberosIV/lib/krb/krb.h
index 745b154..6f7386f 100644
--- a/crypto/kerberosIV/lib/krb/krb.h
+++ b/crypto/kerberosIV/lib/krb/krb.h
@@ -48,7 +48,7 @@ __BEGIN_DECLS
 #if !defined(NOPROTO) && !defined(__STDC__)
 #define NOPROTO
 #endif
-#include <des.h>
+#include <openssl/des.h>
 
 /* CNS compatibility ahead! */
 #ifndef KRB_INT32
diff --git a/crypto/kerberosIV/man/kerberos.3 b/crypto/kerberosIV/man/kerberos.3
index 71da54d..deff91d 100644
--- a/crypto/kerberosIV/man/kerberos.3
+++ b/crypto/kerberosIV/man/kerberos.3
@@ -1,4 +1,5 @@
 .\" $Id: kerberos.3,v 1.2 1996/06/12 21:29:18 bg Exp $
+.\" $FreeBSD$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
@@ -13,7 +14,7 @@ krb_rd_err, krb_ck_repl \- Kerberos authentication library
 .nf
 .nj
 .ft B
-#include <des.h>
+#include <openssl/des.h>
 #include <krb.h>
 .PP
 .ft B
diff --git a/crypto/kerberosIV/man/krb_realmofhost.3 b/crypto/kerberosIV/man/krb_realmofhost.3
index ddbda74..d7c0ea6 100644
--- a/crypto/kerberosIV/man/krb_realmofhost.3
+++ b/crypto/kerberosIV/man/krb_realmofhost.3
@@ -1,4 +1,5 @@
 .\" $Id: krb_realmofhost.3,v 1.2 1996/06/12 21:29:23 bg Exp $
+.\" $FreeBSD$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
@@ -13,7 +14,7 @@ krb_get_lrealm \- additional Kerberos utility routines
 .nj
 .ft B
 #include <krb.h>
-#include <des.h>
+#include <openssl/des.h>
 #include <netinet/in.h>
 .PP
 .ft B
diff --git a/crypto/kerberosIV/man/krb_sendauth.3 b/crypto/kerberosIV/man/krb_sendauth.3
index 208b6bc..cc99d4e 100644
--- a/crypto/kerberosIV/man/krb_sendauth.3
+++ b/crypto/kerberosIV/man/krb_sendauth.3
@@ -1,4 +1,5 @@
 .\" $Id: krb_sendauth.3,v 1.2 1996/06/12 21:29:24 bg Exp $
+.\" $FreeBSD$
 .\" Copyright 1988 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
@@ -13,7 +14,7 @@ Kerberos routines for sending authentication via network stream sockets
 .nj
 .ft B
 #include <krb.h>
-#include <des.h>
+#include <openssl/des.h>
 #include <netinet/in.h>
 .PP
 .fi
diff --git a/crypto/kerberosIV/server/kerberos.c b/crypto/kerberosIV/server/kerberos.c
index 5ecc4f8..32f34e2 100644
--- a/crypto/kerberosIV/server/kerberos.c
+++ b/crypto/kerberosIV/server/kerberos.c
@@ -5,6 +5,7 @@
  * For copying and distribution information, please see the file
  * <mit-copyright.h>.
  */
+/* $FreeBSD$ */
 
 #include "config.h"
 #include "protos.h"
@@ -73,7 +74,7 @@ RCSID("$Id: kerberos.c,v 1.87 1999/11/13 06:35:39 assar Exp $");
 #include <roken.h>
 #include <base64.h>
 
-#include <des.h>
+#include <openssl/des.h>
 #include <krb.h>
 #include <krb_db.h>
 #include <prot.h>