merge 6.3p1

1 files changed, 7 insertions, 7 deletions

diff --git a/authfile.c b/authfile.c
index 3544d170b..63ae16bbd 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.95 2013/01/08 18:49:04 markus Exp $ */
+/* $OpenBSD: authfile.c,v 1.97 2013/05/17 00:13:13 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -89,7 +89,7 @@ key_private_rsa1_to_blob(Key *key, Buffer *blob, const char *passphrase,
         u_char buf[100], *cp;
         int i, cipher_num;
         CipherContext ciphercontext;
-        Cipher *cipher;
+        const Cipher *cipher;
         u_int32_t rnd;
 
         /*
@@ -421,7 +421,7 @@ key_parse_private_rsa1(Buffer *blob, const char *passphrase, char **commentp)
         Buffer decrypted;
         u_char *cp;
         CipherContext ciphercontext;
-        Cipher *cipher;
+        const Cipher *cipher;
         Key *prv = NULL;
         Buffer copy;
 
@@ -509,8 +509,8 @@ key_parse_private_rsa1(Buffer *blob, const char *passphrase, char **commentp)
         return prv;
 
 fail:
-        if (commentp)
-                xfree(*commentp);
+        if (commentp != NULL)
+                free(*commentp);
         key_free(prv);
         return NULL;
 }
@@ -832,10 +832,10 @@ key_load_cert(const char *filename)
         pub = key_new(KEY_UNSPEC);
         xasprintf(&file, "%s-cert.pub", filename);
         if (key_try_load_public(pub, file, NULL) == 1) {
-                xfree(file);
+                free(file);
                 return pub;
         }
-        xfree(file);
+        free(file);
         key_free(pub);
         return NULL;
 }