From: tedu <tedu@openbsd.org>
Date: Sat, 17 May 2014 15:57:52 +0000 (+0000)
Subject: no no md2
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=02d435bbc33c3ad23de2218e035616e0f2db4b3e;p=openbsd

no no md2
---

diff --git a/lib/libcrypto/evp/evp.h b/lib/libcrypto/evp/evp.h
index 25a495b32f4..5cd125894fc 100644
--- a/lib/libcrypto/evp/evp.h
+++ b/lib/libcrypto/evp/evp.h
@@ -646,9 +646,6 @@ void BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
 #endif
 
 const EVP_MD *EVP_md_null(void);
-#ifndef OPENSSL_NO_MD2
-const EVP_MD *EVP_md2(void);
-#endif
 #ifndef OPENSSL_NO_MD4
 const EVP_MD *EVP_md4(void);
 #endif
diff --git a/lib/libcrypto/pkcs7/sign.c b/lib/libcrypto/pkcs7/sign.c
index 8b59885f7ea..43168514f96 100644
--- a/lib/libcrypto/pkcs7/sign.c
+++ b/lib/libcrypto/pkcs7/sign.c
@@ -76,9 +76,6 @@ char *argv[];
 	int i;
 	int nodetach=0;
 
-#ifndef OPENSSL_NO_MD2
-	EVP_add_digest(EVP_md2());
-#endif
 #ifndef OPENSSL_NO_MD5
 	EVP_add_digest(EVP_md5());
 #endif
diff --git a/lib/libcrypto/pkcs7/verify.c b/lib/libcrypto/pkcs7/verify.c
index b40f26032ec..414f985dc2f 100644
--- a/lib/libcrypto/pkcs7/verify.c
+++ b/lib/libcrypto/pkcs7/verify.c
@@ -85,9 +85,6 @@ char *argv[];
 
 	bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 	bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
-#ifndef OPENSSL_NO_MD2
-	EVP_add_digest(EVP_md2());
-#endif
 #ifndef OPENSSL_NO_MD5
 	EVP_add_digest(EVP_md5());
 #endif
diff --git a/lib/libssl/src/apps/progs.h b/lib/libssl/src/apps/progs.h
index c6f66b585f7..f3645c71311 100644
--- a/lib/libssl/src/apps/progs.h
+++ b/lib/libssl/src/apps/progs.h
@@ -130,10 +130,6 @@ FUNCTION functions[] = {
 #endif
 
 	/* Message Digests. */
-#ifndef OPENSSL_NO_MD2
-	{ FUNC_TYPE_MD, "md2", dgst_main },
-	{ FUNC_TYPE_MD, "mdc2", dgst_main },
-#endif
 #ifndef OPENSSL_NO_MD4
 	{ FUNC_TYPE_MD, "md4", dgst_main },
 #endif
diff --git a/lib/libssl/src/apps/speed.c b/lib/libssl/src/apps/speed.c
index c8ed39d1f6d..76ab66c547a 100644
--- a/lib/libssl/src/apps/speed.c
+++ b/lib/libssl/src/apps/speed.c
@@ -128,9 +128,6 @@
 #ifndef OPENSSL_NO_IDEA
 #include <openssl/idea.h>
 #endif
-#ifndef OPENSSL_NO_MD2
-#include <openssl/md2.h>
-#endif
 #ifndef OPENSSL_NO_MDC2
 #include <openssl/mdc2.h>
 #endif
@@ -270,9 +267,6 @@ speed_main(int argc, char **argv)
 	unsigned rsa_num;
 #endif
 	unsigned char md[EVP_MAX_MD_SIZE];
-#ifndef OPENSSL_NO_MD2
-	unsigned char md2[MD2_DIGEST_LENGTH];
-#endif
 #ifndef OPENSSL_NO_MDC2
 	unsigned char mdc2[MDC2_DIGEST_LENGTH];
 #endif
@@ -652,11 +646,6 @@ speed_main(int argc, char **argv)
 			j--;	/* Otherwise, -mr gets confused with an
 				 * algorithm. */
 		} else
-#ifndef OPENSSL_NO_MD2
-		if (strcmp(*argv, "md2") == 0)
-			doit[D_MD2] = 1;
-		else
-#endif
 #ifndef OPENSSL_NO_MDC2
 		if (strcmp(*argv, "mdc2") == 0)
 			doit[D_MDC2] = 1;
@@ -931,9 +920,6 @@ speed_main(int argc, char **argv)
 			BIO_printf(bio_err, "Error: bad option or value\n");
 			BIO_printf(bio_err, "\n");
 			BIO_printf(bio_err, "Available values:\n");
-#ifndef OPENSSL_NO_MD2
-			BIO_printf(bio_err, "md2      ");
-#endif
 #ifndef OPENSSL_NO_MDC2
 			BIO_printf(bio_err, "mdc2     ");
 #endif
@@ -1163,18 +1149,6 @@ speed_main(int argc, char **argv)
 #define COUNT(d) (count)
 	signal(SIGALRM, sig_done);
 
-#ifndef OPENSSL_NO_MD2
-	if (doit[D_MD2]) {
-		for (j = 0; j < SIZE_NUM; j++) {
-			print_message(names[D_MD2], c[D_MD2][j], lengths[j]);
-			Time_F(START);
-			for (count = 0, run = 1; COND(c[D_MD2][j]); count++)
-				EVP_Digest(buf, (unsigned long) lengths[j], &(md2[0]), NULL, EVP_md2(), NULL);
-			d = Time_F(STOP);
-			print_result(D_MD2, j, count, d);
-		}
-	}
-#endif
 #ifndef OPENSSL_NO_MDC2
 	if (doit[D_MDC2]) {
 		for (j = 0; j < SIZE_NUM; j++) {
@@ -1914,9 +1888,6 @@ show_res:
 		fprintf(stdout, "%s\n", SSLeay_version(SSLEAY_BUILT_ON));
 		printf("options:");
 		printf("%s ", BN_options());
-#ifndef OPENSSL_NO_MD2
-		printf("%s ", MD2_options());
-#endif
 #ifndef OPENSSL_NO_RC4
 		printf("%s ", RC4_options());
 #endif
diff --git a/lib/libssl/src/apps/version.c b/lib/libssl/src/apps/version.c
index bd21f5d0171..927704b65e0 100644
--- a/lib/libssl/src/apps/version.c
+++ b/lib/libssl/src/apps/version.c
@@ -116,9 +116,6 @@
 #include <openssl/evp.h>
 #include <openssl/crypto.h>
 #include <openssl/bn.h>
-#ifndef OPENSSL_NO_MD2
-#include <openssl/md2.h>
-#endif
 #ifndef OPENSSL_NO_RC4
 #include <openssl/rc4.h>
 #endif
@@ -188,9 +185,6 @@ version_main(int argc, char **argv)
 	if (options) {
 		printf("options:  ");
 		printf("%s ", BN_options());
-#ifndef OPENSSL_NO_MD2
-		printf("%s ", MD2_options());
-#endif
 #ifndef OPENSSL_NO_RC4
 		printf("%s ", RC4_options());
 #endif
diff --git a/lib/libssl/src/crypto/evp/evp.h b/lib/libssl/src/crypto/evp/evp.h
index 25a495b32f4..5cd125894fc 100644
--- a/lib/libssl/src/crypto/evp/evp.h
+++ b/lib/libssl/src/crypto/evp/evp.h
@@ -646,9 +646,6 @@ void BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
 #endif
 
 const EVP_MD *EVP_md_null(void);
-#ifndef OPENSSL_NO_MD2
-const EVP_MD *EVP_md2(void);
-#endif
 #ifndef OPENSSL_NO_MD4
 const EVP_MD *EVP_md4(void);
 #endif
diff --git a/lib/libssl/src/crypto/pkcs7/sign.c b/lib/libssl/src/crypto/pkcs7/sign.c
index 8b59885f7ea..43168514f96 100644
--- a/lib/libssl/src/crypto/pkcs7/sign.c
+++ b/lib/libssl/src/crypto/pkcs7/sign.c
@@ -76,9 +76,6 @@ char *argv[];
 	int i;
 	int nodetach=0;
 
-#ifndef OPENSSL_NO_MD2
-	EVP_add_digest(EVP_md2());
-#endif
 #ifndef OPENSSL_NO_MD5
 	EVP_add_digest(EVP_md5());
 #endif
diff --git a/lib/libssl/src/crypto/pkcs7/verify.c b/lib/libssl/src/crypto/pkcs7/verify.c
index b40f26032ec..414f985dc2f 100644
--- a/lib/libssl/src/crypto/pkcs7/verify.c
+++ b/lib/libssl/src/crypto/pkcs7/verify.c
@@ -85,9 +85,6 @@ char *argv[];
 
 	bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 	bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
-#ifndef OPENSSL_NO_MD2
-	EVP_add_digest(EVP_md2());
-#endif
 #ifndef OPENSSL_NO_MD5
 	EVP_add_digest(EVP_md5());
 #endif