- markus@cvs.openbsd.org 2004/12/23 17:38:07

[openssh.git] / ssh-keygen.c

diff --git a/ssh-keygen.c b/ssh-keygen.c
index e8e579b5da026f61ed941a050b87be49288109fa..7ed62a30c5d81aea2f6910d3d73ffc8d81edf2c4 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.116 2004/06/21 17:36:31 avsm Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.118 2004/12/23 17:38:07 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -239,6 +239,7 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
        } else if (strstr(type, "rsa")) {
                ktype = KEY_RSA;
        } else {
+               buffer_free(&b);
                xfree(type);
                return NULL;
        }
@@ -895,7 +896,7 @@ main(int ac, char **av)
                        if (log_level == SYSLOG_LEVEL_INFO)
                                log_level = SYSLOG_LEVEL_DEBUG1;
                        else {
-                               if (log_level >= SYSLOG_LEVEL_DEBUG1 && 
+                               if (log_level >= SYSLOG_LEVEL_DEBUG1 &&
                                    log_level < SYSLOG_LEVEL_DEBUG3)
                                        log_level++;
                        }