Clean up EVP macros, rename DES EDE3 modes correctly, temporary support for

[oweals/openssl.git] / crypto / evp / m_mdc2.c

diff --git a/crypto/evp/m_mdc2.c b/crypto/evp/m_mdc2.c
index da70f689b85e4a3535f19020e14f0ff2dc17d7f1..04fe37dc444e0211092eeaa8cc92c839c65c983b 100644 (file)
--- a/crypto/evp/m_mdc2.c
+++ b/crypto/evp/m_mdc2.c
@@ -1,5 +1,5 @@
 /* crypto/evp/m_mdc2.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -56,13 +56,14 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef OPENSSL_NO_MDC2
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
 
-static EVP_MD mdc2_md=
+static const EVP_MD mdc2_md=
        {
        NID_mdc2,
        NID_mdc2WithRSA,
@@ -71,9 +72,12 @@ static EVP_MD mdc2_md=
        MDC2_Update,
        MDC2_Final,
        EVP_PKEY_RSA_ASN1_OCTET_STRING_method,
+       MDC2_BLOCK,
+       sizeof(EVP_MD *)+sizeof(MDC2_CTX),
        };
 
-EVP_MD *EVP_mdc2()
+const EVP_MD *EVP_mdc2(void)
        {
        return(&mdc2_md);
        }
+#endif