Commit 7f572e95 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Remove legacy sign/verify from EVP_MD. 



Remove sign/verify and required_pkey_type fields of EVP_MD: these are a
legacy from when digests were linked to public key types. All signing is
now handled by the corresponding EVP_PKEY_METHOD.

Only allow supported digest types in RSA EVP_PKEY_METHOD: other algorithms
already block unsupported types.

Remove now obsolete EVP_dss1() and EVP_ecdsa().

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 0aca86b3

crypto/asn1/a_sign.c

+8 −11
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, 
        rv = 2;



    if (rv == 2) {

        if (type->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) {

        if (!pkey->ameth ||

            !OBJ_find_sigid_by_algs(&signid,

                                    EVP_MD_nid(type),
@@ -269,8 +268,6 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, 
                    ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED);

            return 0;

        }

        } else

            signid = type->pkey_type;



        if (pkey->ameth->pkey_flags & ASN1_PKEY_SIGPARAM_NULL)

            paramtype = V_ASN1_NULL;

crypto/engine/eng_openssl.c

+0 −1
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ static const EVP_MD test_sha_md = { 
    test_sha1_final,

    NULL,

    NULL,

    EVP_PKEY_RSA_method,

    SHA_CBLOCK,

    sizeof(EVP_MD *) + sizeof(SHA_CTX),

};

crypto/evp/Makefile

+2 −22
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c evp_cnf.c \ 
	e_rc4.c e_aes.c names.c e_seed.c \

	e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \

	m_null.c m_md2.c m_md4.c m_md5.c m_sha1.c m_wp.c \

	m_md5_sha1.c m_dss1.c m_mdc2.c m_ripemd.c m_ecdsa.c\

	m_md5_sha1.c m_mdc2.c m_ripemd.c \

	p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \

	bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \

	c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \
@@ -33,7 +33,7 @@ LIBOBJ= encode.o digest.o evp_enc.o evp_key.o evp_acnf.o evp_cnf.o \ 
	e_rc4.o e_aes.o names.o e_seed.o \

	e_xcbc_d.o e_rc2.o e_cast.o e_rc5.o \

	m_null.o m_md2.o m_md4.o m_md5.o m_sha1.o m_wp.o \

	m_md5_sha1.o m_dss1.o m_mdc2.o m_ripemd.o m_ecdsa.o\

	m_md5_sha1.o m_mdc2.o m_ripemd.o \

	p_open.o p_seal.o p_sign.o p_verify.o p_lib.o p_enc.o p_dec.o \

	bio_md.o bio_b64.o bio_enc.o evp_err.o e_null.o \

	c_all.o c_allc.o c_alld.o evp_lib.o bio_ok.o \
@@ -460,26 +460,6 @@ evp_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 
evp_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

evp_pkey.o: ../include/internal/asn1_int.h ../include/internal/cryptlib.h

evp_pkey.o: evp_pkey.c

m_dss1.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h

m_dss1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

m_dss1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h

m_dss1.o: ../../include/openssl/err.h ../../include/openssl/evp.h

m_dss1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

m_dss1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

m_dss1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

m_dss1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

m_dss1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

m_dss1.o: ../include/internal/cryptlib.h m_dss1.c

m_ecdsa.o: ../../e_os.h ../../include/openssl/asn1.h

m_ecdsa.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h

m_ecdsa.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

m_ecdsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h

m_ecdsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

m_ecdsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

m_ecdsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

m_ecdsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

m_ecdsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

m_ecdsa.o: ../include/internal/cryptlib.h m_ecdsa.c

m_md2.o: ../../e_os.h ../../include/openssl/bio.h

m_md2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

m_md2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

crypto/evp/c_alld.c

+0 −9
Original line number Diff line number Diff line
@@ -75,15 +75,6 @@ void OpenSSL_add_all_digests(void) 
    EVP_add_digest(EVP_sha1());

    EVP_add_digest_alias(SN_sha1, "ssl3-sha1");

    EVP_add_digest_alias(SN_sha1WithRSAEncryption, SN_sha1WithRSA);

# ifndef OPENSSL_NO_DSA

    EVP_add_digest(EVP_dss1());

    EVP_add_digest_alias(SN_dsaWithSHA1, SN_dsaWithSHA1_2);

    EVP_add_digest_alias(SN_dsaWithSHA1, "DSS1");

    EVP_add_digest_alias(SN_dsaWithSHA1, "dss1");

# endif

# ifndef OPENSSL_NO_EC

    EVP_add_digest(EVP_ecdsa());

# endif

#if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DES)

    EVP_add_digest(EVP_mdc2());

#endif

crypto/evp/m_dss1.c

deleted100644 → 0
+0 −102
Original line number Diff line number Diff line 
/* crypto/evp/m_dss1.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 "internal/cryptlib.h"



#include <openssl/evp.h>

#include <openssl/objects.h>

#include <openssl/sha.h>

#ifndef OPENSSL_NO_DSA

# include <openssl/dsa.h>

#endif



static int init(EVP_MD_CTX *ctx)

{

    return SHA1_Init(ctx->md_data);

}



static int update(EVP_MD_CTX *ctx, const void *data, size_t count)

{

    return SHA1_Update(ctx->md_data, data, count);

}



static int final(EVP_MD_CTX *ctx, unsigned char *md)

{

    return SHA1_Final(md, ctx->md_data);

}



static const EVP_MD dss1_md = {

    NID_dsa,

    NID_dsaWithSHA1,

    SHA_DIGEST_LENGTH,

    EVP_MD_FLAG_PKEY_METHOD_SIGNATURE | EVP_MD_FLAG_PKEY_DIGEST,

    init,

    update,

    final,

    NULL,

    NULL,

    EVP_PKEY_NULL_method,

    SHA_CBLOCK,

    sizeof(EVP_MD *) + sizeof(SHA_CTX),

};



const EVP_MD *EVP_dss1(void)

{

    return (&dss1_md);

}