diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keysign.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -12,6 +12,9 @@ | |||
12 | - deraadt@cvs.openbsd.org 2002/06/26 15:00:32 | 12 | - deraadt@cvs.openbsd.org 2002/06/26 15:00:32 |
13 | [monitor_wrap.c] | 13 | [monitor_wrap.c] |
14 | more %u | 14 | more %u |
15 | - markus@cvs.openbsd.org 2002/06/26 22:27:32 | ||
16 | [ssh-keysign.c] | ||
17 | bug #304, xfree(data) called to early; openssh@sigint.cs.purdue.edu | ||
15 | 18 | ||
16 | 20020626 | 19 | 20020626 |
17 | - (stevesk) [monitor.c] remove duplicate proto15 dispatch entry for PAM | 20 | - (stevesk) [monitor.c] remove duplicate proto15 dispatch entry for PAM |
@@ -1184,4 +1187,4 @@ | |||
1184 | - (stevesk) entropy.c: typo in debug message | 1187 | - (stevesk) entropy.c: typo in debug message |
1185 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1188 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1186 | 1189 | ||
1187 | $Id: ChangeLog,v 1.2306 2002/06/27 00:23:02 mouring Exp $ | 1190 | $Id: ChangeLog,v 1.2307 2002/06/27 00:25:07 mouring Exp $ |
diff --git a/ssh-keysign.c b/ssh-keysign.c index 7f1d25d8c..6a435684b 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.4 2002/06/19 00:27:55 deraadt Exp $"); | 25 | RCSID("$OpenBSD: ssh-keysign.c,v 1.5 2002/06/26 22:27:32 markus Exp $"); |
26 | 26 | ||
27 | #include <openssl/evp.h> | 27 | #include <openssl/evp.h> |
28 | 28 | ||
@@ -192,7 +192,6 @@ main(int argc, char **argv) | |||
192 | data = buffer_get_string(&b, &dlen); | 192 | data = buffer_get_string(&b, &dlen); |
193 | if (valid_request(pw, host, &key, data, dlen) < 0) | 193 | if (valid_request(pw, host, &key, data, dlen) < 0) |
194 | fatal("not a valid request"); | 194 | fatal("not a valid request"); |
195 | xfree(data); | ||
196 | xfree(host); | 195 | xfree(host); |
197 | 196 | ||
198 | found = 0; | 197 | found = 0; |
@@ -208,6 +207,7 @@ main(int argc, char **argv) | |||
208 | 207 | ||
209 | if (key_sign(keys[i], &signature, &slen, data, dlen) != 0) | 208 | if (key_sign(keys[i], &signature, &slen, data, dlen) != 0) |
210 | fatal("key_sign failed"); | 209 | fatal("key_sign failed"); |
210 | xfree(data); | ||
211 | 211 | ||
212 | /* send reply */ | 212 | /* send reply */ |
213 | buffer_clear(&b); | 213 | buffer_clear(&b); |