===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/ring.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/telnet/ring.h	2003/06/03 02:56:18	1.6
--- src/usr.bin/telnet/ring.h	2014/07/19 23:50:38	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: ring.h,v 1.6 2003/06/03 02:56:18 millert Exp $	*/
  /*	$NetBSD: ring.h,v 1.5 1996/02/28 21:04:09 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: ring.h,v 1.7 2014/07/19 23:50:38 guenther Exp $	*/
  /*	$NetBSD: ring.h,v 1.5 1996/02/28 21:04:09 thorpej Exp $	*/
  
  /*
***************
*** 48,57 ****
  			*bottom,	/* lowest address in buffer */
  			*top,		/* highest address+1 in buffer */
  			*mark;		/* marker (user defined) */
- #if    defined(ENCRYPTION)
-     unsigned char	*clearto;       /* Data to this point is clear text */
-     unsigned char	*encryyptedto;  /* Data is encrypted to here */
- #endif
      int		size;		/* size in bytes of buffer */
      u_long	consumetime,	/* help us keep straight full, empty, etc. */
  		supplytime;
--- 48,53 ----
***************
*** 66,75 ****
  /* Data movement routines */
  extern void
  	ring_supply_data(Ring *ring, unsigned char *buffer, int count);
- #ifdef notdef
- extern void
- 	ring_consume_data(Ring *ring, unsigned char *buffer, int count);
- #endif
  
  /* Buffer state transition routines */
  extern void
--- 62,67 ----
***************
*** 82,94 ****
  	ring_empty_consecutive(Ring *ring),
  	ring_full_count(Ring *ring),
  	ring_full_consecutive(Ring *ring);
- 
- #if    defined(ENCRYPTION)
- extern void
- 	ring_encrypt (Ring *ring, void (*func)()),
- 	ring_clearto (Ring *ring);
- #endif
- 
  
  extern void
      ring_clear_mark(Ring *),
--- 74,79 ----