diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-02-12 18:25:18 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-02-12 18:25:18 +0000 |
| commit | e47af46cd839c549fac2d9f8a2951c35c0113fbf (patch) | |
| tree | 2fa93ea50fa6307c189711053274f8bba9949572 /fips/aes/fips_aesavs.c | |
| parent | 36246be9151adf1049d62f1261f87f9e3719afac (diff) | |
Change FIPS source and utilities to use the "FIPS_" names directly
instead of using regular OpenSSL API names.
Diffstat (limited to 'fips/aes/fips_aesavs.c')
| -rw-r--r-- | fips/aes/fips_aesavs.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/fips/aes/fips_aesavs.c b/fips/aes/fips_aesavs.c index 1f302a59fc..c9e2ce3b94 100644 --- a/fips/aes/fips_aesavs.c +++ b/fips/aes/fips_aesavs.c @@ -213,14 +213,14 @@ static int AESTest(EVP_CIPHER_CTX *ctx, printf("Invalid key size: %d\n", akeysz); return 0; } - if (EVP_CipherInit_ex(ctx, cipher, NULL, aKey, iVec, dir) <= 0) + if (FIPS_cipherinit(ctx, cipher, aKey, iVec, dir) <= 0) return 0; if(!strcasecmp(amode,"CFB1")) M_EVP_CIPHER_CTX_set_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS); if (dir) - EVP_Cipher(ctx, ciphertext, plaintext, len); + FIPS_cipher(ctx, ciphertext, plaintext, len); else - EVP_Cipher(ctx, plaintext, ciphertext, len); + FIPS_cipher(ctx, plaintext, ciphertext, len); return 1; } @@ -254,7 +254,7 @@ static int do_mct(char *amode, int i, j, n, n1, n2; int imode = 0, nkeysz = akeysz/8; EVP_CIPHER_CTX ctx; - EVP_CIPHER_CTX_init(&ctx); + FIPS_cipher_ctx_init(&ctx); if (len > 32) { @@ -310,12 +310,12 @@ static int do_mct(char *amode, { if (dir == XENCRYPT) { - EVP_Cipher(&ctx, ctext[j], ptext[j], len); + FIPS_cipher(&ctx, ctext[j], ptext[j], len); memcpy(ptext[j+1], ctext[j], len); } else { - EVP_Cipher(&ctx, ptext[j], ctext[j], len); + FIPS_cipher(&ctx, ptext[j], ctext[j], len); memcpy(ctext[j+1], ptext[j], len); } } @@ -338,12 +338,12 @@ static int do_mct(char *amode, { if (dir == XENCRYPT) { - EVP_Cipher(&ctx, ctext[j], ptext[j], len); + FIPS_cipher(&ctx, ctext[j], ptext[j], len); memcpy(ptext[j+1], ctext[j-1], len); } else { - EVP_Cipher(&ctx, ptext[j], ctext[j], len); + FIPS_cipher(&ctx, ptext[j], ctext[j], len); memcpy(ctext[j+1], ptext[j-1], len); } } @@ -359,9 +359,9 @@ static int do_mct(char *amode, else { if (dir == XENCRYPT) - EVP_Cipher(&ctx, ctext[j], ptext[j], len); + FIPS_cipher(&ctx, ctext[j], ptext[j], len); else - EVP_Cipher(&ctx, ptext[j], ctext[j], len); + FIPS_cipher(&ctx, ptext[j], ctext[j], len); } if (dir == XENCRYPT) { @@ -393,9 +393,9 @@ static int do_mct(char *amode, else { if (dir == XENCRYPT) - EVP_Cipher(&ctx, ctext[j], ptext[j], len); + FIPS_cipher(&ctx, ctext[j], ptext[j], len); else - EVP_Cipher(&ctx, ptext[j], ctext[j], len); + FIPS_cipher(&ctx, ptext[j], ctext[j], len); } if(dir == XENCRYPT) @@ -565,7 +565,7 @@ static int proc_file(char *rqfile, char *rspfile) unsigned char ciphertext[2048]; char *rp; EVP_CIPHER_CTX ctx; - EVP_CIPHER_CTX_init(&ctx); + FIPS_cipher_ctx_init(&ctx); if (!rqfile || !(*rqfile)) { |