1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-25 11:37:56 +00:00
Commit Graph

281 Commits

Author SHA1 Message Date
David E. O'Brien
14a8a54168 /dev/urandom is the default random device, so no use in stateing it here.
Also simplify the conditionals a little.
2000-05-15 23:29:03 +00:00
David E. O'Brien
f254f0ac49 This version is slightly better than rev 1.10. There are still missing
dependencies for openssl/*.h.  I cannot reproduce any critical race
conditions with this revision.
2000-05-15 17:28:06 +00:00
David E. O'Brien
f80c5c4a34 Use unadorned `mkdir -p', removing the "test ... ||".
There are sometimes problems with "&&" and "||" in the `make -j' case, as
it appears multiple processes may process parts of the execution line.
2000-05-15 16:52:57 +00:00
Kris Kennaway
4fc9354419 Update for OpenSSH 2.1 2000-05-15 05:26:50 +00:00
Kris Kennaway
0ae5a27cf8 Use the C locale for running date(1).
Submitted by:	ache
2000-04-20 07:26:46 +00:00
Kris Kennaway
9ccbd450e8 Update for OpenSSL 0.9.5a and clean up a bit. 2000-04-13 07:37:35 +00:00
Kris Kennaway
a7aaf459e7 Update for OpenSSL 0.9.5a and clean up a bit.
Take responsibility for this makefile again :-)
2000-04-13 07:37:26 +00:00
David E. O'Brien
63bfdbdb0a * Fix dependancies so that ``make depend'' is not required.
* Some style fixes

Approved by:	kris
2000-04-11 09:27:24 +00:00
David E. O'Brien
2461ce422b * Fix dependancies so that ``make depend'' is not required.
* Some style fixes

Approved by:	kris
2000-04-11 08:28:47 +00:00
Kris Kennaway
aad873b098 Add libcrypto to LDADD. This fixes problems seen with e.g. apache-modssl
Submitted by:	Jim Bloom <bloom@acm.org>
2000-04-04 07:31:01 +00:00
Kris Kennaway
9fd4066575 Add a new function stub to libcrypto() which resolves to a symbol in
the librsa* library and reports which version of the library (OpenSSL/RSAREF)
is being used.

This is then used in openssh to detect the failure case of RSAREF and a RSA key
>1024 bits, to print a more helpful error message than 'rsa_public_encrypt() fai
led.'

This is a 4.0-RELEASE candidate.
2000-03-13 09:55:53 +00:00
Kris Kennaway
d7d9ad4214 Build a shared library too - ports expect it.
Reviewed by:	peter
Approved by:	jkh
2000-03-07 20:55:55 +00:00
Peter Wemm
5a0a2ee966 Merge from internat.freebsd.org; cleanup stray rsaref glue code reference 2000-03-05 14:20:57 +00:00
Kris Kennaway
a5ee11a77a Resurrect the old libdes manpages (after a repo copy) until we have better
ones.
2000-03-02 06:06:35 +00:00
Peter Wemm
3187486c8a Merge from internat.freebsd.org: add libcrypto to librsaUSA's symbol search
path so that ERR_load_strings() is found in certain circumstances
involving dlopen().  eg: main program dlopened foo.so which is linked
against libcrypto.  If libcrypto then dlopens librsaUSA.so, then it's
search path doens't find libcrypto (!).  One "fix" is to force
modules (eg main opening foo.so) to use the RTLD_GLOBAL flag, the other
is to explicitly declare dependencies (as done here).
2000-03-02 05:22:46 +00:00
Mark Murray
87afaaf75a MFI: stupid typo of mine. 2000-02-29 09:56:11 +00:00
Kris Kennaway
06f13592e1 Add NODESCRYPTLINKS knob to prevent spamming of libcrypt -> libscrypt
symlinks. The name is against my better judgement, but I defer to ancient
tradition here because I'm a nice guy.

Reviewed by:	-current
2000-02-29 05:47:52 +00:00
Mark Murray
e1eaf14cd7 New distribution names. 2000-02-28 19:25:34 +00:00
Peter Wemm
9fa5f5fd96 Merge from internat.freebsd.org repo, minus change to rsa_eay.c (missing)
Reorganize and unify libcrypto's interface so that the RSA implementation
is chosen at runtime via dlopen().

This is a checkpoint and may require more tweaks still.
2000-02-26 13:13:03 +00:00
Peter Wemm
cfd62b902e Merge from internat.freebsd.org; make RSAREF=YES work correctly, although
this is not very useful as the US repo is missing bits.
2000-02-25 14:08:35 +00:00
Peter Wemm
6681286022 Create a stub libRSAglue for bsd.port.mk's sake 2000-02-25 09:47:17 +00:00
Peter Wemm
07a0979e84 Fold libRSAglue into libcrypto so we don't have to special-case
all the builds.  There is still no actual RSA implementation code
in libcrypto or src/* on US code trees.
2000-02-25 08:18:43 +00:00
Peter Wemm
08c0f1c7dd Sync with internat; delete a trailing space 2000-02-25 05:35:37 +00:00
Mark Murray
51a4536595 Remove port components not needed in 4.n+
Submitted by:	Half the freaking planet....
2000-02-24 22:39:24 +00:00
Mark Murray
b87f0bc988 libdes is OBE 2000-02-24 19:08:24 +00:00
Mark Murray
c9f2d5f483 Build everything properly. This means:
o Don't b uild libdes.

o Crypto is now housed in libcrypto (with a compatability symlink to
  libdes)

o RSA may depend on RSAREF at your locale.

o OpenSSH is now a part of the base system.
2000-02-24 18:59:34 +00:00
Mark Murray
c23e256eef Add the OpenSSH userland-building Makefiles. 2000-02-24 17:00:55 +00:00
Mark Murray
228c5a5af7 Freefall/Internat diff reducer. 2000-02-24 10:37:29 +00:00
Mark Murray
22dcf83566 Freefall/Internat diff reducer. 2000-02-24 10:21:56 +00:00
Mark Murray
1b87af6b57 Freefall/Internat diff reducer. 2000-02-24 10:06:57 +00:00
Kris Kennaway
c6680962bf Add NO_OPENSSL knob to turn off building of openssl
Requested by:	wollman
2000-01-30 04:11:37 +00:00
Kris Kennaway
04c111ac5f Activate librsaglue 2000-01-20 07:27:49 +00:00
Kris Kennaway
486bbb25ef Move the rsaref gunk to libRSAglue where ports expect it. 2000-01-20 07:27:38 +00:00
Kris Kennaway
5afe765e66 Build infrastructure for libRSAglue, required for compatability with
ports even though it doesn't seem to do anything which requires it
to be separate from libcrypto.
2000-01-20 07:24:40 +00:00
Kris Kennaway
3e3bfbad52 Turn back on libcrypto and libssl building. 2000-01-16 05:24:47 +00:00
Kris Kennaway
ac242a29d9 *** empty log message *** 2000-01-16 05:19:27 +00:00
Kris Kennaway
2f00e5fdc4 Add MAINTAINER tag so people don't feel the need to randomly frob with this. 2000-01-16 02:20:03 +00:00
Brian Feldman
d82f495687 We cannot have libcrypto, and therefore OpenSSL at all, without RSA.
If you need examples of breakage, I'm ready to provide more than a
few.
2000-01-15 18:02:10 +00:00
Kris Kennaway
45b8027e25 Connect OpenSSL to the build. 2000-01-14 08:01:51 +00:00
Kris Kennaway
41e8e5da52 Build infrastructure for OpenSSL 2000-01-14 05:49:29 +00:00
Kris Kennaway
63f691b33c Really really remove SHA-1 support. 2000-01-09 21:22:48 +00:00
Mark Murray
8ab773c3cf Routines needed by new kerberos. 2000-01-09 10:09:40 +00:00
Jordan K. Hubbard
e63a240576 Remove the SHA stuff properly. 2000-01-08 03:01:13 +00:00
Peter Wemm
1a9527eaaa I missed the LDADD/DPADD for -lmd in the secure cases. :-(
Pointed out by: marcel
1999-12-19 16:50:33 +00:00
Mark Murray
1a19815c14 Dont build telenet if we are going for kerberised telnet; this just
jumps all over kerberised telnet otherwise.
1999-10-12 19:48:05 +00:00
Mark Murray
d14fc57cb7 Make telnet with SRA work.
Submitted by:	Nick Sayer
1999-10-07 19:47:09 +00:00
Mark Murray
e267a66620 Colour me stupid. This is a better way of using the macros. 1999-09-21 22:13:07 +00:00
Mark Murray
af37a7967b Do this the same way as Internat to reduce diffs. 1999-09-21 17:57:09 +00:00
Dmitrij Tejblum
462da152d2 Someone changed major numbers of the libraries from 2 to 3 for 0 (zero) reasons.
Revert the major number back to 2.

libcrypt only export one function, before the recent changes and now:
char *crypt(const char *key, const char *salt);
The prototype didn't changed. Internal representation of `char' and `char *'
didn't changed. Therefore, there is no reason to change the version number.
1999-09-21 17:52:05 +00:00
Peter Wemm
6fd36d7d11 Restore SONAME setting, otherwise libdescrypt.so.3 doesn't end up with
a special SONAME of libcrypt.so.3 and the runtime symlink doesn't work.
1999-09-21 14:47:36 +00:00
Mark Murray
e1e54354b5 Make this completely dependant on the exportable libcrypt, to avoid
duplication of effort. Also a large cleanup of the code, inspired
by Brandon Gillespie.
1999-09-20 12:40:06 +00:00
Mark Murray
5cd82127f8 libdes is bmaked and built from src/crypto/... now. 1999-09-19 18:49:58 +00:00
Mark Murray
056bcb03a1 This commit was generated by cvs2svn to compensate for changes in r50894,
which included commits to RCS files with non-trunk default branches.
1999-09-04 12:45:43 +00:00
Mark Murray
caf39ecc96 Vendor import EAY's LIBSSL to fix comments, etc. 1999-09-04 12:45:43 +00:00
Mark Murray
0a21b04f59 Drat. Import this into the right place. Pass me the pointy hat. 1999-09-01 19:59:25 +00:00
Mark Murray
778981c288 This commit was generated by cvs2svn to compensate for changes in r50760,
which included commits to RCS files with non-trunk default branches.
1999-09-01 19:59:25 +00:00
Peter Wemm
a1a4f1a0d8 $Header$ -> $FreeBSD$ 1999-08-28 05:11:36 +00:00
Peter Wemm
97d92980a9 $Id$ -> $FreeBSD$ 1999-08-28 01:35:59 +00:00
Mike Pritchard
36b3fda178 Various man page cleanup:
- Be consistent with section names as outlined in mdoc(7).
- Other misc mdoc cleanup.
1999-08-15 10:01:15 +00:00
Mark Murray
1b340441b7 Fix symlinking. Without the -f "force" option, the wrong version
can be found.
Submitted by:   Bruce
1999-01-24 07:51:33 +00:00
Mark Murray
945c0b6dde The new crypt code breaks "make world". Back it out. 1999-01-23 08:26:11 +00:00
Brandon Gillespie
5287069da8 Removed from the secure/lib/libcrypt area, because of the rewrite to how
the Makefile handles des support by just including the single .c file.

Reviewed by:	Mark Murray
1999-01-21 13:51:49 +00:00
John Birrell
7dcd8b7c45 BINFORMAT -> OBJFORMAT ready for E-day. Untested 'cause I'm outside
the US and not allowed to see this. I kept my eyes closed. 8-)
1998-08-31 00:35:10 +00:00
Mark Murray
4586e1abc5 Staticise a variable.
PR:		4722
Submitted by:	Karl Denninger
1997-10-08 07:02:48 +00:00
Peter Wemm
a99f0e8211 Teach libdescrypt about elf builds. 1997-09-05 12:21:22 +00:00
Peter Wemm
c0ec1f37ef Revert $FreeBSD$ to $Id$ 1997-02-22 14:40:44 +00:00
Jordan K. Hubbard
1130b656e5 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
Wolfram Schneider
af20215665 Sort cross references. 1997-01-13 00:25:51 +00:00
Mark Murray
4ee026279c Secure telnet is now in eBones. 1996-11-07 14:42:57 +00:00
Peter Wemm
e7d24931fe cmp -s || install -c --> install -C 1996-08-30 04:07:04 +00:00
Mark Murray
43e844cb02 Next version from the author - from SSLeay.0.6.3 1996-08-10 17:19:16 +00:00
Mark Murray
67d29e2c6c This commit was generated by cvs2svn to compensate for changes in r17497,
which included commits to RCS files with non-trunk default branches.
1996-08-10 17:19:16 +00:00
Mark Murray
f3d1114f33 Some breakeages sneaked in. This fixes them.
(this relates to a name change in a library that was not properly backed
up by the author)
Reported by: too mant :-(
1996-07-30 21:09:48 +00:00
Mark Murray
43f15e7154 Merge, remove rubbish and bump the MAJOR.MINOR to 3.0 1996-07-29 18:01:42 +00:00
Mark Murray
f2c335efd5 Rats. Just when a piece of code is nice and stable, the author has to
release an upgrade.
1996-07-29 17:54:40 +00:00
Mark Murray
1700adf407 This commit was generated by cvs2svn to compensate for changes in r17330,
which included commits to RCS files with non-trunk default branches.
1996-07-29 17:54:40 +00:00
Mark Murray
6c4a37eb3a Mrege conflicts etc. 1996-07-28 08:23:19 +00:00
Mark Murray
de59bba0c5 Latest libdes from Eric Young. Mainly code beautification. 1996-07-28 08:18:06 +00:00
Mark Murray
9f2bc96e40 This commit was generated by cvs2svn to compensate for changes in r17315,
which included commits to RCS files with non-trunk default branches.
1996-07-28 08:18:06 +00:00
Jordan K. Hubbard
187eb1e177 Add necessary item to CLEANFILES 1996-07-27 22:16:19 +00:00
Jordan K. Hubbard
cd9a2f5c28 Bring in my changes for removing the pestilent obj links (unless you
really want them) from /usr/src.  This is the final version of the
patches, incorporating the feedback I've received from -current.
1996-06-24 04:26:21 +00:00
Mark Murray
42f2698195 Add randomness from /dev/random if it is available. 1996-05-04 07:25:54 +00:00
Mark Murray
c5cdf2c7f4 Split libcrypt and libcipher man pages. 1996-04-13 08:18:24 +00:00
Mark Murray
bb230f68ca Split the libcrypt and libcipher man pages. 1996-04-13 08:03:24 +00:00
Mike Pritchard
cad56be80a Install crypt.3 so that libcipher will install if /usr/share/man
has been blown away.  Previously it depended on an existing
crypt.3 to be present for the man page links to install properly.
1996-04-09 17:20:33 +00:00
Mark Murray
18992ffaea Comment out the NOPROFILE=yes to make this orthogonal with the rest of our
libs.
1996-03-17 15:43:32 +00:00
Mark Murray
6dd8a38202 Big clean-up job. Remove ancient and never-to-be used stuff.
The look much more like BSD Makefiles now.
1996-03-11 16:17:58 +00:00
Mark Murray
7c9dcdde00 Fix typo #ifdef -> .if defined().
Tidy uo this file a bit.
1996-03-11 06:22:50 +00:00
Mark Murray
d825f2fad0 Fix typo - -des -> -ldes 1996-03-10 21:15:00 +00:00
Andrey A. Chernov
a0e2ca089a Sense MAKE_EBONES, DESTDIR
SRCS cleanup
DPADD cleanup
1996-03-09 13:36:34 +00:00
Jordan K. Hubbard
1c934dae3e Add back missing crypt.3 man page. 1996-02-21 08:15:08 +00:00
Mike Pritchard
bcff8e2ae4 Another round of man page cleanups.
Down to only about 100 items left to cleanup! :-)
1996-02-12 04:57:03 +00:00
Mark Murray
14a23345e6 Add the new libdes to the build 1996-02-11 08:46:59 +00:00
Mark Murray
fffad2951a Rats. Forgot to `cvs add' this. 1996-02-10 23:49:27 +00:00
Mark Murray
537c20ded7 iImport a FreeBSD Makefile, BSD-ise the header and correct a typo. As the
interface has changed a bit (there are more rentry points), the
shared library has been bumped to libdes.so.2.1.
1996-02-10 15:54:48 +00:00
Mark Murray
3a8043c232 This is the long-awaited new DES library. Over the next couple of days
will be properly built into the system.
1996-02-10 15:32:26 +00:00
Mark Murray
568f3a3d5a This commit was generated by cvs2svn to compensate for changes in r14009,
which included commits to RCS files with non-trunk default branches.
1996-02-10 15:32:26 +00:00
Mark Murray
96e718fe29 Dual personality crypt(3). This crypt will choose its encryption algorithm
(DES or MD5) based on the type of salt used. Salt beginning with "$1$"
indicates MD5.
1995-12-16 09:14:12 +00:00
Justin T. Gibbs
9d01cc32c6 Remove MAKE_EBONES conditionals. They were originally placed here because
of missing functionality in our libkrb which is no longer a problem.
1995-10-11 00:04:09 +00:00
Andrey A. Chernov
d6cf037780 Remove duplicated targets which now build from main tree
if available and allowed
1995-09-29 20:23:09 +00:00
Justin T. Gibbs
9d6965ac06 Enable kerberosIV authentication/encryption conditionalized on MAKE_EBONES.
Fix up some of the des calls to be compatible with eBones.
1995-09-14 21:29:08 +00:00
Andrey A. Chernov
0a06628ab2 Comment out LDADD+=-ldescrypt, it is not yet active due to
missng defines for krb4encpwd and rsaencpwd and missing rsa library too.
1995-08-05 19:10:25 +00:00
Mark Murray
d5fc4d2a65 After pst and ache fixed secure telnet, it was still not in the main
makefiles. This puts it in.

PLEASE NOTE - YOU WILL NEED TO BUILD AND INSTALL THE libtelnet IN secure/
Reviewed by:
Submitted by:
Obtained from:
1995-07-29 12:49:25 +00:00
Andrey A. Chernov
9ed77b336f Final cleanup pass through Makefiles, now this stuff
autodetect kerberos/eBones and work even with eBones,
but with reduced functionality (don't pick up des/krb stuff
in this case)
1995-07-24 22:55:59 +00:00
Andrey A. Chernov
6b370f4c7e Add LDADD+= -ldescrypt
Reviewed by:
Submitted by:
Obtained from:
1995-07-24 21:57:58 +00:00
Andrey A. Chernov
b6c080f6bc Move -ldes under kerb stuff, my fault
Reviewed by:
Submitted by:
Obtained from:
1995-07-24 21:49:06 +00:00
Andrey A. Chernov
3b901a0b79 Since this stuff not works with eBones, ifdef kerberos stuff
with MAKE_KERBEROS to allow other things to live
Submitted by:
Obtained from:
1995-07-24 21:38:32 +00:00
Andrey A. Chernov
7170827e21 Add comment about new_rbd_key.c module needed from
original libdes
1995-07-24 21:10:47 +00:00
Andrey A. Chernov
bfdd0041fc Fix many bogus things, typing error, dependance errors, etc.,
now it compiles.
Note: this stuff requires original libdes, not libdes from
Eric Yang which we have in eBones.
1995-07-24 20:29:12 +00:00
Paul Traina
9809ff32f6 Update telnet to the 95.05.31 release.
Obtained from:	Dave Borman <dab@cray.com>
1995-07-20 11:40:06 +00:00
Rodney W. Grimes
5ebc7e6281 Remove trailing whitespace. 1995-05-30 06:12:45 +00:00
Dima Ruban
399e5b4411 Security fixes.
CERT Advisory CA-95:03.telnet.encryption

Obtained from: CERT
1995-02-17 03:57:00 +00:00
Poul-Henning Kamp
2ef260d35c Fix secrdist sharedlib bug. 1994-11-24 22:34:18 +00:00
Poul-Henning Kamp
f079582484 Make the "distribute" target build the "des" distribution. Make des'ed
init and ed, by pointing to real sources.
1994-11-14 20:45:35 +00:00
Geoff Rehmet
49de41577e More elegant fix for short settings.
(Our existing fixes already plugged the security holes involved.)
Submitted by:	Geoff Rehmet after consultation with David Burren
1994-09-19 19:26:39 +00:00
Geoff Rehmet
77b06a9b6c fix bogus .include
Submitted by:	Geoff.
1994-09-09 09:43:18 +00:00
Geoff Rehmet
daf0f855ad add libcipher to Makefile
Submitted by:	Geoff.
1994-09-08 19:06:58 +00:00
Geoff Rehmet
37ea1bf4c9 - Remove crypt() - it's in libcrypt
- remove ^L's - CTM will probably choke on them
- add PRECIOUSLIB to Makefile
- name changes libcrypt -> libcipher
Submitted by:	Geoff.
1994-09-07 21:48:54 +00:00
Geoff Rehmet
8b2981f937 Bring in the 1.1.x international libcrypt, which
will in due course become libcipher.
Based on David Burren's FreeSEC
Submitted by:	Geoff.
1994-09-07 21:18:08 +00:00
Paul Traina
bf8f9d53f6 Back out static hacks & build of usr.bin until Geoff informs the
world of his master plan.

Submitted by:	pst
1994-09-07 07:47:08 +00:00
Paul Traina
21b4fe120d Remove static in front of declarations for des_setkey and des_cipher
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
1994-09-07 07:16:52 +00:00
Garrett Wollman
ef17cd2157 Hopefully fix bogus permissions. 1994-08-26 23:31:11 +00:00
Garrett Wollman
52780bc5c4 Install libdescrypt.so immutable. 1994-08-26 19:03:23 +00:00
Geoff Rehmet
db5408c498 Fix afterinstall rule for generating links to the real libcrypt
Submitted by:	Geoff
1994-08-20 18:16:57 +00:00
Geoff Rehmet
040d596f3e Libtelnet with encryption goes walkies to src/secure/lib
Reviewed by:	Geoff Rehmet
1994-08-12 22:03:01 +00:00
Geoff Rehmet
f09e7cba42 when making test programs, look for libdescrypt, not libcrypt
Submitted by:	Geoff Rehmet
1994-08-12 21:55:04 +00:00
Geoff Rehmet
b1c75fb65d 1) don't make bdes yet
2) fix .include in secure/lib/Makefile.inc
3) fix afterinstall rule in libcrypt/Makefile
Submitted by:	Geoff Rehmet
1994-08-12 21:02:31 +00:00
Geoff Rehmet
7dc2bee339 Install secure/lib/libcrypt as libdescrypt, and symlink it to
libcrypt.  There may be a little modification neede to this makefile once
we start working on tidy make world's.
Submitted by:	geoff.
1994-08-09 18:52:52 +00:00
Geoff Rehmet
b7dd315906 add Makefiles for secure/lib. Makefile.inc just includes src/lib/Makefile.inc
in order to get things like SHLIB_MAJOR etc.
1994-08-08 17:42:36 +00:00
Geoff Rehmet
712ca8b499 Modify libcrypt so that the only exported symbol is _crypt().
Submitted by:	 Geoff Rehmet
1994-08-08 17:29:04 +00:00
Geoff Rehmet
c4f09032cb Unecumbered securedist from FreeBSD 1.1.5.1 - sources for libcrypt.
The next commit will remove all symbols except _crypt()
Reviewed by:	Geoff Rehmet
Submitted by:	David Burren
1994-08-08 17:18:09 +00:00