diff options
| author | Damien Miller <djm@mindrot.org> | 1999-11-25 11:54:57 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 1999-11-25 11:54:57 +1100 |
| commit | 5428f646ad32da88ddd04a8c287d595524674fbf (patch) | |
| tree | cc1f1e5d7852e1f44d41077f776abf7dab7ac06d /auth-skey.c | |
| parent | 9072e1889648988da38b7b81bce95291c1dc3a23 (diff) | |
| download | openssh-git-5428f646ad32da88ddd04a8c287d595524674fbf.tar.gz | |
- More reformatting merged from OpenBSD CVS
- Merged OpenBSD CVS changes:
- [channels.c]
report from mrwizard@psu.edu via djm@ibs.com.au
- [channels.c]
set SO_REUSEADDR and SO_LINGER for forwarded ports.
chip@valinux.com via damien@ibs.com.au
- [nchan.c]
it's not an error() if shutdown_write failes in nchan.
- [readconf.c]
remove dead #ifdef-0-code
- [readconf.c servconf.c]
strcasecmp instead of tolower
- [scp.c]
progress meter overflow fix from damien@ibs.com.au
- [ssh-add.1 ssh-add.c]
SSH_ASKPASS support
- [ssh.1 ssh.c]
postpone fork_after_authentication until command execution,
request/patch from jahakala@cc.jyu.fi via damien@ibs.com.au
plus: use daemon() for backgrounding
Diffstat (limited to 'auth-skey.c')
| -rw-r--r-- | auth-skey.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/auth-skey.c b/auth-skey.c index 457100cc..a0d786cb 100644 --- a/auth-skey.c +++ b/auth-skey.c @@ -1,11 +1,15 @@ #include "includes.h" #ifdef SKEY - RCSID("$Id: auth-skey.c,v 1.3 1999/11/23 22:25:52 markus Exp $"); #include "ssh.h" -#include <sha1.h> +#ifdef HAVE_OPENSSL +#include <openssl/sha1.h> +#endif +#ifdef HAVE_SSL +#include <ssl/sha1.h> +#endif /* from %OpenBSD: skeylogin.c,v 1.32 1999/08/16 14:46:56 millert Exp % */ |