merge 6.4p1

1 files changed, 2 insertions, 2 deletions

diff --git a/schnorr.c b/schnorr.c
index 9549dcf0e..93822fed4 100644
--- a/schnorr.c
+++ b/schnorr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: schnorr.c,v 1.7 2013/05/17 00:13:14 djm Exp $ */
+/* $OpenBSD: schnorr.c,v 1.8 2013/11/08 00:39:15 djm Exp $ */
 /*
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
  *
@@ -549,7 +549,7 @@ modp_group_from_g_and_safe_p(const char *grp_g, const char *grp_p)
 {
         struct modp_group *ret;
 
-        ret = xmalloc(sizeof(*ret));
+        ret = xcalloc(1, sizeof(*ret));
         ret->p = ret->q = ret->g = NULL;
         if (BN_hex2bn(&ret->p, grp_p) == 0 ||
             BN_hex2bn(&ret->g, grp_g) == 0)