summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--secure/Makefile4
-rw-r--r--secure/lib/libcrypt/crypt-des.c6
-rw-r--r--secure/lib/libcrypt/crypt.c6
-rw-r--r--secure/usr.bin/Makefile7
-rw-r--r--secure/usr.bin/Makefile.inc3
-rw-r--r--secure/usr.bin/bdes/Makefile5
6 files changed, 23 insertions, 8 deletions
diff --git a/secure/Makefile b/secure/Makefile
index 9df15e1..a99f9d3 100644
--- a/secure/Makefile
+++ b/secure/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.2 1994/08/08 17:49:22 csgr Exp $
+# $Id: Makefile,v 1.3 1994/08/12 21:02:17 csgr Exp $
-SUBDIR= lib
+SUBDIR= lib usr.bin
.include <bsd.subdir.mk>
diff --git a/secure/lib/libcrypt/crypt-des.c b/secure/lib/libcrypt/crypt-des.c
index 50199ce2..22f665c 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.4 1994/05/01 08:16:38 g89r4222 Exp $
+ * $Id: crypt.c,v 1.2 1994/08/08 17:28:52 csgr 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)
}
}
-static int
+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);
}
-static int
+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 50199ce2..22f665c 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.4 1994/05/01 08:16:38 g89r4222 Exp $
+ * $Id: crypt.c,v 1.2 1994/08/08 17:28:52 csgr 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)
}
}
-static int
+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);
}
-static int
+int
des_cipher(const char *in, char *out, long salt, int count)
{
u_long l_out, r_out, rawl, rawr;
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
new file mode 100644
index 0000000..a539739
--- /dev/null
+++ b/secure/usr.bin/Makefile
@@ -0,0 +1,7 @@
+# $Id$
+
+# XXX telnet still needs work
+SUBDIR= bdes
+
+.include <bsd.subdir.mk>
+
diff --git a/secure/usr.bin/Makefile.inc b/secure/usr.bin/Makefile.inc
new file mode 100644
index 0000000..7883d47
--- /dev/null
+++ b/secure/usr.bin/Makefile.inc
@@ -0,0 +1,3 @@
+# $Id$
+
+BINDIR= /usr/bin
diff --git a/secure/usr.bin/bdes/Makefile b/secure/usr.bin/bdes/Makefile
index 9166f72..8aa71d4 100644
--- a/secure/usr.bin/bdes/Makefile
+++ b/secure/usr.bin/bdes/Makefile
@@ -1,5 +1,10 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $Id$
PROG= bdes
+SRCS= bdes.c
+
+LDADD+= -lcrypt
+DPADD+= /usr/lib/libcrypt.a
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud