Remove obsolete MDC-2DES from libcrypto.

ok deraadt@ jsing@ miod@

3 files changed, 1 insertions, 134 deletions

diff --git a/src/regress/lib/libcrypto/Makefile b/src/regress/lib/libcrypto/Makefile
index 3836a55d98..b2247a7b29 100644
--- a/src/regress/lib/libcrypto/Makefile
+++ b/src/regress/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.17 2014/11/18 21:52:43 miod Exp $
+#       $OpenBSD: Makefile,v 1.18 2015/06/20 01:07:25 doug Exp $
 
 SUBDIR= \
         aead \
@@ -26,7 +26,6 @@ SUBDIR= \
         ige \
         md4 \
         md5 \
-        mdc2 \
         pbkdf2 \
         pkcs7 \
         poly1305 \
diff --git a/src/regress/lib/libcrypto/mdc2/Makefile b/src/regress/lib/libcrypto/mdc2/Makefile
deleted file mode 100644
index 67764ec7df..0000000000
--- a/src/regress/lib/libcrypto/mdc2/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   mdc2test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/mdc2/mdc2test.c b/src/regress/lib/libcrypto/mdc2/mdc2test.c
deleted file mode 100644
index aa84a3a00b..0000000000
--- a/src/regress/lib/libcrypto/mdc2/mdc2test.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* crypto/mdc2/mdc2test.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/evp.h>
-#include <openssl/mdc2.h>
-
-static unsigned char pad1[16]={
-        0x42,0xE5,0x0C,0xD2,0x24,0xBA,0xCE,0xBA,
-        0x76,0x0B,0xDD,0x2B,0xD4,0x09,0x28,0x1A
-        };
-
-static unsigned char pad2[16]={
-        0x2E,0x46,0x79,0xB5,0xAD,0xD9,0xCA,0x75,
-        0x35,0xD8,0x7A,0xFE,0xAB,0x33,0xBE,0xE2
-        };
-
-int main(int argc, char *argv[])
-        {
-        int ret=0;
-        unsigned char md[MDC2_DIGEST_LENGTH];
-        int i;
-        EVP_MD_CTX c;
-        static char *text="Now is the time for all ";
-
-        EVP_MD_CTX_init(&c);
-        EVP_DigestInit_ex(&c,EVP_mdc2(), NULL);
-        EVP_DigestUpdate(&c,(unsigned char *)text,strlen(text));
-        EVP_DigestFinal_ex(&c,&(md[0]),NULL);
-
-        if (memcmp(md,pad1,MDC2_DIGEST_LENGTH) != 0)
-                {
-                for (i=0; i<MDC2_DIGEST_LENGTH; i++)
-                        printf("%02X",md[i]);
-                printf(" <- generated\n");
-                for (i=0; i<MDC2_DIGEST_LENGTH; i++)
-                        printf("%02X",pad1[i]);
-                printf(" <- correct\n");
-                ret=1;
-                }
-        else
-                printf("pad1 - ok\n");
-
-        EVP_DigestInit_ex(&c,EVP_mdc2(), NULL);
-        /* FIXME: use a ctl function? */
-        ((MDC2_CTX *)c.md_data)->pad_type=2;
-        EVP_DigestUpdate(&c,(unsigned char *)text,strlen(text));
-        EVP_DigestFinal_ex(&c,&(md[0]),NULL);
-
-        if (memcmp(md,pad2,MDC2_DIGEST_LENGTH) != 0)
-                {
-                for (i=0; i<MDC2_DIGEST_LENGTH; i++)
-                        printf("%02X",md[i]);
-                printf(" <- generated\n");
-                for (i=0; i<MDC2_DIGEST_LENGTH; i++)
-                        printf("%02X",pad2[i]);
-                printf(" <- correct\n");
-                ret=1;
-                }
-        else
-                printf("pad2 - ok\n");
-
-        EVP_MD_CTX_cleanup(&c);
-        exit(ret);
-        }