diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sftp-glob.c | 4 | ||||
-rw-r--r-- | ssh-agent.c | 8 | ||||
-rw-r--r-- | ssh-keygen.c | 4 |
4 files changed, 12 insertions, 9 deletions
@@ -3,6 +3,9 @@ | |||
3 | - deraadt@cvs.openbsd.org 2001/04/02 17:32:23 | 3 | - deraadt@cvs.openbsd.org 2001/04/02 17:32:23 |
4 | [ssh-agent.1] | 4 | [ssh-agent.1] |
5 | grammar; slade@shore.net | 5 | grammar; slade@shore.net |
6 | - stevesk@cvs.openbsd.org 2001/04/03 13:56:11 | ||
7 | [sftp-glob.c ssh-agent.c ssh-keygen.c] | ||
8 | free() -> xfree() | ||
6 | 9 | ||
7 | 20010403 | 10 | 20010403 |
8 | - OpenBSD CVS Sync | 11 | - OpenBSD CVS Sync |
@@ -4813,4 +4816,4 @@ | |||
4813 | - Wrote replacements for strlcpy and mkdtemp | 4816 | - Wrote replacements for strlcpy and mkdtemp |
4814 | - Released 1.0pre1 | 4817 | - Released 1.0pre1 |
4815 | 4818 | ||
4816 | $Id: ChangeLog,v 1.1048 2001/04/04 01:51:25 mouring Exp $ | 4819 | $Id: ChangeLog,v 1.1049 2001/04/04 01:53:20 mouring Exp $ |
diff --git a/sftp-glob.c b/sftp-glob.c index f1252eecc..208efeb15 100644 --- a/sftp-glob.c +++ b/sftp-glob.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sftp-glob.c,v 1.2 2001/03/16 08:16:18 djm Exp $"); | 26 | RCSID("$OpenBSD: sftp-glob.c,v 1.3 2001/04/03 13:56:11 stevesk Exp $"); |
27 | 27 | ||
28 | #include "ssh.h" | 28 | #include "ssh.h" |
29 | #include "buffer.h" | 29 | #include "buffer.h" |
@@ -104,7 +104,7 @@ struct dirent *fudge_readdir(struct SFTP_OPENDIR *od) | |||
104 | void fudge_closedir(struct SFTP_OPENDIR *od) | 104 | void fudge_closedir(struct SFTP_OPENDIR *od) |
105 | { | 105 | { |
106 | free_sftp_dirents(od->dir); | 106 | free_sftp_dirents(od->dir); |
107 | free(od); | 107 | xfree(od); |
108 | } | 108 | } |
109 | 109 | ||
110 | void attrib_to_stat(Attrib *a, struct stat *st) | 110 | void attrib_to_stat(Attrib *a, struct stat *st) |
diff --git a/ssh-agent.c b/ssh-agent.c index 6a0c0d07f..e8362ded0 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.53 2001/03/26 23:23:24 markus Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.54 2001/04/03 13:56:11 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: ssh-agent.c,v 1.53 2001/03/26 23:23:24 markus Exp $"); | 40 | RCSID("$OpenBSD: ssh-agent.c,v 1.54 2001/04/03 13:56:11 stevesk Exp $"); |
41 | 41 | ||
42 | #include <openssl/evp.h> | 42 | #include <openssl/evp.h> |
43 | #include <openssl/md5.h> | 43 | #include <openssl/md5.h> |
@@ -563,9 +563,9 @@ prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl) | |||
563 | sz = howmany(n+1, NFDBITS) * sizeof(fd_mask); | 563 | sz = howmany(n+1, NFDBITS) * sizeof(fd_mask); |
564 | if (*fdrp == NULL || n > *fdl) { | 564 | if (*fdrp == NULL || n > *fdl) { |
565 | if (*fdrp) | 565 | if (*fdrp) |
566 | free(*fdrp); | 566 | xfree(*fdrp); |
567 | if (*fdwp) | 567 | if (*fdwp) |
568 | free(*fdwp); | 568 | xfree(*fdwp); |
569 | *fdrp = xmalloc(sz); | 569 | *fdrp = xmalloc(sz); |
570 | *fdwp = xmalloc(sz); | 570 | *fdwp = xmalloc(sz); |
571 | *fdl = n; | 571 | *fdl = n; |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 496393ff0..b0f814475 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.53 2001/03/26 23:23:24 markus Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.54 2001/04/03 13:56:11 stevesk Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -256,7 +256,7 @@ do_convert_private_ssh2_from_blob(char *blob, int blen) | |||
256 | 256 | ||
257 | key_sign(key, &sig, &slen, data, sizeof data); | 257 | key_sign(key, &sig, &slen, data, sizeof data); |
258 | key_verify(key, sig, slen, data, sizeof data); | 258 | key_verify(key, sig, slen, data, sizeof data); |
259 | free(sig); | 259 | xfree(sig); |
260 | } | 260 | } |
261 | #endif | 261 | #endif |
262 | return key; | 262 | return key; |