openssl-1.0.0e: resolve conflicts

1 files changed, 0 insertions, 3 deletions

diff --git a/src/lib/libcrypto/hmac/hmac.c b/src/lib/libcrypto/hmac/hmac.c
index 45015fe754..6c98fc43a3 100644
--- a/src/lib/libcrypto/hmac/hmac.c
+++ b/src/lib/libcrypto/hmac/hmac.c
@@ -138,12 +138,9 @@ int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
 
 int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
         {
-        int j;
         unsigned int i;
         unsigned char buf[EVP_MAX_MD_SIZE];
 
-        j=EVP_MD_block_size(ctx->md);
-
         if (!EVP_DigestFinal_ex(&ctx->md_ctx,buf,&i))
                 goto err;
         if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->o_ctx))