From 879b19801a0bb7f92639e64564e791282a2b8354 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Wed, 27 Apr 2005 00:04:59 +0000
Subject: [PATCH 1/1] Change method_mont_p from (char *) to (BN_MONT_CTX *) and
 remove several casts.

---
 crypto/dh/dh.h        | 2 +-
 crypto/dh/dh_key.c    | 8 +++-----
 crypto/dsa/dsa.h      | 2 +-
 crypto/dsa/dsa_ossl.c | 9 ++++-----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index a933601245..da44778b58 100644
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -114,7 +114,7 @@ struct dh_st
 	BIGNUM *priv_key;	/* x */
 
 	int flags;
-	char *method_mont_p;
+	BN_MONT_CTX *method_mont_p;
 	/* Place holders if we want to do X9.42 DH */
 	BIGNUM *q;
 	BIGNUM *j;
diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
index 1439a7a9e9..62d05a4fac 100644
--- a/crypto/dh/dh_key.c
+++ b/crypto/dh/dh_key.c
@@ -130,8 +130,7 @@ static int generate_key(DH *dh)
 
 	if (dh->flags & DH_FLAG_CACHE_MONT_P)
 		{
-		mont = BN_MONT_CTX_set_locked(
-				(BN_MONT_CTX **)&dh->method_mont_p,
+		mont = BN_MONT_CTX_set_locked(&dh->method_mont_p,
 				CRYPTO_LOCK_DH, dh->p, ctx);
 		if (!mont)
 			goto err;
@@ -178,8 +177,7 @@ static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
 
 	if (dh->flags & DH_FLAG_CACHE_MONT_P)
 		{
-		mont = BN_MONT_CTX_set_locked(
-				(BN_MONT_CTX **)&dh->method_mont_p,
+		mont = BN_MONT_CTX_set_locked(&dh->method_mont_p,
 				CRYPTO_LOCK_DH, dh->p, ctx);
 		if (!mont)
 			goto err;
@@ -222,6 +220,6 @@ static int dh_init(DH *dh)
 static int dh_finish(DH *dh)
 	{
 	if(dh->method_mont_p)
-		BN_MONT_CTX_free((BN_MONT_CTX *)dh->method_mont_p);
+		BN_MONT_CTX_free(dh->method_mont_p);
 	return(1);
 	}
diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
index 8eec737e38..c7ba059f25 100644
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -146,7 +146,7 @@ struct dsa_st
 
 	int flags;
 	/* Normally used to cache montgomery values */
-	char *method_mont_p;
+	BN_MONT_CTX *method_mont_p;
 	int references;
 	CRYPTO_EX_DATA ex_data;
 	const DSA_METHOD *meth;
diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
index 2f7fef12cf..8f7eceaf16 100644
--- a/crypto/dsa/dsa_ossl.c
+++ b/crypto/dsa/dsa_ossl.c
@@ -230,7 +230,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
 
 	if (dsa->flags & DSA_FLAG_CACHE_MONT_P)
 		{
-		if (!BN_MONT_CTX_set_locked((BN_MONT_CTX **)&dsa->method_mont_p,
+		if (!BN_MONT_CTX_set_locked(&dsa->method_mont_p,
 						CRYPTO_LOCK_DSA,
 						dsa->p, ctx))
 			goto err;
@@ -238,7 +238,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
 
 	/* Compute r = (g^k mod p) mod q */
 	DSA_BN_MOD_EXP(goto err, dsa, r, dsa->g, &k, dsa->p, ctx,
-			(BN_MONT_CTX *)dsa->method_mont_p);
+			dsa->method_mont_p);
 	if (!BN_mod(r,r,dsa->q,ctx)) goto err;
 
 	/* Compute  part of 's = inv(k) (m + xr) mod q' */
@@ -311,8 +311,7 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
 
 	if (dsa->flags & DSA_FLAG_CACHE_MONT_P)
 		{
-		mont = BN_MONT_CTX_set_locked(
-					(BN_MONT_CTX **)&dsa->method_mont_p,
+		mont = BN_MONT_CTX_set_locked(&dsa->method_mont_p,
 					CRYPTO_LOCK_DSA, dsa->p, ctx);
 		if (!mont)
 			goto err;
@@ -348,7 +347,7 @@ static int dsa_init(DSA *dsa)
 static int dsa_finish(DSA *dsa)
 {
 	if(dsa->method_mont_p)
-		BN_MONT_CTX_free((BN_MONT_CTX *)dsa->method_mont_p);
+		BN_MONT_CTX_free(dsa->method_mont_p);
 	return(1);
 }
 
-- 
2.34.1