From 4043d7db4e466d15193c3bad3b204048fc13b785 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Mon, 9 Oct 2006 16:47:10 +0000
Subject: Merged in changes from OpenSSL 0.9.8d

svn path=/openssl/trunk/CHANGES; revision=377
---
 openssl/trunk/crypto/dh/dh_key.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'openssl/trunk/crypto/dh/dh_key.c')

diff --git a/openssl/trunk/crypto/dh/dh_key.c b/openssl/trunk/crypto/dh/dh_key.c
index 79984e13..cb5abdcf 100644
--- a/openssl/trunk/crypto/dh/dh_key.c
+++ b/openssl/trunk/crypto/dh/dh_key.c
@@ -179,6 +179,12 @@ static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
 	int ret= -1;
         int check_result;
 
+	if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS)
+		{
+		DHerr(DH_F_COMPUTE_KEY,DH_R_MODULUS_TOO_LARGE);
+		goto err;
+		}
+
 	ctx = BN_CTX_new();
 	if (ctx == NULL) goto err;
 	BN_CTX_start(ctx);
-- 
cgit v1.2.3