diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 15:43:03 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 15:43:03 +0100 |
commit | 8faf8c84430cf3c19705b1d9f8889d256e7fd1fd (patch) | |
tree | e6cb74192adb00fda5e4d1457547851d7e0d86af /authfd.c | |
parent | 328b60656f29db6306994d7498dede386ec2d1c3 (diff) | |
parent | c41345ad7ee5a22689e2c009595e85fa27b4b39a (diff) |
merge 6.3p1
Diffstat (limited to 'authfd.c')
-rw-r--r-- | authfd.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfd.c,v 1.86 2011/07/06 18:09:21 tedu Exp $ */ | 1 | /* $OpenBSD: authfd.c,v 1.87 2013/05/17 00:13:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -224,7 +224,7 @@ ssh_close_authentication_connection(AuthenticationConnection *auth) | |||
224 | { | 224 | { |
225 | buffer_free(&auth->identities); | 225 | buffer_free(&auth->identities); |
226 | close(auth->fd); | 226 | close(auth->fd); |
227 | xfree(auth); | 227 | free(auth); |
228 | } | 228 | } |
229 | 229 | ||
230 | /* Lock/unlock agent */ | 230 | /* Lock/unlock agent */ |
@@ -343,7 +343,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio | |||
343 | blob = buffer_get_string(&auth->identities, &blen); | 343 | blob = buffer_get_string(&auth->identities, &blen); |
344 | *comment = buffer_get_string(&auth->identities, NULL); | 344 | *comment = buffer_get_string(&auth->identities, NULL); |
345 | key = key_from_blob(blob, blen); | 345 | key = key_from_blob(blob, blen); |
346 | xfree(blob); | 346 | free(blob); |
347 | break; | 347 | break; |
348 | default: | 348 | default: |
349 | return NULL; | 349 | return NULL; |
@@ -436,7 +436,7 @@ ssh_agent_sign(AuthenticationConnection *auth, | |||
436 | buffer_put_string(&msg, blob, blen); | 436 | buffer_put_string(&msg, blob, blen); |
437 | buffer_put_string(&msg, data, datalen); | 437 | buffer_put_string(&msg, data, datalen); |
438 | buffer_put_int(&msg, flags); | 438 | buffer_put_int(&msg, flags); |
439 | xfree(blob); | 439 | free(blob); |
440 | 440 | ||
441 | if (ssh_request_reply(auth, &msg, &msg) == 0) { | 441 | if (ssh_request_reply(auth, &msg, &msg) == 0) { |
442 | buffer_free(&msg); | 442 | buffer_free(&msg); |
@@ -612,7 +612,7 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key) | |||
612 | key_to_blob(key, &blob, &blen); | 612 | key_to_blob(key, &blob, &blen); |
613 | buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY); | 613 | buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY); |
614 | buffer_put_string(&msg, blob, blen); | 614 | buffer_put_string(&msg, blob, blen); |
615 | xfree(blob); | 615 | free(blob); |
616 | } else { | 616 | } else { |
617 | buffer_free(&msg); | 617 | buffer_free(&msg); |
618 | return 0; | 618 | return 0; |