diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
commit | d59fd3e421aa81b8e5e118f3f806081df2aca879 (patch) | |
tree | 356a4e607edc979c625bb33db63c656d771478bd /ssh-keysign.c | |
parent | 7505658c58e96b8d270f1928a0e1fa7f3e0c266b (diff) | |
parent | 45431c9b4677608680cd071768cbf156b316a7e8 (diff) |
Merge 3.7.1p2 to the trunk. I have absolutely no idea yet whether this will
work.
Diffstat (limited to 'ssh-keysign.c')
-rw-r--r-- | ssh-keysign.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c index 26c8faad2..c7ca5c4e4 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | #include "includes.h" | 24 | #include "includes.h" |
25 | RCSID("$OpenBSD: ssh-keysign.c,v 1.10 2003/03/13 11:42:19 markus Exp $"); | 25 | RCSID("$OpenBSD: ssh-keysign.c,v 1.13 2003/07/03 08:09:06 djm Exp $"); |
26 | 26 | ||
27 | #include <openssl/evp.h> | 27 | #include <openssl/evp.h> |
28 | #include <openssl/rand.h> | 28 | #include <openssl/rand.h> |
@@ -42,7 +42,8 @@ RCSID("$OpenBSD: ssh-keysign.c,v 1.10 2003/03/13 11:42:19 markus Exp $"); | |||
42 | #include "pathnames.h" | 42 | #include "pathnames.h" |
43 | #include "readconf.h" | 43 | #include "readconf.h" |
44 | 44 | ||
45 | uid_t original_real_uid; /* XXX readconf.c needs this */ | 45 | /* XXX readconf.c needs these */ |
46 | uid_t original_real_uid; | ||
46 | 47 | ||
47 | #ifdef HAVE___PROGNAME | 48 | #ifdef HAVE___PROGNAME |
48 | extern char *__progname; | 49 | extern char *__progname; |
@@ -55,7 +56,7 @@ valid_request(struct passwd *pw, char *host, Key **ret, u_char *data, | |||
55 | u_int datalen) | 56 | u_int datalen) |
56 | { | 57 | { |
57 | Buffer b; | 58 | Buffer b; |
58 | Key *key; | 59 | Key *key = NULL; |
59 | u_char *pkblob; | 60 | u_char *pkblob; |
60 | u_int blen, len; | 61 | u_int blen, len; |
61 | char *pkalg, *p; | 62 | char *pkalg, *p; |