BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / telnet / ring.c

diff --git a/usr/src/usr.bin/telnet/ring.c b/usr/src/usr.bin/telnet/ring.c
index 2d9f0b0..8595b9b 100644 (file)
--- a/usr/src/usr.bin/telnet/ring.c
+++ b/usr/src/usr.bin/telnet/ring.c
@@ -2,23 +2,37 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ring.c     1.13 (Berkeley) 6/28/90";
+static char sccsid[] = "@(#)ring.c     5.2 (Berkeley) 3/1/91";

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


@@ -85,10 +99,10 @@ static u_long ring_clock = 0;
 
 /* Buffer state transition routines */
 
 
 /* Buffer state transition routines */
 

-ring_init(ring, buffer, count)
+    ring_init(ring, buffer, count)

 Ring *ring;
 Ring *ring;

-char *buffer;
-int count;
+    unsigned char *buffer;
+    int count;

 {
     memset((char *)ring, 0, sizeof *ring);
 
 {
     memset((char *)ring, 0, sizeof *ring);
 


@@ -98,6 +112,10 @@ int count;
 
     ring->top = ring->bottom+ring->size;
 
 
     ring->top = ring->bottom+ring->size;
 

+#if    defined(ENCRYPT)
+    ring->clearto = 0;
+#endif
+

     return 1;
 }
 
     return 1;
 }
 


@@ -107,9 +125,9 @@ int count;
  * Mark the most recently supplied byte.
  */
 
  * Mark the most recently supplied byte.
  */
 

-void
+    void

 ring_mark(ring)
 ring_mark(ring)

-Ring *ring;
+    Ring *ring;

 {
     ring->mark = ring_decrement(ring, ring->supply, 1);
 }
 {
     ring->mark = ring_decrement(ring, ring->supply, 1);
 }


@@ -118,9 +136,9 @@ Ring *ring;
  * Is the ring pointing to the mark?
  */
 
  * Is the ring pointing to the mark?
  */
 

-int
+    int

 ring_at_mark(ring)
 ring_at_mark(ring)

-Ring *ring;
+    Ring *ring;

 {
     if (ring->mark == ring->consume) {
        return 1;
 {
     if (ring->mark == ring->consume) {
        return 1;


@@ -133,9 +151,9 @@ Ring *ring;
  * Clear any mark set on the ring.
  */
 
  * Clear any mark set on the ring.
  */
 

-void
+    void

 ring_clear_mark(ring)
 ring_clear_mark(ring)

-Ring *ring;
+    Ring *ring;

 {
     ring->mark = 0;
 }
 {
     ring->mark = 0;
 }


@@ -143,10 +161,10 @@ Ring *ring;
 /*
  * Add characters from current segment to ring buffer.
  */
 /*
  * Add characters from current segment to ring buffer.
  */

-void
+    void

 ring_supplied(ring, count)
 ring_supplied(ring, count)

-Ring *ring;
-int count;
+    Ring *ring;
+    int count;

 {
     ring->supply = ring_increment(ring, ring->supply, count);
     ring->supplytime = ++ring_clock;
 {
     ring->supply = ring_increment(ring, ring->supply, count);
     ring->supplytime = ++ring_clock;


@@ -155,10 +173,10 @@ int count;
 /*
  * We have just consumed "c" bytes.
  */
 /*
  * We have just consumed "c" bytes.
  */

-void
+    void

 ring_consumed(ring, count)
 ring_consumed(ring, count)

-Ring *ring;
-int count;
+    Ring *ring;
+    int count;

 {
     if (count == 0)    /* don't update anything */
        return;
 {
     if (count == 0)    /* don't update anything */
        return;


@@ -167,6 +185,15 @@ int count;
                (ring_subtract(ring, ring->mark, ring->consume) < count)) {
        ring->mark = 0;
     }
                (ring_subtract(ring, ring->mark, ring->consume) < count)) {
        ring->mark = 0;
     }

+#if    defined(ENCRYPT)
+    if (ring->consume < ring->clearto &&
+               ring->clearto <= ring->consume + count)
+       ring->clearto = 0;
+    else if (ring->consume + count > ring->top &&
+               ring->bottom <= ring->clearto &&
+               ring->bottom + ((ring->consume + count) - ring->top))
+       ring->clearto = 0;
+#endif

     ring->consume = ring_increment(ring, ring->consume, count);
     ring->consumetime = ++ring_clock;
     /*
     ring->consume = ring_increment(ring, ring->consume, count);
     ring->consumetime = ++ring_clock;
     /*


@@ -183,9 +210,9 @@ int count;
 
 
 /* Number of bytes that may be supplied */
 
 
 /* Number of bytes that may be supplied */

-int
+    int

 ring_empty_count(ring)
 ring_empty_count(ring)

-Ring *ring;
+    Ring *ring;

 {
     if (ring_empty(ring)) {    /* if empty */
            return ring->size;
 {
     if (ring_empty(ring)) {    /* if empty */
            return ring->size;


@@ -195,9 +222,9 @@ Ring *ring;
 }
 
 /* number of CONSECUTIVE bytes that may be supplied */
 }
 
 /* number of CONSECUTIVE bytes that may be supplied */

-int
+    int

 ring_empty_consecutive(ring)
 ring_empty_consecutive(ring)

-Ring *ring;
+    Ring *ring;

 {
     if ((ring->consume < ring->supply) || ring_empty(ring)) {
                            /*
 {
     if ((ring->consume < ring->supply) || ring_empty(ring)) {
                            /*


@@ -217,9 +244,9 @@ Ring *ring;
  * (but don't give more than enough to get to cross over set mark)
  */
 
  * (but don't give more than enough to get to cross over set mark)
  */
 

-int
+    int

 ring_full_count(ring)
 ring_full_count(ring)

-Ring *ring;
+    Ring *ring;

 {
     if ((ring->mark == 0) || (ring->mark == ring->consume)) {
        if (ring_full(ring)) {
 {
     if ((ring->mark == 0) || (ring->mark == ring->consume)) {
        if (ring_full(ring)) {


@@ -236,9 +263,9 @@ Ring *ring;
  * Return the number of CONSECUTIVE bytes available for consuming.
  * However, don't return more than enough to cross over set mark.
  */
  * Return the number of CONSECUTIVE bytes available for consuming.
  * However, don't return more than enough to cross over set mark.
  */

-int
+    int

 ring_full_consecutive(ring)
 ring_full_consecutive(ring)

-Ring *ring;
+    Ring *ring;

 {
     if ((ring->mark == 0) || (ring->mark == ring->consume)) {
        if ((ring->supply < ring->consume) || ring_full(ring)) {
 {
     if ((ring->mark == 0) || (ring->mark == ring->consume)) {
        if ((ring->supply < ring->consume) || ring_full(ring)) {


@@ -258,11 +285,11 @@ Ring *ring;
 /*
  * Move data into the "supply" portion of of the ring buffer.
  */
 /*
  * Move data into the "supply" portion of of the ring buffer.
  */

-void
+    void

 ring_supply_data(ring, buffer, count)
 ring_supply_data(ring, buffer, count)

-Ring *ring;
-char *buffer;
-int count;
+    Ring *ring;
+    unsigned char *buffer;
+    int count;

 {
     int i;
 
 {
     int i;
 


@@ -280,11 +307,11 @@ int count;
 /*
  * Move data from the "consume" portion of the ring buffer
  */
 /*
  * Move data from the "consume" portion of the ring buffer
  */

-void
+    void

 ring_consume_data(ring, buffer, count)
 ring_consume_data(ring, buffer, count)

-Ring *ring;
-char *buffer;
-int count;
+    Ring *ring;
+    unsigned char *buffer;
+    int count;

 {
     int i;
 
 {
     int i;
 


@@ -297,3 +324,39 @@ int count;
     }
 }
 #endif
     }
 }
 #endif

+
+#if    defined(ENCRYPT)
+    void
+ring_encrypt(ring, encryptor)
+    Ring *ring;
+    void (*encryptor)();
+{
+    unsigned char *s, *c;
+
+    if (ring_empty(ring) || ring->clearto == ring->supply)
+       return;
+
+    if (!(c = ring->clearto))
+       c = ring->consume;
+
+    s = ring->supply;
+
+    if (s <= c) {
+       (*encryptor)(c, ring->top - c);
+       (*encryptor)(ring->bottom, s - ring->bottom);
+    } else
+       (*encryptor)(c, s - c);
+
+    ring->clearto = ring->supply;
+}
+
+    void
+ring_clearto(ring)
+    Ring *ring;
+{
+    if (!ring_empty(ring))
+       ring->clearto = ring->supply;
+    else
+       ring->clearto = 0;
+}
+#endif