1 files changed, 0 insertions, 97 deletions
diff --git a/main/openssl/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch b/main/openssl/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
deleted file mode 100644
index 7d8092607b..0000000000
--- a/main/openssl/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From ca3e27975dce1d969eeb41f5d882b34cb3eb1efb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Fri, 4 Jun 2010 09:48:39 +0300
-Subject: [PATCH 1/4] crypto/hmac: support EVP_MD_CTX_FLAG_ONESHOT and set it
- properly
-
-Some engines (namely VIA C7 Padlock) work only if EVP_MD_CTX_FLAG_ONESHOT
-is set before final update. This is because some crypto accelerators cannot
-perform non-finalizing transform of the digest.
-
-The usage of EVP_MD_CTX_FLAG_ONESHOT is used semantically slightly
-differently here. It is set before the final EVP_DigestUpdate call, not
-necessarily before EVP_DigestInit call. This will not cause any problems
-though.
----
- crypto/hmac/hmac.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
-index ba27cbf..cffa0ba 100644
---- a/crypto/hmac/hmac.c
-+++ b/crypto/hmac/hmac.c
-@@ -104,6 +104,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
- 		OPENSSL_assert(j <= (int)sizeof(ctx->key));
- 		if (j < len)
- 			{
-+			EVP_MD_CTX_set_flags(&ctx->md_ctx, EVP_MD_CTX_FLAG_ONESHOT);
- 			if (!EVP_DigestInit_ex(&ctx->md_ctx,md, impl))
- 				goto err;
- 			if (!EVP_DigestUpdate(&ctx->md_ctx,key,len))
-@@ -127,6 +128,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
- 		{
- 		for (i=0; i<HMAC_MAX_MD_CBLOCK; i++)
- 			pad[i]=0x36^ctx->key[i];
-+		EVP_MD_CTX_clear_flags(&ctx->i_ctx, EVP_MD_CTX_FLAG_ONESHOT);
- 		if (!EVP_DigestInit_ex(&ctx->i_ctx,md, impl))
- 			goto err;
- 		if (!EVP_DigestUpdate(&ctx->i_ctx,pad,EVP_MD_block_size(md)))
-@@ -134,14 +136,18 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
- 
- 		for (i=0; i<HMAC_MAX_MD_CBLOCK; i++)
- 			pad[i]=0x5c^ctx->key[i];
-+		EVP_MD_CTX_clear_flags(&ctx->o_ctx, EVP_MD_CTX_FLAG_ONESHOT);
- 		if (!EVP_DigestInit_ex(&ctx->o_ctx,md, impl))
- 			goto err;
- 		if (!EVP_DigestUpdate(&ctx->o_ctx,pad,EVP_MD_block_size(md)))
- 			goto err;
- 		}
-+
- 	if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->i_ctx))
- 			goto err;
-+	EVP_MD_CTX_clear_flags(&ctx->md_ctx, EVP_MD_CTX_FLAG_ONESHOT);
- 	return 1;
-+
- 	err:
- 	return 0;
- 	}
-@@ -166,6 +172,7 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
- 	{
- 	unsigned int i;
- 	unsigned char buf[EVP_MAX_MD_SIZE];
-+
- #ifdef OPENSSL_FIPS
- 	if (FIPS_mode() && !ctx->i_ctx.engine)
- 		return FIPS_hmac_final(ctx, md, len);
-@@ -175,6 +182,7 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
- 		goto err;
- 	if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->o_ctx))
- 		goto err;
-+	EVP_MD_CTX_set_flags(&ctx->md_ctx,EVP_MD_CTX_FLAG_ONESHOT);
- 	if (!EVP_DigestUpdate(&ctx->md_ctx,buf,i))
- 		goto err;
- 	if (!EVP_DigestFinal_ex(&ctx->md_ctx,md,len))
-@@ -231,8 +239,9 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
- 
- 	if (md == NULL) md=m;
- 	HMAC_CTX_init(&c);
--	if (!HMAC_Init(&c,key,key_len,evp_md))
-+	if (!HMAC_Init_ex(&c,key,key_len,evp_md,NULL))
- 		goto err;
-+	HMAC_CTX_set_flags(&c,EVP_MD_CTX_FLAG_ONESHOT);
- 	if (!HMAC_Update(&c,d,n))
- 		goto err;
- 	if (!HMAC_Final(&c,md,md_len))
-@@ -245,7 +254,7 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
- 
- void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags)
- 	{
--	EVP_MD_CTX_set_flags(&ctx->i_ctx, flags);
--	EVP_MD_CTX_set_flags(&ctx->o_ctx, flags);
-+	EVP_MD_CTX_set_flags(&ctx->i_ctx, flags & ~EVP_MD_CTX_FLAG_ONESHOT);
-+	EVP_MD_CTX_set_flags(&ctx->o_ctx, flags & ~EVP_MD_CTX_FLAG_ONESHOT);
- 	EVP_MD_CTX_set_flags(&ctx->md_ctx, flags);
- 	}
--- 
-1.7.11.3
-