d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove static in front of declarations for des_setkey and des_cipher

Browse Source 
so that linking against -lcrypt (-ldescrypt) will give us the good
versions instead of the stubs in libc.  (These changes need to be
made to the non-US version of libdescrypt too!)

Allow building and support for bdes program.
A bit more work still needs to be done on secure telnet.

Submitted by:	pst
This commit is contained in:
pst 1994-09-07 07:16:52 +00:00
parent 96c9b991de
commit 6239100975
6 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
secure/Makefile
View File

@ -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>

6
secure/lib/libcrypt/crypt-des.c
View File

@ -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;

6
secure/lib/libcrypt/crypt.c
View File

@ -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;

7
secure/usr.bin/Makefile Normal file
View File

@ -0,0 +1,7 @@
# $Id$
# XXX telnet still needs work
SUBDIR= bdes
.include <bsd.subdir.mk>

3
secure/usr.bin/Makefile.inc Normal file
View File

@ -0,0 +1,3 @@
# $Id$
BINDIR= /usr/bin

5
secure/usr.bin/bdes/Makefile
View File

@ -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>