summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ed505169d..b5fdc2e4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - markus@cvs.openbsd.org 2004/12/23 17:35:48 3 - markus@cvs.openbsd.org 2004/12/23 17:35:48
4 [session.c] 4 [session.c]
5 check for NULL; from mpech 5 check for NULL; from mpech
6 - markus@cvs.openbsd.org 2004/12/23 17:38:07
7 [ssh-keygen.c]
8 leak; from mpech
6 9
720050118 1020050118
8 - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement 11 - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement
@@ -1975,4 +1978,4 @@
1975 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1978 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1976 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1979 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1977 1980
1978$Id: ChangeLog,v 1.3609 2005/01/19 23:55:46 dtucker Exp $ 1981$Id: ChangeLog,v 1.3610 2005/01/19 23:56:31 dtucker Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index d39e7d881..7ed62a30c 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"
15RCSID("$OpenBSD: ssh-keygen.c,v 1.117 2004/07/11 17:48:47 deraadt Exp $"); 15RCSID("$OpenBSD: ssh-keygen.c,v 1.118 2004/12/23 17:38:07 markus Exp $");
16 16
17#include <openssl/evp.h> 17#include <openssl/evp.h>
18#include <openssl/pem.h> 18#include <openssl/pem.h>
@@ -239,6 +239,7 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
239 } else if (strstr(type, "rsa")) { 239 } else if (strstr(type, "rsa")) {
240 ktype = KEY_RSA; 240 ktype = KEY_RSA;
241 } else { 241 } else {
242 buffer_free(&b);
242 xfree(type); 243 xfree(type);
243 return NULL; 244 return NULL;
244 } 245 }