1 files changed, 11 insertions, 12 deletions

diff --git a/authfile.c b/authfile.c
index 1ecbda8b1..cb95cfcb8 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
@@ -90,7 +90,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;
 
         /*
@@ -422,7 +422,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;
 
@@ -510,8 +510,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;
 }
@@ -833,10 +833,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;
 }
@@ -1034,10 +1034,9 @@ blacklisted_key_in_file(Key *key, const char *blacklist_file, char **fp)
         }
 
 out:
-        if (dgst_packed)
-                xfree(dgst_packed);
+        free(dgst_packed);
         if (ret != 1 && dgst_hex) {
-                xfree(dgst_hex);
+                free(dgst_hex);
                 dgst_hex = NULL;
         }
         if (fp)
@@ -1065,7 +1064,7 @@ blacklisted_key(Key *key, char **fp)
         xasprintf(&blacklist_file, "%s.%s-%u",
             _PATH_BLACKLIST, key_type(public), key_size(public));
         ret = blacklisted_key_in_file(public, blacklist_file, fp);
-        xfree(blacklist_file);
+        free(blacklist_file);
         if (ret > 0) {
                 key_free(public);
                 return ret;
@@ -1074,7 +1073,7 @@ blacklisted_key(Key *key, char **fp)
         xasprintf(&blacklist_file, "%s.%s-%u",
             _PATH_BLACKLIST_CONFIG, key_type(public), key_size(public));
         ret2 = blacklisted_key_in_file(public, blacklist_file, fp);
-        xfree(blacklist_file);
+        free(blacklist_file);
         if (ret2 > ret)
                 ret = ret2;