From: Bodo Möller <bodo@openssl.org>
Date: Sat, 3 Aug 2002 18:49:39 +0000 (+0000)
Subject: oops -- must use EVP_MD_size, not EVP_MD_block_size
X-Git-Tag: OpenSSL_0_9_7-beta4~218^2~2
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=db4f691f9f4a077cf26822bef7c72fb0499d5823;hp=d28735a05bbd20ab628a775e2877e1666b2eb865

oops -- must use EVP_MD_size, not EVP_MD_block_size
---

diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index 554f4fd792..cc0dcfa956 100644
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -439,9 +439,9 @@ int ssl2_generate_key_material(SSL *s)
  		return 0;
  		}
 
-	for (i=0; i<s->s2->key_material_length; i += EVP_MD_block_size(md5))
+	for (i=0; i<s->s2->key_material_length; i += EVP_MD_size(md5))
 		{
-		if (((km - s->s2->key_material) + EVP_MD_block_size(md5)) > sizeof s->s2->key_material)
+		if (((km - s->s2->key_material) + EVP_MD_size(md5)) > sizeof s->s2->key_material)
 			{
 			/* EVP_DigestFinal_ex() below would write beyond buffer */
 			SSLerr(SSL_F_SSL2_GENERATE_KEY_MATERIAL, ERR_R_INTERNAL_ERROR);
@@ -456,7 +456,7 @@ int ssl2_generate_key_material(SSL *s)
 		EVP_DigestUpdate(&ctx,s->s2->challenge,s->s2->challenge_length);
 		EVP_DigestUpdate(&ctx,s->s2->conn_id,s->s2->conn_id_length);
 		EVP_DigestFinal_ex(&ctx,km,NULL);
-		km += EVP_MD_block_size(md5);
+		km += EVP_MD_size(md5);
 		}
 
 	EVP_MD_CTX_cleanup(&ctx);