Switch the remaining users of libdes in src to libcrypto,

telnet portion partially from the latest heimdal.

ok mikeb@

2 files changed, 24 insertions, 24 deletions

diff --git a/libexec/login_token/Makefile b/libexec/login_token/Makefile
index 81644bf0ed6..5363d5517b3 100644
--- a/libexec/login_token/Makefile
+++ b/libexec/login_token/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.4 2002/11/21 22:14:51 millert Exp $
+#	$OpenBSD: Makefile,v 1.5 2010/10/15 10:18:42 jsg Exp $
 
 PROG=	login_token
 SRCS=	login_token.c init.c token.c tokendb.c
 MAN=	login_token.8
-DPADD=	${LIBDES}
-LDADD=	-ldes
+DPADD=	${LIBCRYPTO}
+LDADD=	-lcrypto
 
 TOKENS=	activ crypto snk
 
diff --git a/libexec/login_token/token.c b/libexec/login_token/token.c
index 36a6125fddd..f08585e3829 100644
--- a/libexec/login_token/token.c
+++ b/libexec/login_token/token.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: token.c,v 1.11 2005/11/12 14:13:16 deraadt Exp $	*/
+/*	$OpenBSD: token.c,v 1.12 2010/10/15 10:18:42 jsg Exp $	*/
 
 /*-
  * Copyright (c) 1995 Migration Associates Corp. All Rights Reserved
@@ -50,7 +50,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <des.h>
+#include <openssl/des.h>
 
 #include "token.h"
 #include "tokendb.h"
@@ -62,7 +62,7 @@
  */
 
 typedef	union {
-	des_cblock	cb;
+	DES_cblock	cb;
 	char		ct[9];
 	unsigned long	ul[2];
 } TOKEN_CBlock;
@@ -106,7 +106,7 @@ tokenchallenge(char *user, char *challenge, int size, char *card_type)
 {
 	TOKENDB_Rec tr;
 	TOKEN_CBlock cb;
-	des_key_schedule ks;
+	DES_key_schedule ks;
 	int r, c;
 
 	r = 1;	/* no reduced input mode by default! */
@@ -123,9 +123,9 @@ tokenchallenge(char *user, char *challenge, int size, char *card_type)
 		tr.flags &= ~TOKEN_LOCKED;
 		if (r == 0 && tr.rim[0]) {
 			h2cb(tr.secret, &cb);
-			des_fixup_key_parity(&cb.cb);
-			des_key_sched(&cb.cb, ks);
-			des_ecb_encrypt(&tr.rim, &cb.cb, ks, DES_ENCRYPT);
+			DES_fixup_key_parity(&cb.cb);
+			DES_key_sched(&cb.cb, &ks);
+			DES_ecb_encrypt(&tr.rim, &cb.cb, &ks, DES_ENCRYPT);
 			memcpy(tr.rim, cb.cb, 8);
 			for (r = 0; r < 8; ++r) {
 				if ((tr.rim[r] &= 0xf) > 9)
@@ -166,7 +166,7 @@ tokenverify(char *username, char *challenge, char *response)
 	TOKEN_CBlock cmp_text;
 	TOKEN_CBlock user_seed;
 	TOKEN_CBlock cipher_text;
-	des_key_schedule key_schedule;
+	DES_key_schedule key_schedule;
 
 
 	memset(cmp_text.ct, 0, sizeof(cmp_text.ct));
@@ -199,12 +199,12 @@ tokenverify(char *username, char *challenge, char *response)
 	 * shared secret asap.
 	 */
 
-	des_fixup_key_parity(&user_seed.cb);
-	des_key_sched(&user_seed.cb, key_schedule);
+	DES_fixup_key_parity(&user_seed.cb);
+	DES_key_sched(&user_seed.cb, &key_schedule);
 	memset(user_seed.ct, 0, sizeof(user_seed.ct));
-	des_ecb_encrypt(&tokennumber.cb, &cipher_text.cb, key_schedule,
+	DES_ecb_encrypt(&tokennumber.cb, &cipher_text.cb, &key_schedule,
 	    DES_ENCRYPT);
-	memset(key_schedule, 0, sizeof(key_schedule));
+	memset(&key_schedule, 0, sizeof(key_schedule));
 
 	/*
 	 * The token thinks it's descended from VAXen.  Deal with i386
@@ -258,7 +258,7 @@ tokenuserinit(int flags, char *username, unsigned char *usecret, unsigned mode)
 	TOKEN_CBlock nulls;
 	TOKEN_CBlock checksum;
 	TOKEN_CBlock checktxt;
-	des_key_schedule key_schedule;
+	DES_key_schedule key_schedule;
 
 	memset(&secret.ct, 0, sizeof(secret));
 
@@ -269,9 +269,9 @@ tokenuserinit(int flags, char *username, unsigned char *usecret, unsigned mode)
 	if ( (flags & TOKEN_GENSECRET) )
 		tokenseed(&secret);
 	else
-		memcpy(&secret, usecret, sizeof(des_cblock));
+		memcpy(&secret, usecret, sizeof(DES_cblock));
 
-	des_fixup_key_parity(&secret.cb);
+	DES_fixup_key_parity(&secret.cb);
 
 	/*
 	 * Check if the db record already exists.  If there's no
@@ -313,11 +313,11 @@ tokenuserinit(int flags, char *username, unsigned char *usecret, unsigned mode)
 	    username, secret.cb[0], secret.cb[1], secret.cb[2], secret.cb[3],
 	    secret.cb[4], secret.cb[5], secret.cb[6], secret.cb[7]);
 
-	des_key_sched(&secret.cb, key_schedule);
+	DES_key_sched(&secret.cb, &key_schedule);
 	memset(&secret.ct, 0, sizeof(secret));
 	memset(&nulls, 0, sizeof(nulls));
-	des_ecb_encrypt(&nulls.cb, &checksum.cb, key_schedule, DES_ENCRYPT);
-	memset(key_schedule, 0, sizeof(key_schedule));
+	DES_ecb_encrypt(&nulls.cb, &checksum.cb, &key_schedule, DES_ENCRYPT);
+	memset(&key_schedule, 0, sizeof(key_schedule));
 	HTONL(checksum.ul[0]);
 	snprintf(checktxt.ct, sizeof(checktxt.ct), "%8.8lx", checksum.ul[0]);
 	printf("Hex Checksum: \"%s\"", checktxt.ct);
@@ -339,7 +339,7 @@ h2d(char *cp)
 {
 	int	i;
 
-	for (i=0; i<sizeof(des_cblock); i++, cp++) {
+	for (i=0; i<sizeof(DES_cblock); i++, cp++) {
 		if (*cp >= 'a' && *cp <= 'f')
 			*cp = tt->map[*cp - 'a'];
 	}
@@ -347,7 +347,7 @@ h2d(char *cp)
 
 /*
  * Translate an hex 16 byte ascii representation of an unsigned
- * integer to a des_cblock.
+ * integer to a DES_cblock.
  */
 
 static	void
@@ -363,7 +363,7 @@ h2cb(char *hp, TOKEN_CBlock *cb)
 }
 
 /*
- * Translate a des_cblock to an 16 byte ascii hex representation.
+ * Translate a DES_cblock to an 16 byte ascii hex representation.
  */
 
 static	void