From bf8f9d53f67f15eaacedab07f6f42981cce9754b Mon Sep 17 00:00:00 2001
From: Paul Traina <pst@FreeBSD.org>
Date: Wed, 7 Sep 1994 07:47:08 +0000
Subject: [PATCH] Back out static hacks & build of usr.bin until Geoff informs
 the world of his master plan.

Submitted by:	pst
---
 secure/Makefile                 | 5 +++--
 secure/lib/libcrypt/crypt-des.c | 6 +++---
 secure/lib/libcrypt/crypt.c     | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/secure/Makefile b/secure/Makefile
index a99f9d328f4d..fd492dd2dcfb 100644
--- a/secure/Makefile
+++ b/secure/Makefile
@@ -1,6 +1,7 @@
-#	$Id: Makefile,v 1.3 1994/08/12 21:02:17 csgr Exp $
+#	$Id: Makefile,v 1.4 1994/09/07 07:16:37 pst Exp $
 
-SUBDIR= lib usr.bin
+# XXX usr.bin out until Geoff's master plan is done
+SUBDIR= lib
 
 .include <bsd.subdir.mk>
 
diff --git a/secure/lib/libcrypt/crypt-des.c b/secure/lib/libcrypt/crypt-des.c
index 22f665c9b8f6..6d2250661065 100644
--- a/secure/lib/libcrypt/crypt-des.c
+++ b/secure/lib/libcrypt/crypt-des.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: crypt.c,v 1.2 1994/08/08 17:28:52 csgr Exp $
+ *	$Id: crypt.c,v 1.3 1994/09/07 07:16:44 pst Exp $
  *
  * This is an original implementation of the DES and the crypt(3) interfaces
  * by David Burren <davidb@werj.com.au>.
@@ -362,7 +362,7 @@ setup_salt(long salt)
 	}
 }
 
-int
+static int
 des_setkey(const char *key)
 {
 	u_long	k0, k1, rawkey0, rawkey1;
@@ -559,7 +559,7 @@ do_des(	u_long l_in, u_long r_in, u_long *l_out, u_long *r_out, int count)
 	return(0);
 }
 
-int
+static int
 des_cipher(const char *in, char *out, long salt, int count)
 {
 	u_long	l_out, r_out, rawl, rawr;
diff --git a/secure/lib/libcrypt/crypt.c b/secure/lib/libcrypt/crypt.c
index 22f665c9b8f6..6d2250661065 100644
--- a/secure/lib/libcrypt/crypt.c
+++ b/secure/lib/libcrypt/crypt.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: crypt.c,v 1.2 1994/08/08 17:28:52 csgr Exp $
+ *	$Id: crypt.c,v 1.3 1994/09/07 07:16:44 pst Exp $
  *
  * This is an original implementation of the DES and the crypt(3) interfaces
  * by David Burren <davidb@werj.com.au>.
@@ -362,7 +362,7 @@ setup_salt(long salt)
 	}
 }
 
-int
+static int
 des_setkey(const char *key)
 {
 	u_long	k0, k1, rawkey0, rawkey1;
@@ -559,7 +559,7 @@ do_des(	u_long l_in, u_long r_in, u_long *l_out, u_long *r_out, int count)
 	return(0);
 }
 
-int
+static int
 des_cipher(const char *in, char *out, long salt, int count)
 {
 	u_long	l_out, r_out, rawl, rawr;