diff -3ur ssh-1.2.27-fresh/cipher.c ssh-1.2.27-sc/cipher.c
--- ssh-1.2.27-fresh/cipher.c	Wed May 12 07:19:24 1999
+++ ssh-1.2.27-sc/cipher.c	Thu Jul 20 15:32:59 2000
@@ -12,8 +12,17 @@
 */
 
 /*
- * $Id: cipher.c,v 1.12 1998/05/23 20:21:09 kivinen Exp $
+ * $Id: cipher.c,v 1.2 2000/05/13 19:39:29 itoi Exp $
  * $Log: cipher.c,v $
+ * Revision 1.2  2000/05/13 19:39:29  itoi
+ * ssh / speke / udp / ip / 7816 works!
+ *
+ * Revision 1.1  2000/05/11 17:19:42  itoi
+ * Initial revision
+ *
+ * Revision 1.1.1.1  2000/02/21 22:19:46  itoi
+ * SSH / Smartcard
+ *
  * Revision 1.12  1998/05/23 20:21:09  kivinen
  * 	Changed () -> (void).
  *
@@ -213,7 +222,7 @@
 	 used. */
       if (keylen < 8)
 	error("Key length %d is insufficient for DES.", keylen);
-      des_set_key(padded, &context->u.des.key);
+      ssh_des_set_key(padded, &context->u.des.key);
       memset(context->u.des.iv, 0, sizeof(context->u.des.iv));
       break;
 #endif /* WITH_DES */
@@ -224,12 +233,12 @@
 	 used (first and last keys are the same). */
       if (keylen < 16)
 	error("Key length %d is insufficient for 3DES.", keylen);
-      des_set_key(padded, &context->u.des3.key1);
-      des_set_key(padded + 8, &context->u.des3.key2);
+      ssh_des_set_key(padded, &context->u.des3.key1);
+      ssh_des_set_key(padded + 8, &context->u.des3.key2);
       if (keylen <= 16)
-	des_set_key(padded, &context->u.des3.key3);
+	ssh_des_set_key(padded, &context->u.des3.key3);
       else
-	des_set_key(padded + 16, &context->u.des3.key3);
+	ssh_des_set_key(padded + 16, &context->u.des3.key3);
       memset(context->u.des3.iv1, 0, sizeof(context->u.des3.iv1));
       memset(context->u.des3.iv2, 0, sizeof(context->u.des3.iv2));
       memset(context->u.des3.iv3, 0, sizeof(context->u.des3.iv3));
@@ -274,12 +283,12 @@
 
 #ifdef WITH_DES
     case SSH_CIPHER_DES:
-      des_cbc_encrypt(&context->u.des.key, context->u.des.iv, dest, src, len);
+      ssh_des_cbc_encrypt(&context->u.des.key, context->u.des.iv, dest, src, len);
       break;
 #endif /* WITH_DES */
 
     case SSH_CIPHER_3DES:
-      des_3cbc_encrypt(&context->u.des3.key1, context->u.des3.iv1,
+      ssh_des_3cbc_encrypt(&context->u.des3.key1, context->u.des3.iv1,
 		       &context->u.des3.key2, context->u.des3.iv2,
 		       &context->u.des3.key3, context->u.des3.iv3,
 		       dest, src, len);
@@ -322,12 +331,12 @@
 
 #ifdef WITH_DES
     case SSH_CIPHER_DES:
-      des_cbc_decrypt(&context->u.des.key, context->u.des.iv, dest, src, len);
+      ssh_des_cbc_decrypt(&context->u.des.key, context->u.des.iv, dest, src, len);
       break;
 #endif /* WITH_DES */
 
     case SSH_CIPHER_3DES:
-      des_3cbc_decrypt(&context->u.des3.key1, context->u.des3.iv1,
+      ssh_des_3cbc_decrypt(&context->u.des3.key1, context->u.des3.iv1,
 		       &context->u.des3.key2, context->u.des3.iv2,
 		       &context->u.des3.key3, context->u.des3.iv3,
 		       dest, src, len);
