merge 6.0p1

1 files changed, 3 insertions, 1 deletions

diff --git a/dh.c b/dh.c
index b9029d867..d943ca1e1 100644
--- a/dh.c
+++ b/dh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.c,v 1.48 2009/10/01 11:37:33 grunk Exp $ */
+/* $OpenBSD: dh.c,v 1.49 2011/12/07 05:44:38 djm Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  *
@@ -236,6 +236,8 @@ dh_gen_key(DH *dh, int need)
 {
         int i, bits_set, tries = 0;
 
+        if (need < 0)
+                fatal("dh_gen_key: need < 0");
         if (dh->p == NULL)
                 fatal("dh_gen_key: dh->p == NULL");
         if (need > INT_MAX / 2 || 2 * need >= BN_num_bits(dh->p))