From 2d4e3ed56920089bf9378018fb92af76cf8861ea Mon Sep 17 00:00:00 2001
From: markm <markm@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 24 Feb 2000 19:28:31 +0000
Subject: [PATCH] Get crypto from libcrypto, not libdes.

git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@57442 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 libtelnet/enc_des.c    | 4 +++-
 libtelnet/encrypt.h    | 3 ++-
 libtelnet/kerberos.c   | 4 +++-
 libtelnet/krb4encpwd.c | 4 +++-
 libtelnet/pk.c         | 3 ++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/libtelnet/enc_des.c b/libtelnet/enc_des.c
index 8e4b9a7..c0f669b 100644
--- a/libtelnet/enc_des.c
+++ b/libtelnet/enc_des.c
@@ -29,6 +29,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ * 
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -44,7 +46,7 @@ static const char sccsid[] = "@(#)enc_des.c	8.3 (Berkeley) 5/30/95";
 #include <stdlib.h>
 #endif
 
-#include <des.h>
+#include <openssl/des.h>
 #include <string.h>
 #include "encrypt.h"
 #include "key-proto.h"
diff --git a/libtelnet/encrypt.h b/libtelnet/encrypt.h
index 14be826..869ad75 100644
--- a/libtelnet/encrypt.h
+++ b/libtelnet/encrypt.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)encrypt.h	8.1 (Berkeley) 6/4/93
+ * $FreeBSD$
  */
 
 /*
@@ -60,7 +61,7 @@
 #define	DIR_DECRYPT		1
 #define	DIR_ENCRYPT		2
 
-#include <des.h>
+#include <openssl/des.h>
 typedef	unsigned char Block[8];
 typedef unsigned char *BlockT;
 #if 0
diff --git a/libtelnet/kerberos.c b/libtelnet/kerberos.c
index 738a57f..3b6155e 100644
--- a/libtelnet/kerberos.c
+++ b/libtelnet/kerberos.c
@@ -29,6 +29,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ * 
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -59,7 +61,7 @@ static const char sccsid[] = "@(#)kerberos.c	8.3 (Berkeley) 5/30/95";
 #include <sys/types.h>
 #include <arpa/telnet.h>
 #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>
 #ifdef	__STDC__
 #include <stdlib.h>
diff --git a/libtelnet/krb4encpwd.c b/libtelnet/krb4encpwd.c
index cb9523c..3184a52 100644
--- a/libtelnet/krb4encpwd.c
+++ b/libtelnet/krb4encpwd.c
@@ -29,6 +29,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ * 
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -75,7 +77,7 @@ static char sccsid[] = "@(#)krb4encpwd.c	8.3 (Berkeley) 5/30/95";
 #include <pwd.h>
 #include <stdio.h>
 
-#include <des.h>
+#include <openssl/des.h>
 #include <krb.h>
 #ifdef	__STDC__
 #include <stdlib.h>
diff --git a/libtelnet/pk.c b/libtelnet/pk.c
index 78e474f..9af8915 100644
--- a/libtelnet/pk.c
+++ b/libtelnet/pk.c
@@ -1,4 +1,5 @@
 /* public key routines */
+/* $FreeBSD$ */
 /* functions:
 	genkeys(char *public, char *secret)
 	common_key(char *secret, char *public, desData *deskey)
@@ -13,7 +14,7 @@
 #include <sys/time.h>
 #include <string.h>
 #include <fcntl.h>
-#include <des.h>
+#include <openssl/des.h>
 #include "mp.h"
 #include "pk.h"
 #if defined(SOLARIS2) || defined(LINUX)