From ca28e541c86936857a23a70090980a8bb952e842 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Tue, 28 Feb 2017 14:15:37 +0000
Subject: Add an EVP interface that provides concatenated MD5+SHA1 hashes,
 which are used in various parts of TLS 1.0/1.1.

This will allow for code simplification in libssl.

The same interface exists in OpenSSL 1.1.

ok beck@ deraadt@ inoguchi@ millert@
---
 src/lib/libcrypto/evp/m_md5_sha1.c | 83 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 src/lib/libcrypto/evp/m_md5_sha1.c

(limited to 'src/lib/libcrypto/evp/m_md5_sha1.c')

diff --git a/src/lib/libcrypto/evp/m_md5_sha1.c b/src/lib/libcrypto/evp/m_md5_sha1.c
new file mode 100644
index 0000000000..272cdee9dd
--- /dev/null
+++ b/src/lib/libcrypto/evp/m_md5_sha1.c
@@ -0,0 +1,83 @@
+/* $OpenBSD: m_md5_sha1.c,v 1.1 2017/02/28 14:15:37 jsing Exp $ */
+/*
+ * Copyright (c) 2017 Joel Sing <jsing@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <openssl/evp.h>
+#include <openssl/md5.h>
+#include <openssl/objects.h>
+#include <openssl/sha.h>
+
+struct md5_sha1_ctx {
+	MD5_CTX md5;
+	SHA_CTX sha1;
+};
+
+static int
+md5_sha1_init(EVP_MD_CTX *ctx)
+{
+	struct md5_sha1_ctx *mdctx = ctx->md_data;
+
+	if (!MD5_Init(&mdctx->md5))
+		return 0;
+	if (!SHA1_Init(&mdctx->sha1))
+		return 0;
+
+	return 1;
+}
+
+static int 
+md5_sha1_update(EVP_MD_CTX *ctx, const void *data, size_t count)
+{
+	struct md5_sha1_ctx *mdctx = ctx->md_data;
+
+	if (!MD5_Update(&mdctx->md5, data, count))
+		return 0;
+	if (!SHA1_Update(&mdctx->sha1, data, count))
+		return 0;
+
+	return 1;
+}
+
+static int
+md5_sha1_final(EVP_MD_CTX *ctx, unsigned char *out)
+{
+	struct md5_sha1_ctx *mdctx = ctx->md_data;
+
+	if (!MD5_Final(out, &mdctx->md5))
+		return 0;
+	if (!SHA1_Final(out + MD5_DIGEST_LENGTH, &mdctx->sha1))
+		return 0;
+
+	return 1;
+}
+
+static const EVP_MD md5_sha1_md = {
+        .type = NID_md5_sha1,
+        .pkey_type = NID_md5_sha1,
+        .md_size = MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH,
+        .flags = 0,
+        .init = md5_sha1_init,
+        .update = md5_sha1_update,
+        .final = md5_sha1_final,
+        .block_size = MD5_CBLOCK, /* MD5_CBLOCK == SHA_CBLOCK */
+        .ctx_size = sizeof(EVP_MD *) + sizeof(struct md5_sha1_ctx),
+};
+
+const EVP_MD *
+EVP_md5_sha1(void)
+{
+	return &md5_sha1_md;
+}
-- 
cgit v1.2.3-55-g6feb