Subject: lib/1099: compile warnings in libcrypt
To: None <gnats-admin@sun-lamp.cs.berkeley.edu>
From: Thorsten Lockert <tholo@SigmaSoft.COM>
List: netbsd-bugs
Date: 06/03/1995 15:20:07
>Number:         1099
>Category:       lib
>Synopsis:       compile warnings in libcrypt
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lib-bug-people (Library Bug People)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jun  3 15:20:03 1995
>Originator:     Thorsten Lockert
>Organization:
SigmaSoft, Th. Lockert
>Release:        May 28, 1995
>Environment:
	
System: NetBSD gandalf.sigmasoft.com 1.0A NetBSD 1.0A (GANDALF) #1: Sun May 7 21:49:27 PDT 1995 tholo@gandalf.sigmasoft.com:/usr/src/sys/arch/i386/compile/GANDALF i386


>Description:
	There are multiple compile warnings in the crypt library

>How-To-Repeat:
	Compile with -Wall -Wstrict-prototypes

>Fix:
	Apply the following patches:

*** src/lib/libcrypt/crypt.c.orig	Sat Jun  3 15:02:11 1995
--- src/lib/libcrypt/crypt.c	Sat Jun  3 15:11:18 1995
***************
*** 100,114 ****
  #define	LARGEDATA
  #endif
  
- /* compile with "-DSTATIC=int" when profiling */
- #ifndef STATIC
- #define	STATIC	static
- #endif
- STATIC init_des(), init_perm(), permute();
- #ifdef DEBUG
- STATIC prtab();
- #endif
- 
  /* ==================================== */
  
  /*
--- 100,105 ----
***************
*** 286,292 ****
  #define	PERM3264(d,d0,d1,cpp,p)				\
  	{ C_block tblk; permute(cpp,&tblk,p,4); LOAD (d,d0,d1,tblk); }
  
! STATIC
  permute(cp, out, p, chars_in)
  	unsigned char *cp;
  	C_block *out;
--- 277,294 ----
  #define	PERM3264(d,d0,d1,cpp,p)				\
  	{ C_block tblk; permute(cpp,&tblk,p,4); LOAD (d,d0,d1,tblk); }
  
! /* compile with "-DSTATIC=int" when profiling */
! #ifndef STATIC
! #define	STATIC	static
! #endif
! STATIC void init_des __P((void));
! STATIC void init_perm __P((C_block [64/CHUNKBITS][1<<CHUNKBITS], unsigned char [64], int, int));
! STATIC void permute __P((unsigned char *, C_block *, C_block *, int));
! #ifdef DEBUG
! STATIC void prtab __P((char *, unsigned char *, int));
! #endif
! 
! STATIC void
  permute(cp, out, p, chars_in)
  	unsigned char *cp;
  	C_block *out;
***************
*** 365,409 ****
  
  static unsigned char S[8][64] = {	/* 48->32 bit substitution tables */
  					/* S[1]			*/
! 	14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
! 	 0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
! 	 4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
! 	15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13,
  					/* S[2]			*/
! 	15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
! 	 3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
! 	 0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
! 	13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9,
  					/* S[3]			*/
! 	10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
! 	13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
! 	13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
! 	 1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12,
  					/* S[4]			*/
! 	 7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
! 	13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
! 	10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
! 	 3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14,
  					/* S[5]			*/
! 	 2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
! 	14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
! 	 4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
! 	11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3,
  					/* S[6]			*/
! 	12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
! 	10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
! 	 9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
! 	 4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13,
  					/* S[7]			*/
! 	 4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
! 	13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
! 	 1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
! 	 6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12,
  					/* S[8]			*/
! 	13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
! 	 1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
! 	 7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
! 	 2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11,
  };
  
  static unsigned char P32Tr[] = {	/* 32-bit permutation function */
--- 367,411 ----
  
  static unsigned char S[8][64] = {	/* 48->32 bit substitution tables */
  					/* S[1]			*/
! 	{ 14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
! 	   0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
! 	   4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
! 	  15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13 },
  					/* S[2]			*/
! 	{ 15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
! 	   3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
! 	   0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
! 	  13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9 },
  					/* S[3]			*/
! 	{ 10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
! 	  13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
! 	  13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
! 	   1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12 },
  					/* S[4]			*/
! 	{  7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
! 	  13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
! 	  10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
! 	   3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14 },
  					/* S[5]			*/
! 	{  2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
! 	  14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
! 	   4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
! 	  11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3 },
  					/* S[6]			*/
! 	{ 12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
! 	  10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
! 	   9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
! 	   4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13 },
  					/* S[7]			*/
! 	{  4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
! 	  13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
! 	   1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
! 	   6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12 },
  					/* S[8]			*/
! 	{ 13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
! 	   1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
! 	   7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
! 	   2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11 }
  };
  
  static unsigned char P32Tr[] = {	/* 32-bit permutation function */
***************
*** 569,574 ****
--- 571,577 ----
  /*
   * Set up the key schedule from the key.
   */
+ int
  des_setkey(key)
  	register const char *key;
  {
***************
*** 603,608 ****
--- 606,612 ----
   * NOTE: the performance of this routine is critically dependent on your
   * compiler and machine architecture.
   */
+ int
  des_cipher(in, out, salt, num_iter)
  	const char *in;
  	char *out;
***************
*** 722,728 ****
   * Initialize various tables.  This need only be done once.  It could even be
   * done at compile time, if the compiler were capable of that sort of thing.
   */
! STATIC
  init_des()
  {
  	register int i, j;
--- 726,732 ----
   * Initialize various tables.  This need only be done once.  It could even be
   * done at compile time, if the compiler were capable of that sort of thing.
   */
! STATIC void
  init_des()
  {
  	register int i, j;
***************
*** 866,872 ****
   *
   * "perm" must be all-zeroes on entry to this routine.
   */
! STATIC
  init_perm(perm, p, chars_in, chars_out)
  	C_block perm[64/CHUNKBITS][1<<CHUNKBITS];
  	unsigned char p[64];
--- 870,876 ----
   *
   * "perm" must be all-zeroes on entry to this routine.
   */
! STATIC void
  init_perm(perm, p, chars_in, chars_out)
  	C_block perm[64/CHUNKBITS][1<<CHUNKBITS];
  	unsigned char p[64];
***************
*** 890,895 ****
--- 894,900 ----
  /*
   * "setkey" routine (for backwards compatibility)
   */
+ int
  setkey(key)
  	register const char *key;
  {
***************
*** 910,915 ****
--- 915,921 ----
  /*
   * "encrypt" routine (for backwards compatibility)
   */
+ int
  encrypt(block, flag)
  	register char *block;
  	int flag;
***************
*** 938,944 ****
  }
  
  #ifdef DEBUG
! STATIC
  prtab(s, t, num_rows)
  	char *s;
  	unsigned char *t;
--- 944,950 ----
  }
  
  #ifdef DEBUG
! STATIC void
  prtab(s, t, num_rows)
  	char *s;
  	unsigned char *t;
*** src/domestic/libcrypt/crypt.c.orig	Sun Feb 19 04:41:48 1995
--- src/domestic/libcrypt/crypt.c	Sat Jun  3 15:15:40 1995
***************
*** 100,114 ****
  #define	LARGEDATA
  #endif
  
- /* compile with "-DSTATIC=int" when profiling */
- #ifndef STATIC
- #define	STATIC	static
- #endif
- STATIC init_des(), init_perm(), permute();
- #ifdef DEBUG
- STATIC prtab();
- #endif
- 
  /* ==================================== */
  
  /*
--- 100,105 ----
***************
*** 286,292 ****
  #define	PERM3264(d,d0,d1,cpp,p)				\
  	{ C_block tblk; permute(cpp,&tblk,p,4); LOAD (d,d0,d1,tblk); }
  
! STATIC
  permute(cp, out, p, chars_in)
  	unsigned char *cp;
  	C_block *out;
--- 277,294 ----
  #define	PERM3264(d,d0,d1,cpp,p)				\
  	{ C_block tblk; permute(cpp,&tblk,p,4); LOAD (d,d0,d1,tblk); }
  
! /* compile with "-DSTATIC=int" when profiling */
! #ifndef STATIC
! #define	STATIC	static
! #endif
! STATIC void init_des __P((void));
! STATIC void init_perm __P((C_block [64/CHUNKBITS][1<<CHUNKBITS], unsigned char [64], int, int));
! STATIC void permute __P((unsigned char *, C_block *, C_block *, int));
! #ifdef DEBUG
! STATIC void prtab __P((char *, unsigned char *, int));
! #endif
! 
! STATIC void
  permute(cp, out, p, chars_in)
  	unsigned char *cp;
  	C_block *out;
***************
*** 365,409 ****
  
  static unsigned char S[8][64] = {	/* 48->32 bit substitution tables */
  					/* S[1]			*/
! 	14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
! 	 0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
! 	 4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
! 	15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13,
  					/* S[2]			*/
! 	15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
! 	 3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
! 	 0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
! 	13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9,
  					/* S[3]			*/
! 	10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
! 	13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
! 	13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
! 	 1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12,
  					/* S[4]			*/
! 	 7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
! 	13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
! 	10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
! 	 3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14,
  					/* S[5]			*/
! 	 2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
! 	14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
! 	 4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
! 	11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3,
  					/* S[6]			*/
! 	12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
! 	10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
! 	 9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
! 	 4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13,
  					/* S[7]			*/
! 	 4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
! 	13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
! 	 1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
! 	 6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12,
  					/* S[8]			*/
! 	13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
! 	 1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
! 	 7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
! 	 2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11,
  };
  
  static unsigned char P32Tr[] = {	/* 32-bit permutation function */
--- 367,411 ----
  
  static unsigned char S[8][64] = {	/* 48->32 bit substitution tables */
  					/* S[1]			*/
! 	{ 14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
! 	   0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
! 	   4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
! 	  15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13 },
  					/* S[2]			*/
! 	{ 15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
! 	   3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
! 	   0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
! 	  13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9 },
  					/* S[3]			*/
! 	{ 10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
! 	  13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
! 	  13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
! 	   1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12 },
  					/* S[4]			*/
! 	{  7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
! 	  13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
! 	  10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
! 	   3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14 },
  					/* S[5]			*/
! 	{  2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
! 	  14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
! 	   4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
! 	  11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3 },
  					/* S[6]			*/
! 	{ 12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
! 	  10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
! 	   9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
! 	   4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13 },
  					/* S[7]			*/
! 	{  4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
! 	  13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
! 	   1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
! 	   6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12 },
  					/* S[8]			*/
! 	{ 13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
! 	   1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
! 	   7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
! 	   2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11 }
  };
  
  static unsigned char P32Tr[] = {	/* 32-bit permutation function */
***************
*** 569,574 ****
--- 571,577 ----
  /*
   * Set up the key schedule from the key.
   */
+ int
  des_setkey(key)
  	register const char *key;
  {
***************
*** 603,608 ****
--- 606,612 ----
   * NOTE: the performance of this routine is critically dependent on your
   * compiler and machine architecture.
   */
+ int
  des_cipher(in, out, salt, num_iter)
  	const char *in;
  	char *out;
***************
*** 724,730 ****
   * Initialize various tables.  This need only be done once.  It could even be
   * done at compile time, if the compiler were capable of that sort of thing.
   */
! STATIC
  init_des()
  {
  	register int i, j;
--- 728,734 ----
   * Initialize various tables.  This need only be done once.  It could even be
   * done at compile time, if the compiler were capable of that sort of thing.
   */
! STATIC void
  init_des()
  {
  	register int i, j;
***************
*** 868,874 ****
   *
   * "perm" must be all-zeroes on entry to this routine.
   */
! STATIC
  init_perm(perm, p, chars_in, chars_out)
  	C_block perm[64/CHUNKBITS][1<<CHUNKBITS];
  	unsigned char p[64];
--- 872,878 ----
   *
   * "perm" must be all-zeroes on entry to this routine.
   */
! STATIC void
  init_perm(perm, p, chars_in, chars_out)
  	C_block perm[64/CHUNKBITS][1<<CHUNKBITS];
  	unsigned char p[64];
***************
*** 892,897 ****
--- 896,902 ----
  /*
   * "setkey" routine (for backwards compatibility)
   */
+ int
  setkey(key)
  	register const char *key;
  {
***************
*** 912,917 ****
--- 917,923 ----
  /*
   * "encrypt" routine (for backwards compatibility)
   */
+ int
  encrypt(block, flag)
  	register char *block;
  	int flag;
***************
*** 940,946 ****
  }
  
  #ifdef DEBUG
! STATIC
  prtab(s, t, num_rows)
  	char *s;
  	unsigned char *t;
--- 946,952 ----
  }
  
  #ifdef DEBUG
! STATIC void
  prtab(s, t, num_rows)
  	char *s;
  	unsigned char *t;
>Audit-Trail:
>Unformatted: