Now GMAC is fixed remove workaround.

This commit is contained in:
Dr. Stephen Henson 2013-01-16 14:20:01 +00:00
parent 043c341366
commit 950e2889e1

View File

@ -208,8 +208,6 @@ static void gcmtest(FILE *in, FILE *out, int encrypt)
ct = OPENSSL_malloc(ptlen); ct = OPENSSL_malloc(ptlen);
rv = FIPS_cipher(&ctx, ct, pt, ptlen); rv = FIPS_cipher(&ctx, ct, pt, ptlen);
} }
else
FIPS_cipher(&ctx, iv, iv, 0);
FIPS_cipher(&ctx, NULL, NULL, 0); FIPS_cipher(&ctx, NULL, NULL, 0);
FIPS_cipher_ctx_ctrl(&ctx, EVP_CTRL_GCM_GET_TAG, FIPS_cipher_ctx_ctrl(&ctx, EVP_CTRL_GCM_GET_TAG,
taglen, tag); taglen, tag);
@ -244,8 +242,6 @@ static void gcmtest(FILE *in, FILE *out, int encrypt)
pt = OPENSSL_malloc(ptlen); pt = OPENSSL_malloc(ptlen);
rv = FIPS_cipher(&ctx, pt, ct, ptlen); rv = FIPS_cipher(&ctx, pt, ct, ptlen);
} }
else
FIPS_cipher(&ctx, iv, iv, 0);
rv = FIPS_cipher(&ctx, NULL, NULL, 0); rv = FIPS_cipher(&ctx, NULL, NULL, 0);
if (rv < 0) if (rv < 0)
fprintf(out, "FAIL" RESP_EOL); fprintf(out, "FAIL" RESP_EOL);