import OpenSSL 1.0.0e

2 files changed, 2 insertions, 3 deletions

diff --git a/src/lib/libcrypto/hmac/hm_pmeth.c b/src/lib/libcrypto/hmac/hm_pmeth.c
index 985921ca1a..71e8567a14 100644
--- a/src/lib/libcrypto/hmac/hm_pmeth.c
+++ b/src/lib/libcrypto/hmac/hm_pmeth.c
@@ -147,6 +147,8 @@ static int int_update(EVP_MD_CTX *ctx,const void *data,size_t count)
 
 static int hmac_signctx_init(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx)
         {
+        HMAC_PKEY_CTX *hctx = ctx->data;
+        HMAC_CTX_set_flags(&hctx->ctx, mctx->flags & ~EVP_MD_CTX_FLAG_NO_INIT);
         EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_NO_INIT);
         mctx->update = int_update;
         return 1;
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))