From: jsing <jsing@openbsd.org>
Date: Sat, 8 Sep 2018 14:29:52 +0000 (+0000)
Subject: SSL_MAX_DIGEST is no longer needed.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a51281f8281557897366249ee8a8af24e2496afe;p=openbsd

SSL_MAX_DIGEST is no longer needed.
---

diff --git a/lib/libssl/ssl_ciph.c b/lib/libssl/ssl_ciph.c
index 9db0c68ceb5..59c3ad5a0b1 100644
--- a/lib/libssl/ssl_ciph.c
+++ b/lib/libssl/ssl_ciph.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_ciph.c,v 1.103 2018/09/06 16:40:45 jsing Exp $ */
+/* $OpenBSD: ssl_ciph.c,v 1.104 2018/09/08 14:29:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -164,17 +164,14 @@ static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX] = {
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 };
 
-#define SSL_MD_MD5_IDX	0
-#define SSL_MD_SHA1_IDX	1
-#define SSL_MD_GOST94_IDX 2
-#define SSL_MD_GOST89MAC_IDX 3
-#define SSL_MD_SHA256_IDX 4
-#define SSL_MD_SHA384_IDX 5
-#define SSL_MD_STREEBOG256_IDX 6
-/*Constant SSL_MAX_DIGEST equal to size of digests array should be
- * defined in the
- * ssl_locl.h */
-#define SSL_MD_NUM_IDX	SSL_MAX_DIGEST
+#define SSL_MD_MD5_IDX		0
+#define SSL_MD_SHA1_IDX		1
+#define SSL_MD_GOST94_IDX	2
+#define SSL_MD_GOST89MAC_IDX	3
+#define SSL_MD_SHA256_IDX	4
+#define SSL_MD_SHA384_IDX	5
+#define SSL_MD_STREEBOG256_IDX	6
+#define SSL_MD_NUM_IDX		7
 static const EVP_MD *ssl_digest_methods[SSL_MD_NUM_IDX] = {
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 };
diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h
index d5680fc14a1..d022d21568c 100644
--- a/lib/libssl/ssl_locl.h
+++ b/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.214 2018/09/06 16:40:45 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.215 2018/09/08 14:29:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -264,10 +264,6 @@ __BEGIN_HIDDEN_DECLS
 #define SSL_HANDSHAKE_MAC_STREEBOG256	0x200
 #define SSL_HANDSHAKE_MAC_DEFAULT (SSL_HANDSHAKE_MAC_MD5 | SSL_HANDSHAKE_MAC_SHA)
 
-/* When adding new digest in the ssl_ciph.c and increment SSM_MD_NUM_IDX
- * make sure to update this constant too */
-#define SSL_MAX_DIGEST 7
-
 #define SSL3_CK_ID		0x03000000
 #define SSL3_CK_VALUE_MASK	0x0000ffff