5 files changed, 13 insertions, 43 deletions

diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1
index c90d998cb6..5106943640 100644
--- a/src/usr.bin/openssl/openssl.1
+++ b/src/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.14 2015/06/18 11:38:41 jmc Exp $
+.\" $OpenBSD: openssl.1,v 1.15 2015/06/20 01:07:25 doug Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -112,7 +112,7 @@
 .\"
 .\" OPENSSL
 .\"
-.Dd $Mdocdate: June 18 2015 $
+.Dd $Mdocdate: June 20 2015 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -389,8 +389,6 @@ GOST R 34.11-94 digest.
 MD4 digest.
 .It Cm md5
 MD5 digest.
-.It Cm mdc2
-MDC-2 digest.
 .It Cm ripemd160
 RIPEMD-160 digest.
 .It Cm sha
@@ -1814,7 +1812,7 @@ install user certificates and CAs in MSIE using the Xenroll control.
 .Bk -words
 .Oo
 .Fl gost-mac | streebog256 | streebog512 | md_gost94 |
-.Fl md4 | md5 | mdc2 | ripemd160 | sha | sha1 |
+.Fl md4 | md5 | ripemd160 | sha | sha1 |
 .Fl sha224 | sha256 | sha384 | sha512 | whirlpool
 .Oc
 .Op Fl binary
@@ -1838,7 +1836,7 @@ install user certificates and CAs in MSIE using the Xenroll control.
 .Pp
 .Nm openssl
 .Cm gost-mac | streebog256 | streebog512 | md_gost94 |
-.Cm md4 | md5 | mdc2 | ripemd160 | sha | sha1 |
+.Cm md4 | md5 | ripemd160 | sha | sha1 |
 .Cm sha224 | sha256 | sha384 | sha512 | whirlpool
 .Op Fl c
 .Op Fl d
diff --git a/src/usr.bin/openssl/req.c b/src/usr.bin/openssl/req.c
index 1d50524052..93742971ff 100644
--- a/src/usr.bin/openssl/req.c
+++ b/src/usr.bin/openssl/req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: req.c,v 1.4 2014/10/16 10:43:54 jsing Exp $ */
+/* $OpenBSD: req.c,v 1.5 2015/06/20 01:07:25 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -379,7 +379,7 @@ bad:
                 BIO_printf(bio_err, " -newkey rsa:bits generate a new RSA key of 'bits' in size\n");
                 BIO_printf(bio_err, " -newkey dsa:file generate a new DSA key, parameters taken from CA in 'file'\n");
                 BIO_printf(bio_err, " -newkey ec:file generate a new EC key, parameters taken from CA in 'file'\n");
-                BIO_printf(bio_err, " -[digest]      Digest to sign with (md5, sha1, md2, mdc2, md4)\n");
+                BIO_printf(bio_err, " -[digest]      Digest to sign with (md5, sha1, md4)\n");
                 BIO_printf(bio_err, " -config file   request template file.\n");
                 BIO_printf(bio_err, " -subj arg      set or modify request subject\n");
                 BIO_printf(bio_err, " -multivalue-rdn enable support for multivalued RDNs\n");
diff --git a/src/usr.bin/openssl/speed.c b/src/usr.bin/openssl/speed.c
index 8795d6c434..236e0267bb 100644
--- a/src/usr.bin/openssl/speed.c
+++ b/src/usr.bin/openssl/speed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: speed.c,v 1.5 2015/02/08 10:22:45 doug Exp $ */
+/* $OpenBSD: speed.c,v 1.6 2015/06/20 01:07:25 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -124,9 +124,6 @@
 #ifndef OPENSSL_NO_IDEA
 #include <openssl/idea.h>
 #endif
-#ifndef OPENSSL_NO_MDC2
-#include <openssl/mdc2.h>
-#endif
 #ifndef OPENSSL_NO_MD4
 #include <openssl/md4.h>
 #endif
@@ -179,7 +176,7 @@ static int do_multi(int multi);
 #define MAX_ECDH_SIZE 256
 
 static const char *names[ALGOR_NUM] = {
-        "md2", "mdc2", "md4", "md5", "hmac(md5)", "sha1", "rmd160", "rc4",
+        "md2", "md4", "md5", "hmac(md5)", "sha1", "rmd160", "rc4",
         "des cbc", "des ede3", "idea cbc", "seed cbc",
         "rc2 cbc", "rc5-32/12 cbc", "blowfish cbc", "cast cbc",
         "aes-128 cbc", "aes-192 cbc", "aes-256 cbc",
@@ -241,9 +238,6 @@ speed_main(int argc, char **argv)
         long rsa_count;
         unsigned rsa_num;
         unsigned char md[EVP_MAX_MD_SIZE];
-#ifndef OPENSSL_NO_MDC2
-        unsigned char mdc2[MDC2_DIGEST_LENGTH];
-#endif
 #ifndef OPENSSL_NO_MD4
         unsigned char md4[MD4_DIGEST_LENGTH];
 #endif
@@ -331,7 +325,6 @@ speed_main(int argc, char **argv)
         CAMELLIA_KEY camellia_ks1, camellia_ks2, camellia_ks3;
 #endif
 #define D_MD2           0
-#define D_MDC2          1
 #define D_MD4           2
 #define D_MD5           3
 #define D_HMAC          4
@@ -586,11 +579,6 @@ speed_main(int argc, char **argv)
                         j--;    /* Otherwise, -mr gets confused with an
                                  * algorithm. */
                 } else
-#ifndef OPENSSL_NO_MDC2
-                if (strcmp(*argv, "mdc2") == 0)
-                        doit[D_MDC2] = 1;
-                else
-#endif
 #ifndef OPENSSL_NO_MD4
                 if (strcmp(*argv, "md4") == 0)
                         doit[D_MD4] = 1;
@@ -844,9 +832,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_MDC2
-                        BIO_printf(bio_err, "mdc2     ");
-#endif
 #ifndef OPENSSL_NO_MD4
                         BIO_printf(bio_err, "md4      ");
 #endif
@@ -871,7 +856,7 @@ speed_main(int argc, char **argv)
 #ifndef OPENSSL_NO_RIPEMD160
                         BIO_printf(bio_err, "rmd160");
 #endif
-#if !defined(OPENSSL_NO_MD2) || !defined(OPENSSL_NO_MDC2) || \
+#if !defined(OPENSSL_NO_MD2) || \
     !defined(OPENSSL_NO_MD4) || !defined(OPENSSL_NO_MD5) || \
     !defined(OPENSSL_NO_SHA1) || !defined(OPENSSL_NO_RIPEMD160) || \
     !defined(OPENSSL_NO_WHIRLPOOL)
@@ -1042,19 +1027,6 @@ speed_main(int argc, char **argv)
 #define COUNT(d) (count)
         signal(SIGALRM, sig_done);
 
-#ifndef OPENSSL_NO_MDC2
-        if (doit[D_MDC2]) {
-                for (j = 0; j < SIZE_NUM; j++) {
-                        print_message(names[D_MDC2], c[D_MDC2][j], lengths[j]);
-                        Time_F(START);
-                        for (count = 0, run = 1; COND(c[D_MDC2][j]); count++)
-                                EVP_Digest(buf, (unsigned long) lengths[j], &(mdc2[0]), NULL, EVP_mdc2(), NULL);
-                        d = Time_F(STOP);
-                        print_result(D_MDC2, j, count, d);
-                }
-        }
-#endif
-
 #ifndef OPENSSL_NO_MD4
         if (doit[D_MD4]) {
                 for (j = 0; j < SIZE_NUM; j++) {
diff --git a/src/usr.bin/openssl/ts.c b/src/usr.bin/openssl/ts.c
index cd7d9cc81e..341d9395c7 100644
--- a/src/usr.bin/openssl/ts.c
+++ b/src/usr.bin/openssl/ts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts.c,v 1.3 2014/10/22 13:54:03 jsing Exp $ */
+/* $OpenBSD: ts.c,v 1.4 2015/06/20 01:07:25 doug Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -306,7 +306,7 @@ usage:
         BIO_printf(bio_err, "usage:\n"
             "ts -query [-config configfile] "
             "[-data file_to_hash] [-digest digest_bytes]"
-            "[-md2|-md4|-md5|-sha|-sha1|-mdc2|-ripemd160] "
+            "[-md2|-md4|-md5|-sha|-sha1|-ripemd160] "
             "[-policy object_id] [-no_nonce] [-cert] "
             "[-in request.tsq] [-out request.tsq] [-text]\n");
         BIO_printf(bio_err, "or\n"
diff --git a/src/usr.bin/openssl/x509.c b/src/usr.bin/openssl/x509.c
index db3173e74d..0e4d7dcd77 100644
--- a/src/usr.bin/openssl/x509.c
+++ b/src/usr.bin/openssl/x509.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
+/* $OpenBSD: x509.c,v 1.3 2015/06/20 01:07:25 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -135,7 +135,7 @@ static const char *x509_usage[] = {
         " -set_serial     - serial number to use\n",
         " -text           - print the certificate in text form\n",
         " -C              - print out C code forms\n",
-        " -md2/-md5/-sha1/-mdc2 - digest to use\n",
+        " -md2/-md5/-sha1 - digest to use\n",
         " -extfile        - configuration file with X509V3 extensions to add\n",
         " -extensions     - section from config file with X509V3 extensions to add\n",
         " -clrext         - delete extensions before signing and input certificate\n",