diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | key.c | 4 | ||||
-rw-r--r-- | monitor_wrap.c | 4 | ||||
-rw-r--r-- | sftp-glob.c | 6 | ||||
-rw-r--r-- | ssh-dss.c | 6 | ||||
-rw-r--r-- | ssh-rsa.c | 4 |
6 files changed, 23 insertions, 7 deletions
@@ -5,6 +5,10 @@ | |||
5 | - (tim) [contrib/cygwin/ssh-host-config] sshd account creation fixes | 5 | - (tim) [contrib/cygwin/ssh-host-config] sshd account creation fixes |
6 | patch from vinschen@redhat.com | 6 | patch from vinschen@redhat.com |
7 | - (bal) [realpath.c] Updated with OpenBSD tree. | 7 | - (bal) [realpath.c] Updated with OpenBSD tree. |
8 | - (bal) OpenBSD CVS Sync | ||
9 | - deraadt@cvs.openbsd.org 2002/07/04 04:15:33 | ||
10 | [key.c monitor_wrap.c sftp-glob.c ssh-dss.c ssh-rsa.c] | ||
11 | patch memory leaks; grendel@zeitbombe.org | ||
8 | 12 | ||
9 | 20020705 | 13 | 20020705 |
10 | - (tim) [configure.ac] AIX 4.2.1 has authenticate() in libs. | 14 | - (tim) [configure.ac] AIX 4.2.1 has authenticate() in libs. |
@@ -1288,4 +1292,4 @@ | |||
1288 | - (stevesk) entropy.c: typo in debug message | 1292 | - (stevesk) entropy.c: typo in debug message |
1289 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1293 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1290 | 1294 | ||
1291 | $Id: ChangeLog,v 1.2341 2002/07/07 22:07:10 mouring Exp $ | 1295 | $Id: ChangeLog,v 1.2342 2002/07/07 22:10:15 mouring Exp $ |
@@ -32,7 +32,7 @@ | |||
32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
33 | */ | 33 | */ |
34 | #include "includes.h" | 34 | #include "includes.h" |
35 | RCSID("$OpenBSD: key.c,v 1.46 2002/06/30 21:59:45 deraadt Exp $"); | 35 | RCSID("$OpenBSD: key.c,v 1.47 2002/07/04 04:15:33 deraadt Exp $"); |
36 | 36 | ||
37 | #include <openssl/evp.h> | 37 | #include <openssl/evp.h> |
38 | 38 | ||
@@ -763,6 +763,8 @@ key_to_blob(Key *key, u_char **blobp, u_int *lenp) | |||
763 | *lenp = len; | 763 | *lenp = len; |
764 | if (blobp != NULL) | 764 | if (blobp != NULL) |
765 | *blobp = buf; | 765 | *blobp = buf; |
766 | else | ||
767 | xfree(buf); | ||
766 | return len; | 768 | return len; |
767 | } | 769 | } |
768 | 770 | ||
diff --git a/monitor_wrap.c b/monitor_wrap.c index eb4453fc4..1719f89d2 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.14 2002/06/30 21:59:45 deraadt Exp $"); | 28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.15 2002/07/04 04:15:33 deraadt Exp $"); |
29 | 29 | ||
30 | #include <openssl/bn.h> | 30 | #include <openssl/bn.h> |
31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
@@ -492,6 +492,8 @@ mm_newkeys_to_blob(int mode, u_char **blobp, u_int *lenp) | |||
492 | *lenp = len; | 492 | *lenp = len; |
493 | if (blobp != NULL) | 493 | if (blobp != NULL) |
494 | *blobp = buf; | 494 | *blobp = buf; |
495 | else | ||
496 | xfree(blobp); | ||
495 | return len; | 497 | return len; |
496 | } | 498 | } |
497 | 499 | ||
diff --git a/sftp-glob.c b/sftp-glob.c index 2deb0eb49..2a7cf141c 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.11 2002/06/30 21:59:45 deraadt Exp $"); | 26 | RCSID("$OpenBSD: sftp-glob.c,v 1.12 2002/07/04 04:15:33 deraadt Exp $"); |
27 | 27 | ||
28 | #include "buffer.h" | 28 | #include "buffer.h" |
29 | #include "bufaux.h" | 29 | #include "bufaux.h" |
@@ -51,8 +51,10 @@ fudge_opendir(const char *path) | |||
51 | 51 | ||
52 | r = xmalloc(sizeof(*r)); | 52 | r = xmalloc(sizeof(*r)); |
53 | 53 | ||
54 | if (do_readdir(cur.conn, (char *)path, &r->dir)) | 54 | if (do_readdir(cur.conn, (char *)path, &r->dir)) { |
55 | xfree(r); | ||
55 | return(NULL); | 56 | return(NULL); |
57 | } | ||
56 | 58 | ||
57 | r->offset = 0; | 59 | r->offset = 0; |
58 | 60 | ||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: ssh-dss.c,v 1.15 2002/06/23 03:30:17 deraadt Exp $"); | 26 | RCSID("$OpenBSD: ssh-dss.c,v 1.16 2002/07/04 04:15:33 deraadt Exp $"); |
27 | 27 | ||
28 | #include <openssl/bn.h> | 28 | #include <openssl/bn.h> |
29 | #include <openssl/evp.h> | 29 | #include <openssl/evp.h> |
@@ -85,6 +85,8 @@ ssh_dss_sign(Key *key, u_char **sigp, u_int *lenp, | |||
85 | *lenp = SIGBLOB_LEN; | 85 | *lenp = SIGBLOB_LEN; |
86 | if (sigp != NULL) | 86 | if (sigp != NULL) |
87 | *sigp = ret; | 87 | *sigp = ret; |
88 | else | ||
89 | xfree(ret); | ||
88 | } else { | 90 | } else { |
89 | /* ietf-drafts */ | 91 | /* ietf-drafts */ |
90 | buffer_init(&b); | 92 | buffer_init(&b); |
@@ -98,6 +100,8 @@ ssh_dss_sign(Key *key, u_char **sigp, u_int *lenp, | |||
98 | *lenp = len; | 100 | *lenp = len; |
99 | if (sigp != NULL) | 101 | if (sigp != NULL) |
100 | *sigp = ret; | 102 | *sigp = ret; |
103 | else | ||
104 | xfree(ret); | ||
101 | } | 105 | } |
102 | return 0; | 106 | return 0; |
103 | } | 107 | } |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: ssh-rsa.c,v 1.21 2002/06/23 03:30:17 deraadt Exp $"); | 26 | RCSID("$OpenBSD: ssh-rsa.c,v 1.22 2002/07/04 04:15:33 deraadt Exp $"); |
27 | 27 | ||
28 | #include <openssl/evp.h> | 28 | #include <openssl/evp.h> |
29 | #include <openssl/err.h> | 29 | #include <openssl/err.h> |
@@ -100,6 +100,8 @@ ssh_rsa_sign(Key *key, u_char **sigp, u_int *lenp, | |||
100 | *lenp = len; | 100 | *lenp = len; |
101 | if (sigp != NULL) | 101 | if (sigp != NULL) |
102 | *sigp = ret; | 102 | *sigp = ret; |
103 | else | ||
104 | xfree(ret); | ||
103 | return 0; | 105 | return 0; |
104 | } | 106 | } |
105 | 107 | ||