diff options
author | Viktor Dukhovni <openssl-users@dukhovni.org> | 2015-04-16 01:50:03 -0400 |
---|---|---|
committer | Viktor Dukhovni <openssl-users@dukhovni.org> | 2015-04-16 13:50:01 -0400 |
commit | 3b38646d1345b5ec4ff7fd13c8b8bd8d46105b7e (patch) | |
tree | af2160713ed289183162cf26dc98c6834a62d408 /crypto/hmac | |
parent | bf5b8ff17dd7039b15cbc6468cd865cbc219581d (diff) |
Code style: space after 'if'
Reviewed-by: Matt Caswell <gitlab@openssl.org>
Diffstat (limited to 'crypto/hmac')
-rw-r--r-- | crypto/hmac/hmac.c | 12 | ||||
-rw-r--r-- | crypto/hmac/hmactest.c | 40 |
2 files changed, 26 insertions, 26 deletions
diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c index 0eea5626e6..5ca389406b 100644 --- a/crypto/hmac/hmac.c +++ b/crypto/hmac/hmac.c @@ -101,13 +101,13 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, if (md != NULL) { reset = 1; ctx->md = md; - } else if(ctx->md) { + } else if (ctx->md) { md = ctx->md; } else { return 0; } - if(!ctx->key_init && key == NULL) + if (!ctx->key_init && key == NULL) return 0; if (key != NULL) { @@ -123,7 +123,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, &ctx->key_length)) goto err; } else { - if(len < 0 || len > (int)sizeof(ctx->key)) + if (len < 0 || len > (int)sizeof(ctx->key)) return 0; memcpy(ctx->key, key, len); ctx->key_length = len; @@ -169,7 +169,7 @@ int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len) if (FIPS_mode() && !ctx->i_ctx.engine) return FIPS_hmac_update(ctx, data, len); #endif - if(!ctx->key_init) + if (!ctx->key_init) return 0; return EVP_DigestUpdate(&ctx->md_ctx, data, len); @@ -184,7 +184,7 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len) return FIPS_hmac_final(ctx, md, len); #endif - if(!ctx->key_init) + if (!ctx->key_init) goto err; if (!EVP_DigestFinal_ex(&ctx->md_ctx, buf, &i)) @@ -218,7 +218,7 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx) if (!EVP_MD_CTX_copy(&dctx->md_ctx, &sctx->md_ctx)) goto err; dctx->key_init = sctx->key_init; - if(sctx->key_init) { + if (sctx->key_init) { memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK); dctx->key_length = sctx->key_length; } diff --git a/crypto/hmac/hmactest.c b/crypto/hmac/hmactest.c index 5c8ec4c615..86b6c2529f 100644 --- a/crypto/hmac/hmactest.c +++ b/crypto/hmac/hmactest.c @@ -173,22 +173,22 @@ int main(int argc, char *argv[]) /* test4 */ HMAC_CTX_init(&ctx); - if(HMAC_Init_ex(&ctx, NULL, 0, NULL, NULL)) { + if (HMAC_Init_ex(&ctx, NULL, 0, NULL, NULL)) { printf("Should fail to initialise HMAC with empty MD and key (test 4)\n"); err++; goto test5; } - if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) { + if (HMAC_Update(&ctx, test[4].data, test[4].data_len)) { printf("Should fail HMAC_Update with ctx not set up (test 4)\n"); err++; goto test5; } - if(HMAC_Init_ex(&ctx, NULL, 0, EVP_sha1(), NULL)) { + if (HMAC_Init_ex(&ctx, NULL, 0, EVP_sha1(), NULL)) { printf("Should fail to initialise HMAC with empty key (test 4)\n"); err++; goto test5; } - if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) { + if (HMAC_Update(&ctx, test[4].data, test[4].data_len)) { printf("Should fail HMAC_Update with ctx not set up (test 4)\n"); err++; goto test5; @@ -196,32 +196,32 @@ int main(int argc, char *argv[]) printf("test 4 ok\n"); test5: HMAC_CTX_init(&ctx); - if(HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, NULL, NULL)) { + if (HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, NULL, NULL)) { printf("Should fail to initialise HMAC with empty MD (test 5)\n"); err++; goto test6; } - if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) { + if (HMAC_Update(&ctx, test[4].data, test[4].data_len)) { printf("Should fail HMAC_Update with ctx not set up (test 5)\n"); err++; goto test6; } - if(HMAC_Init_ex(&ctx, test[4].key, -1, EVP_sha1(), NULL)) { + if (HMAC_Init_ex(&ctx, test[4].key, -1, EVP_sha1(), NULL)) { printf("Should fail to initialise HMAC with invalid key len(test 5)\n"); err++; goto test6; } - if(!HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, EVP_sha1(), NULL)) { + if (!HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, EVP_sha1(), NULL)) { printf("Failed to initialise HMAC (test 5)\n"); err++; goto test6; } - if(!HMAC_Update(&ctx, test[4].data, test[4].data_len)) { + if (!HMAC_Update(&ctx, test[4].data, test[4].data_len)) { printf("Error updating HMAC with data (test 5)\n"); err++; goto test6; } - if(!HMAC_Final(&ctx, buf, &len)) { + if (!HMAC_Final(&ctx, buf, &len)) { printf("Error finalising data (test 5)\n"); err++; goto test6; @@ -233,17 +233,17 @@ test5: err++; goto test6; } - if(!HMAC_Init_ex(&ctx, NULL, 0, EVP_sha256(), NULL)) { + if (!HMAC_Init_ex(&ctx, NULL, 0, EVP_sha256(), NULL)) { printf("Failed to reinitialise HMAC (test 5)\n"); err++; goto test6; } - if(!HMAC_Update(&ctx, test[5].data, test[5].data_len)) { + if (!HMAC_Update(&ctx, test[5].data, test[5].data_len)) { printf("Error updating HMAC with data (sha256) (test 5)\n"); err++; goto test6; } - if(!HMAC_Final(&ctx, buf, &len)) { + if (!HMAC_Final(&ctx, buf, &len)) { printf("Error finalising data (sha256) (test 5)\n"); err++; goto test6; @@ -255,17 +255,17 @@ test5: err++; goto test6; } - if(!HMAC_Init_ex(&ctx, test[6].key, test[6].key_len, NULL, NULL)) { + if (!HMAC_Init_ex(&ctx, test[6].key, test[6].key_len, NULL, NULL)) { printf("Failed to reinitialise HMAC with key (test 5)\n"); err++; goto test6; } - if(!HMAC_Update(&ctx, test[6].data, test[6].data_len)) { + if (!HMAC_Update(&ctx, test[6].data, test[6].data_len)) { printf("Error updating HMAC with data (new key) (test 5)\n"); err++; goto test6; } - if(!HMAC_Final(&ctx, buf, &len)) { + if (!HMAC_Final(&ctx, buf, &len)) { printf("Error finalising data (new key) (test 5)\n"); err++; goto test6; @@ -280,22 +280,22 @@ test5: } test6: HMAC_CTX_init(&ctx); - if(!HMAC_Init_ex(&ctx, test[7].key, test[7].key_len, EVP_sha1(), NULL)) { + if (!HMAC_Init_ex(&ctx, test[7].key, test[7].key_len, EVP_sha1(), NULL)) { printf("Failed to initialise HMAC (test 6)\n"); err++; goto end; } - if(!HMAC_Update(&ctx, test[7].data, test[7].data_len)) { + if (!HMAC_Update(&ctx, test[7].data, test[7].data_len)) { printf("Error updating HMAC with data (test 6)\n"); err++; goto end; } - if(!HMAC_CTX_copy(&ctx2, &ctx)) { + if (!HMAC_CTX_copy(&ctx2, &ctx)) { printf("Failed to copy HMAC_CTX (test 6)\n"); err++; goto end; } - if(!HMAC_Final(&ctx2, buf, &len)) { + if (!HMAC_Final(&ctx2, buf, &len)) { printf("Error finalising data (test 6)\n"); err++; goto end; |