From f77f1a0d291a44b30f0750bbb5adccda1292cd55 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Mon, 17 Jan 2011 09:27:27 +0900 Subject: [PATCH] --- yaml --- r: 231958 b: refs/heads/master c: 154a96bfcd53b8e5020718c64769e542c44788b9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/keys/trusted_defined.c | 30 ++++++++++++--------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 72da38a051aa..caa8a6d4b2d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e7491f685cbc962f2ef977f7b5f8ed0b3100e88 +refs/heads/master: 154a96bfcd53b8e5020718c64769e542c44788b9 diff --git a/trunk/security/keys/trusted_defined.c b/trunk/security/keys/trusted_defined.c index f7d06776faf0..2836c6dc18a3 100644 --- a/trunk/security/keys/trusted_defined.c +++ b/trunk/security/keys/trusted_defined.c @@ -150,17 +150,15 @@ static int TSS_authhmac(unsigned char *digest, const unsigned char *key, data = va_arg(argp, unsigned char *); if (!data) { ret = -EINVAL; - va_end(argp); - goto out; + break; } ret = crypto_shash_update(&sdesc->shash, data, dlen); - if (ret < 0) { - va_end(argp); - goto out; - } + if (ret < 0) + break; } va_end(argp); - ret = crypto_shash_final(&sdesc->shash, paramdigest); + if (!ret) + ret = crypto_shash_final(&sdesc->shash, paramdigest); if (!ret) ret = TSS_rawhmac(digest, key, keylen, SHA1_DIGEST_SIZE, paramdigest, TPM_NONCE_SIZE, h1, @@ -229,13 +227,12 @@ static int TSS_checkhmac1(unsigned char *buffer, break; dpos = va_arg(argp, unsigned int); ret = crypto_shash_update(&sdesc->shash, buffer + dpos, dlen); - if (ret < 0) { - va_end(argp); - goto out; - } + if (ret < 0) + break; } va_end(argp); - ret = crypto_shash_final(&sdesc->shash, paramdigest); + if (!ret) + ret = crypto_shash_final(&sdesc->shash, paramdigest); if (ret < 0) goto out; @@ -323,13 +320,12 @@ static int TSS_checkhmac2(unsigned char *buffer, break; dpos = va_arg(argp, unsigned int); ret = crypto_shash_update(&sdesc->shash, buffer + dpos, dlen); - if (ret < 0) { - va_end(argp); - goto out; - } + if (ret < 0) + break; } va_end(argp); - ret = crypto_shash_final(&sdesc->shash, paramdigest); + if (!ret) + ret = crypto_shash_final(&sdesc->shash, paramdigest); if (ret < 0) goto out;