delete data-stream encryption for the foreign sites (4.3-Reno)

SCCS-vsn: usr.bin/rlogin/des_rw.c 5.7.1.1
SCCS-vsn: usr.bin/rlogin/krcmd.c 1.6.1.1

diff --git a/usr/src/usr.bin/rlogin/des_rw.c b/usr/src/usr.bin/rlogin/des_rw.c
index da360f5..7535edd 100644 (file)
--- a/usr/src/usr.bin/rlogin/des_rw.c
+++ b/usr/src/usr.bin/rlogin/des_rw.c
@@ -6,158 +6,6 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)des_rw.c   5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)des_rw.c   5.7.1.1 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

-#ifdef CRYPT
-#ifdef KERBEROS
-#include <sys/param.h>
-#include <kerberosIV/des.h>
-#include <kerberosIV/krb.h>
-
-extern long            random();
-static unsigned char   des_inbuf[10240], storage[10240], *store_ptr;
-static bit_64          *key;
-static u_char          *key_schedule;
-
-/*
- * NB: These routines will not function properly if NBIO
- *     is set
- */
-
-/*
- * des_set_key
- *
- * Set des encryption/decryption key for use by the des_read and
- * des_write routines
- *
- * The inkey parameter is actually the DES initial vector,
- * and the insched is the DES Key unwrapped for faster decryption
- */
-
-void
-des_set_key(inkey, insched)
-       bit_64          *inkey;
-       u_char          *insched;
-{
-       key = inkey;
-       key_schedule = insched;
-}
-
-void
-des_clear_key()
-{
-       bzero((char *) key, sizeof(C_Block));
-       bzero((char *) key_schedule, sizeof(Key_schedule));
-}
-       
-
-int
-des_read(fd, buf, len)
-       int fd;
-       register char *buf;
-       int len;
-{
-       int nreturned = 0;
-       long net_len, rd_len;
-       int nstored = 0;
-
-       if (nstored >= len) {
-               (void) bcopy(store_ptr, buf, len);
-               store_ptr += len;
-               nstored -= len;
-               return(len);
-       } else if (nstored) {
-               (void) bcopy(store_ptr, buf, nstored);
-               nreturned += nstored;
-               buf += nstored;
-               len -= nstored;
-               nstored = 0;
-       }
-       
-       if (krb_net_read(fd, &net_len, sizeof(net_len)) != sizeof(net_len)) {
-               /* XXX can't read enough, pipe
-                  must have closed */
-               return(0);
-       }
-       net_len = ntohl(net_len);
-       if (net_len <= 0 || net_len > sizeof(des_inbuf)) {
-               /* preposterous length; assume out-of-sync; only
-                  recourse is to close connection, so return 0 */
-               return(0);
-       }
-       /* the writer tells us how much real data we are getting, but
-          we need to read the pad bytes (8-byte boundary) */
-       rd_len = roundup(net_len, 8);
-       if (krb_net_read(fd, des_inbuf, rd_len) != rd_len) {
-               /* pipe must have closed, return 0 */
-               return(0);
-       }
-       (void) des_pcbc_encrypt(des_inbuf,      /* inbuf */
-                           storage,            /* outbuf */
-                           net_len,            /* length */
-                           key_schedule,       /* DES key */
-                           key,                /* IV */
-                           DECRYPT);           /* direction */
-
-       if(net_len < 8)
-               store_ptr = storage + 8 - net_len;
-       else
-               store_ptr = storage;
-
-       nstored = net_len;
-       if (nstored > len) {
-               (void) bcopy(store_ptr, buf, len);
-               nreturned += len;
-               store_ptr += len;
-               nstored -= len;
-       } else {
-               (void) bcopy(store_ptr, buf, nstored);
-               nreturned += nstored;
-               nstored = 0;
-       }
-       
-       return(nreturned);
-}
-
-static unsigned char des_outbuf[10240];        /* > longest write */
-
-int
-des_write(fd, buf, len)
-       int fd;
-       char *buf;
-       int len;
-{
-       static  int     seeded = 0;
-       static  char    garbage_buf[8];
-       long net_len, garbage;
-
-       if(len < 8) {
-               if(!seeded) {
-                       seeded = 1;
-                       srandom((int) time((long *)0));
-               }
-               garbage = random();
-               /* insert random garbage */
-               (void) bcopy(&garbage, garbage_buf, MIN(sizeof(long),8));
-               /* this "right-justifies" the data in the buffer */
-               (void) bcopy(buf, garbage_buf + 8 - len, len);
-       }
-       /* pcbc_encrypt outputs in 8-byte (64 bit) increments */
-
-       (void) des_pcbc_encrypt((len < 8) ? garbage_buf : buf,
-                           des_outbuf,
-                           (len < 8) ? 8 : len,
-                           key_schedule,       /* DES key */
-                           key,                /* IV */
-                           ENCRYPT);
-
-       /* tell the other end the real amount, but send an 8-byte padded
-          packet */
-       net_len = htonl(len);
-       (void) write(fd, &net_len, sizeof(net_len));
-       (void) write(fd, des_outbuf, roundup(len,8));
-       return(len);
-}
-#endif /* KERBEROS */
-#endif /* CRYPT */

diff --git a/usr/src/usr.bin/rlogin/krcmd.c b/usr/src/usr.bin/rlogin/krcmd.c
index b50fa2e..77184c4 100644 (file)
--- a/usr/src/usr.bin/rlogin/krcmd.c
+++ b/usr/src/usr.bin/rlogin/krcmd.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)krcmd.c    1.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)krcmd.c    1.6.1.1 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -72,53 +72,4 @@ krcmd(ahost, rport, remuser, cmd, fd2p, realm)
        return(sock);
 }
 
        return(sock);
 }
 

-#ifdef CRYPT
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-int
-krcmd_mutual(ahost, rport, remuser, cmd, fd2p, realm, cred, sched)
-       char            **ahost;
-       u_short         rport;
-       char            *remuser, *cmd;
-       int             *fd2p;
-       char            *realm;
-       CREDENTIALS     *cred;
-       Key_schedule    sched;
-{
-       int             sock, err;
-       KTEXT_ST        ticket;
-       MSG_DAT         msg_dat;
-       struct sockaddr_in      laddr, faddr;
-       long authopts = KOPT_DO_MUTUAL;
-
-       err = kcmd(
-               &sock,
-               ahost,
-               rport,
-               NULL,   /* locuser not used */
-               remuser,
-               cmd,
-               fd2p,
-               &ticket,
-               SERVICE_NAME,
-               realm,
-               cred,           /* filled in */
-               sched,          /* filled in */
-               &msg_dat,       /* filled in */
-               &laddr,         /* filled in */
-               &faddr,         /* filled in */
-               authopts
-       );
-
-       if (err > KSUCCESS && err < MAX_KRB_ERRORS) {
-               fprintf(stderr, "krcmd_mutual: %s\n", krb_err_txt[err]);
-               return(-1);
-       }
-
-       if (err < 0)
-               return (-1);
-       return(sock);
-}
-#endif /* CRYPT */

 #endif /* KERBEROS */
 #endif /* KERBEROS */