Commit 2f142ada authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add MD5+SHA1 



Add digest combining MD5 and SHA1. This is used by RSA signatures for
TLS 1.1 and earlier.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 63eb10a0

crypto/evp/Makefile

+2 −2
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_dss1.c m_mdc2.c m_ripemd.c m_ecdsa.c\

	m_md5_sha1.c m_dss1.c m_mdc2.c m_ripemd.c m_ecdsa.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_dss1.o m_mdc2.o m_ripemd.o m_ecdsa.o\

	m_md5_sha1.o m_dss1.o m_mdc2.o m_ripemd.o m_ecdsa.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 \

crypto/evp/c_alld.c

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ void OpenSSL_add_all_digests(void) 
#ifndef OPENSSL_NO_MD5

    EVP_add_digest(EVP_md5());

    EVP_add_digest_alias(SN_md5, "ssl3-md5");

    EVP_add_digest(EVP_md5_sha1());

#endif

    EVP_add_digest(EVP_sha1());

    EVP_add_digest_alias(SN_sha1, "ssl3-sha1");

crypto/evp/m_md5_sha1.c

0 → 100644
+114 −0
Original line number Diff line number Diff line 
/* crypto/evp/m_md5_sha1.c */

/*

 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL

 * project.

 */

/* ====================================================================

 * Copyright (c) 2015 The OpenSSL Project.  All rights reserved.

 *

 * 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 above 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 acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"

 *

 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

 *    endorse or promote products derived from this software without

 *    prior written permission. For written permission, please contact

 *    licensing@OpenSSL.org.

 *

 * 5. Products derived from this software may not be called "OpenSSL"

 *    nor may "OpenSSL" appear in their names without prior written

 *    permission of the OpenSSL Project.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"

 *

 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

 * EXPRESSED 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 OpenSSL PROJECT OR

 * ITS 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.

 * ====================================================================

 */



#if !defined(OPENSSL_NO_MD5) && !defined(OPENSSL_NO_SHA1)



# include <openssl/evp.h>

# include <openssl/objects.h>

# include <openssl/x509.h>

# include <openssl/md5.h>

# include <openssl/sha.h>

# ifndef OPENSSL_NO_RSA

#  include <openssl/rsa.h>

# endif



struct md5_sha1_ctx {

    MD5_CTX md5;

    SHA_CTX sha1;

};



static int init(EVP_MD_CTX *ctx)

{

    struct md5_sha1_ctx *mctx = ctx->md_data;

    if (!MD5_Init(&mctx->md5))

        return 0;

    return SHA1_Init(&mctx->sha1);

}



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

{

    struct md5_sha1_ctx *mctx = ctx->md_data;

    if (!MD5_Update(&mctx->md5, data, count))

        return 0;

    return SHA1_Update(&mctx->sha1, data, count);

}



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

{

    struct md5_sha1_ctx *mctx = ctx->md_data;

    if (!MD5_Final(md, &mctx->md5))

        return 0;

    return SHA1_Final(md + MD5_DIGEST_LENGTH, &mctx->sha1);

}



static const EVP_MD md5_sha1_md = {

    NID_md5_sha1,

    NID_md5_sha1,

    MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH,

    0,

    init,

    update,

    final,

    NULL,

    NULL,

    EVP_PKEY_RSA_method,

    MD5_CBLOCK,

    sizeof(EVP_MD *) + sizeof(struct md5_sha1_ctx),

};



const EVP_MD *EVP_md5_sha1(void)

{

    return &md5_sha1_md;

}

#endif

include/openssl/evp.h

+1 −0
Original line number Diff line number Diff line
@@ -766,6 +766,7 @@ const EVP_MD *EVP_md4(void); 
# endif

# ifndef OPENSSL_NO_MD5

const EVP_MD *EVP_md5(void);

const EVP_MD *EVP_md5_sha1(void);

# endif

const EVP_MD *EVP_sha1(void);

const EVP_MD *EVP_dss1(void);