generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix ABI break with HMAC

Browse Source 
Recent HMAC changes broke ABI compatibility due to a new field in HMAC_CTX.
This backs that change out, and does it a different way.

Thanks to Timo Teras for the concept.

Conflicts:
	crypto/hmac/hmac.c

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2015-06-12 13:08:04 +01:00
parent b6ed991731
commit 1030f89f5e
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crypto/hmac/hmac.c
View File

@ -97,6 +97,9 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
return FIPS_hmac_init_ex(ctx, key, len, md, NULL); return FIPS_hmac_init_ex(ctx, key, len, md, NULL);
} }
#endif #endif
/* If we are changing MD then we must have a key */
if (md != NULL && md != ctx->md && (key == NULL || len < 0))
return 0;
if (md != NULL) { if (md != NULL) {
reset = 1; reset = 1;
@ -107,9 +110,6 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
return 0; return 0;
} }
if (!ctx->key_init && key == NULL)
return 0;
if (key != NULL) { if (key != NULL) {
reset = 1; reset = 1;
j = EVP_MD_block_size(md); j = EVP_MD_block_size(md);
@ -131,7 +131,6 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
if (ctx->key_length != HMAC_MAX_MD_CBLOCK) if (ctx->key_length != HMAC_MAX_MD_CBLOCK)
memset(&ctx->key[ctx->key_length], 0, memset(&ctx->key[ctx->key_length], 0,
HMAC_MAX_MD_CBLOCK - ctx->key_length); HMAC_MAX_MD_CBLOCK - ctx->key_length);
ctx->key_init = 1;
} }
if (reset) { if (reset) {
@ -169,7 +168,7 @@ int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
if (FIPS_mode() && !ctx->i_ctx.engine) if (FIPS_mode() && !ctx->i_ctx.engine)
return FIPS_hmac_update(ctx, data, len); return FIPS_hmac_update(ctx, data, len);
#endif #endif
if (!ctx->key_init) if (!ctx->md)
return 0; return 0;
return EVP_DigestUpdate(&ctx->md_ctx, data, len); return EVP_DigestUpdate(&ctx->md_ctx, data, len);
@ -184,7 +183,7 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
return FIPS_hmac_final(ctx, md, len); return FIPS_hmac_final(ctx, md, len);
#endif #endif
if (!ctx->key_init) if (!ctx->md)
goto err; goto err;
if (!EVP_DigestFinal_ex(&ctx->md_ctx, buf, &i)) if (!EVP_DigestFinal_ex(&ctx->md_ctx, buf, &i))
@ -205,7 +204,6 @@ void HMAC_CTX_init(HMAC_CTX *ctx)
EVP_MD_CTX_init(&ctx->i_ctx); EVP_MD_CTX_init(&ctx->i_ctx);
EVP_MD_CTX_init(&ctx->o_ctx); EVP_MD_CTX_init(&ctx->o_ctx);
EVP_MD_CTX_init(&ctx->md_ctx); EVP_MD_CTX_init(&ctx->md_ctx);
ctx->key_init = 0;
ctx->md = NULL; ctx->md = NULL;
} }
@ -217,11 +215,8 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
goto err; goto err;
if (!EVP_MD_CTX_copy(&dctx->md_ctx, &sctx->md_ctx)) if (!EVP_MD_CTX_copy(&dctx->md_ctx, &sctx->md_ctx))
goto err; goto err;
dctx->key_init = sctx->key_init;
if (sctx->key_init) {
memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK); memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK);
dctx->key_length = sctx->key_length; dctx->key_length = sctx->key_length;
}
dctx->md = sctx->md; dctx->md = sctx->md;
return 1; return 1;
err: err:

1
crypto/hmac/hmac.h
View File

@ -79,7 +79,6 @@ typedef struct hmac_ctx_st {
EVP_MD_CTX o_ctx; EVP_MD_CTX o_ctx;
unsigned int key_length; unsigned int key_length;
unsigned char key[HMAC_MAX_MD_CBLOCK]; unsigned char key[HMAC_MAX_MD_CBLOCK];
int key_init;
} HMAC_CTX; } HMAC_CTX;
# define HMAC_size(e) (EVP_MD_size((e)->md)) # define HMAC_size(e) (EVP_MD_size((e)->md))

7
crypto/hmac/hmactest.c
View File

@ -233,7 +233,12 @@ test5:
err++; err++;
goto test6; goto test6;
} }
if (!HMAC_Init_ex(&ctx, NULL, 0, EVP_sha256(), NULL)) { if (HMAC_Init_ex(&ctx, NULL, 0, EVP_sha256(), NULL)) {
printf("Should disallow changing MD without a new key (test 5)\n");
err++;
goto test6;
}
if (!HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, EVP_sha256(), NULL)) {
printf("Failed to reinitialise HMAC (test 5)\n"); printf("Failed to reinitialise HMAC (test 5)\n");
err++; err++;
goto test6; goto test6;