merge 6.3p1

1 files changed, 10 insertions, 8 deletions

diff --git a/schnorr.c b/schnorr.c
index 4d54d6881..9549dcf0e 100644
--- a/schnorr.c
+++ b/schnorr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: schnorr.c,v 1.5 2010/12/03 23:49:26 djm Exp $ */
+/* $OpenBSD: schnorr.c,v 1.7 2013/05/17 00:13:14 djm Exp $ */
 /*
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
  *
@@ -102,7 +102,7 @@ schnorr_hash(const BIGNUM *p, const BIGNUM *q, const BIGNUM *g,
  out:
         buffer_free(&b);
         bzero(digest, digest_len);
-        xfree(digest);
+        free(digest);
         digest_len = 0;
         if (success == 0)
                 return h;
@@ -488,12 +488,13 @@ debug3_bn(const BIGNUM *n, const char *fmt, ...)
 {
         char *out, *h;
         va_list args;
+        int ret;
 
         out = NULL;
         va_start(args, fmt);
-        vasprintf(&out, fmt, args);
+        ret = vasprintf(&out, fmt, args);
         va_end(args);
-        if (out == NULL)
+        if (ret == -1 || out == NULL)
                 fatal("%s: vasprintf failed", __func__);
 
         if (n == NULL)
@@ -513,12 +514,13 @@ debug3_buf(const u_char *buf, u_int len, const char *fmt, ...)
         char *out, h[65];
         u_int i, j;
         va_list args;
+        int ret;
 
         out = NULL;
         va_start(args, fmt);
-        vasprintf(&out, fmt, args);
+        ret = vasprintf(&out, fmt, args);
         va_end(args);
-        if (out == NULL)
+        if (ret == -1 || out == NULL)
                 fatal("%s: vasprintf failed", __func__);
 
         debug3("%s length %u%s", out, len, buf == NULL ? " (null)" : "");
@@ -571,7 +573,7 @@ modp_group_free(struct modp_group *grp)
         if (grp->q != NULL)
                 BN_clear_free(grp->q);
         bzero(grp, sizeof(*grp));
-        xfree(grp);
+        free(grp);
 }
 
 /* main() function for self-test */
@@ -606,7 +608,7 @@ schnorr_selftest_one(const BIGNUM *grp_p, const BIGNUM *grp_q,
         if (schnorr_verify_buf(grp_p, grp_q, grp_g, g_x, "junk", 4,
             sig, siglen) != 0)
                 fatal("%s: verify should have failed (bit error)", __func__);
-        xfree(sig);
+        free(sig);
         BN_free(g_x);
         BN_CTX_free(bn_ctx);
 }