commit 754106713fd349be267ec0dfe6f4f8a97c1b3cdb
author Alexandre Savard <alexandre.savard@savoirfairelinux.com> Wed Aug 08 09:50:01 2012 -0400
committer Alexandre Savard <alexandre.savard@savoirfairelinux.com> Wed Aug 08 09:50:01 2012 -0400
tree 767702dc681aea550f7c8c626e936e019981b7dc
parent ace91efcc58b8704c3e8e9c03e33afc1a59aecc3

#14465: Update openssl to tag android-4.0.4_r2.1

jni/openssl/crypto/hmac/hm_pmeth.c

diff --git a/jni/openssl/crypto/hmac/hm_pmeth.c b/jni/openssl/crypto/hmac/hm_pmeth.c
index 0daa445..71e8567 100644
--- a/jni/openssl/crypto/hmac/hm_pmeth.c
+++ b/jni/openssl/crypto/hmac/hm_pmeth.c
@@ -100,8 +100,7 @@
 	dctx = dst->data;
 	dctx->md = sctx->md;
 	HMAC_CTX_init(&dctx->ctx);
-	if (!HMAC_CTX_copy(&dctx->ctx, &sctx->ctx))
-		return 0;
+	HMAC_CTX_copy(&dctx->ctx, &sctx->ctx);
 	if (sctx->ktmp.data)
 		{
 		if (!ASN1_OCTET_STRING_set(&dctx->ktmp,
@@ -142,8 +141,7 @@
 static int int_update(EVP_MD_CTX *ctx,const void *data,size_t count)
 	{
 	HMAC_PKEY_CTX *hctx = ctx->pctx->data;
-	if (!HMAC_Update(&hctx->ctx, data, count))
-		return 0;
+	HMAC_Update(&hctx->ctx, data, count);
 	return 1;
 	}
 
@@ -169,8 +167,7 @@
 	if (!sig)
 		return 1;
 
-	if (!HMAC_Final(&hctx->ctx, sig, &hlen))
-		return 0;
+	HMAC_Final(&hctx->ctx, sig, &hlen);
 	*siglen = (size_t)hlen;
 	return 1;
 	}
@@ -195,9 +192,8 @@
 
 		case EVP_PKEY_CTRL_DIGESTINIT:
 		key = (ASN1_OCTET_STRING *)ctx->pkey->pkey.ptr;
-		if (!HMAC_Init_ex(&hctx->ctx, key->data, key->length, hctx->md,
-				ctx->engine))
-			return 0;
+		HMAC_Init_ex(&hctx->ctx, key->data, key->length, hctx->md,
+				ctx->engine);
 		break;
 
 		default: