diff options
| author | Bodo Möller <bodo@openssl.org> | 2011-02-03 10:03:23 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2011-02-03 10:03:23 +0000 |
| commit | 2440d8b1db72e2301492c836a87bfd134dc04db2 (patch) | |
| tree | fb1861165f1d5ed953b0ec32520a7a3b7a5f62c5 /fips/utl | |
| parent | ee9884654b976386015533766a77e74c414871f5 (diff) | |
Fix error codes.
Diffstat (limited to 'fips/utl')
| -rw-r--r-- | fips/utl/fips_enc.c | 12 | ||||
| -rw-r--r-- | fips/utl/fips_md.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/fips/utl/fips_enc.c b/fips/utl/fips_enc.c index 93647a023b..d7f32611f3 100644 --- a/fips/utl/fips_enc.c +++ b/fips/utl/fips_enc.c @@ -105,7 +105,7 @@ int FIPS_cipherinit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ctx->cipher_data=OPENSSL_malloc(ctx->cipher->ctx_size); if (!ctx->cipher_data) { - EVPerr(EVP_F_EVP_CIPHERINIT_EX, ERR_R_MALLOC_FAILURE); + EVPerr(EVP_F_FIPS_CIPHERINIT, ERR_R_MALLOC_FAILURE); return 0; } } @@ -119,14 +119,14 @@ int FIPS_cipherinit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, { if(!FIPS_cipher_ctx_ctrl(ctx, EVP_CTRL_INIT, 0, NULL)) { - EVPerr(EVP_F_EVP_CIPHERINIT_EX, EVP_R_INITIALIZATION_ERROR); + EVPerr(EVP_F_FIPS_CIPHERINIT, EVP_R_INITIALIZATION_ERROR); return 0; } } } else if(!ctx->cipher) { - EVPerr(EVP_F_EVP_CIPHERINIT_EX, EVP_R_NO_CIPHER_SET); + EVPerr(EVP_F_FIPS_CIPHERINIT, EVP_R_NO_CIPHER_SET); return 0; } /* we assume block size is a power of 2 in *cryptUpdate */ @@ -205,18 +205,18 @@ int FIPS_cipher_ctx_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) { int ret; if(!ctx->cipher) { - EVPerr(EVP_F_EVP_CIPHER_CTX_CTRL, EVP_R_NO_CIPHER_SET); + EVPerr(EVP_F_FIPS_CIPHER_CTX_CTRL, EVP_R_NO_CIPHER_SET); return 0; } if(!ctx->cipher->ctrl) { - EVPerr(EVP_F_EVP_CIPHER_CTX_CTRL, EVP_R_CTRL_NOT_IMPLEMENTED); + EVPerr(EVP_F_FIPS_CIPHER_CTX_CTRL, EVP_R_CTRL_NOT_IMPLEMENTED); return 0; } ret = ctx->cipher->ctrl(ctx, type, arg, ptr); if(ret == -1) { - EVPerr(EVP_F_EVP_CIPHER_CTX_CTRL, EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED); + EVPerr(EVP_F_FIPS_CIPHER_CTX_CTRL, EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED); return 0; } return ret; diff --git a/fips/utl/fips_md.c b/fips/utl/fips_md.c index 0038646f58..d581df1180 100644 --- a/fips/utl/fips_md.c +++ b/fips/utl/fips_md.c @@ -149,7 +149,7 @@ int FIPS_digestinit(EVP_MD_CTX *ctx, const EVP_MD *type) ctx->md_data=OPENSSL_malloc(type->ctx_size); if (ctx->md_data == NULL) { - EVPerr(EVP_F_EVP_DIGESTINIT_EX, + EVPerr(EVP_F_FIPS_DIGESTINIT, ERR_R_MALLOC_FAILURE); return 0; } @@ -230,7 +230,7 @@ int FIPS_md_ctx_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in) unsigned char *tmp_buf; if ((in == NULL) || (in->digest == NULL)) { - EVPerr(EVP_F_EVP_MD_CTX_COPY_EX,EVP_R_INPUT_NOT_INITIALIZED); + EVPerr(EVP_F_FIPS_MD_CTX_COPY,EVP_R_INPUT_NOT_INITIALIZED); return 0; } @@ -252,7 +252,7 @@ int FIPS_md_ctx_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in) out->md_data=OPENSSL_malloc(out->digest->ctx_size); if (!out->md_data) { - EVPerr(EVP_F_EVP_MD_CTX_COPY_EX,ERR_R_MALLOC_FAILURE); + EVPerr(EVP_F_FIPS_MD_CTX_COPY,ERR_R_MALLOC_FAILURE); return 0; } } |