diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -21,6 +21,9 @@ | |||
21 | sshconnect1.c sshconnect2.c ssh-keysign.8 ssh-keysign.c Makefile.in] | 21 | sshconnect1.c sshconnect2.c ssh-keysign.8 ssh-keysign.c Makefile.in] |
22 | add /usr/libexec/ssh-keysign: a setuid helper program for hostbased | 22 | add /usr/libexec/ssh-keysign: a setuid helper program for hostbased |
23 | authentication in protocol v2 (needs to access the hostkeys). | 23 | authentication in protocol v2 (needs to access the hostkeys). |
24 | - markus@cvs.openbsd.org 2002/05/23 19:39:34 | ||
25 | [ssh.c] | ||
26 | add comment about ssh-keysign | ||
24 | 27 | ||
25 | 20020604 | 28 | 20020604 |
26 | - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed | 29 | - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed |
@@ -705,4 +708,4 @@ | |||
705 | - (stevesk) entropy.c: typo in debug message | 708 | - (stevesk) entropy.c: typo in debug message |
706 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 709 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
707 | 710 | ||
708 | $Id: ChangeLog,v 1.2149 2002/06/06 19:57:33 mouring Exp $ | 711 | $Id: ChangeLog,v 1.2150 2002/06/06 19:58:27 mouring Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.173 2002/05/23 19:24:30 markus Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.174 2002/05/23 19:39:34 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -683,6 +683,8 @@ again: | |||
683 | * in case we will need it later for combined rsa-rhosts | 683 | * in case we will need it later for combined rsa-rhosts |
684 | * authentication. This must be done before releasing extra | 684 | * authentication. This must be done before releasing extra |
685 | * privileges, because the file is only readable by root. | 685 | * privileges, because the file is only readable by root. |
686 | * If we cannot access the private keys, load the public keys | ||
687 | * instead and try to execute the ssh-keysign helper instead. | ||
686 | */ | 688 | */ |
687 | sensitive_data.nkeys = 0; | 689 | sensitive_data.nkeys = 0; |
688 | sensitive_data.keys = NULL; | 690 | sensitive_data.keys = NULL; |