diff options
Diffstat (limited to 'ssh-keysign.c')
-rw-r--r-- | ssh-keysign.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c index 1deb7e141..9a6653c7c 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keysign.c,v 1.36 2011/02/16 00:31:14 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keysign.c,v 1.37 2013/05/17 00:13:14 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -78,7 +78,7 @@ valid_request(struct passwd *pw, char *host, Key **ret, u_char *data, | |||
78 | p = buffer_get_string(&b, &len); | 78 | p = buffer_get_string(&b, &len); |
79 | if (len != 20 && len != 32) | 79 | if (len != 20 && len != 32) |
80 | fail++; | 80 | fail++; |
81 | xfree(p); | 81 | free(p); |
82 | 82 | ||
83 | if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST) | 83 | if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST) |
84 | fail++; | 84 | fail++; |
@@ -90,13 +90,13 @@ valid_request(struct passwd *pw, char *host, Key **ret, u_char *data, | |||
90 | p = buffer_get_string(&b, NULL); | 90 | p = buffer_get_string(&b, NULL); |
91 | if (strcmp("ssh-connection", p) != 0) | 91 | if (strcmp("ssh-connection", p) != 0) |
92 | fail++; | 92 | fail++; |
93 | xfree(p); | 93 | free(p); |
94 | 94 | ||
95 | /* method */ | 95 | /* method */ |
96 | p = buffer_get_string(&b, NULL); | 96 | p = buffer_get_string(&b, NULL); |
97 | if (strcmp("hostbased", p) != 0) | 97 | if (strcmp("hostbased", p) != 0) |
98 | fail++; | 98 | fail++; |
99 | xfree(p); | 99 | free(p); |
100 | 100 | ||
101 | /* pubkey */ | 101 | /* pubkey */ |
102 | pkalg = buffer_get_string(&b, NULL); | 102 | pkalg = buffer_get_string(&b, NULL); |
@@ -109,8 +109,8 @@ valid_request(struct passwd *pw, char *host, Key **ret, u_char *data, | |||
109 | fail++; | 109 | fail++; |
110 | else if (key->type != pktype) | 110 | else if (key->type != pktype) |
111 | fail++; | 111 | fail++; |
112 | xfree(pkalg); | 112 | free(pkalg); |
113 | xfree(pkblob); | 113 | free(pkblob); |
114 | 114 | ||
115 | /* client host name, handle trailing dot */ | 115 | /* client host name, handle trailing dot */ |
116 | p = buffer_get_string(&b, &len); | 116 | p = buffer_get_string(&b, &len); |
@@ -121,14 +121,14 @@ valid_request(struct passwd *pw, char *host, Key **ret, u_char *data, | |||
121 | fail++; | 121 | fail++; |
122 | else if (strncasecmp(host, p, len - 1) != 0) | 122 | else if (strncasecmp(host, p, len - 1) != 0) |
123 | fail++; | 123 | fail++; |
124 | xfree(p); | 124 | free(p); |
125 | 125 | ||
126 | /* local user */ | 126 | /* local user */ |
127 | p = buffer_get_string(&b, NULL); | 127 | p = buffer_get_string(&b, NULL); |
128 | 128 | ||
129 | if (strcmp(pw->pw_name, p) != 0) | 129 | if (strcmp(pw->pw_name, p) != 0) |
130 | fail++; | 130 | fail++; |
131 | xfree(p); | 131 | free(p); |
132 | 132 | ||
133 | /* end of message */ | 133 | /* end of message */ |
134 | if (buffer_len(&b) != 0) | 134 | if (buffer_len(&b) != 0) |
@@ -233,7 +233,7 @@ main(int argc, char **argv) | |||
233 | data = buffer_get_string(&b, &dlen); | 233 | data = buffer_get_string(&b, &dlen); |
234 | if (valid_request(pw, host, &key, data, dlen) < 0) | 234 | if (valid_request(pw, host, &key, data, dlen) < 0) |
235 | fatal("not a valid request"); | 235 | fatal("not a valid request"); |
236 | xfree(host); | 236 | free(host); |
237 | 237 | ||
238 | found = 0; | 238 | found = 0; |
239 | for (i = 0; i < NUM_KEYTYPES; i++) { | 239 | for (i = 0; i < NUM_KEYTYPES; i++) { |
@@ -248,7 +248,7 @@ main(int argc, char **argv) | |||
248 | 248 | ||
249 | if (key_sign(keys[i], &signature, &slen, data, dlen) != 0) | 249 | if (key_sign(keys[i], &signature, &slen, data, dlen) != 0) |
250 | fatal("key_sign failed"); | 250 | fatal("key_sign failed"); |
251 | xfree(data); | 251 | free(data); |
252 | 252 | ||
253 | /* send reply */ | 253 | /* send reply */ |
254 | buffer_clear(&b); | 254 | buffer_clear(&b); |