diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-07-17 16:33:31 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-07-17 16:33:31 +0000 |
| commit | 5c95c2ac23dd30f3c458e2738598383d2ca58181 (patch) | |
| tree | 181e8b7d0663eeed579bbe7f97760f0ddad52157 /crypto/evp | |
| parent | 454dbbc593cd8d9ddd7969e94c6118fc64c57f7b (diff) | |
| download | openssl-5c95c2ac23dd30f3c458e2738598383d2ca58181.tar.gz | |
Fix various error codes to match functions.
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/evp.h | 1 | ||||
| -rw-r--r-- | crypto/evp/evp_err.c | 1 | ||||
| -rw-r--r-- | crypto/evp/evp_pbe.c | 2 | ||||
| -rw-r--r-- | crypto/evp/pmeth_fn.c | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index dea6a40431..585cb17d1d 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -1142,6 +1142,7 @@ void ERR_load_EVP_strings(void); #define EVP_F_EVP_MD_CTX_COPY_EX 110 #define EVP_F_EVP_OPENINIT 102 #define EVP_F_EVP_PBE_ALG_ADD 115 +#define EVP_F_EVP_PBE_ALG_ADD_TYPE 160 #define EVP_F_EVP_PBE_CIPHERINIT 116 #define EVP_F_EVP_PKCS82PKEY 111 #define EVP_F_EVP_PKCS82PKEY_BROKEN 136 diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c index 448c9b853e..4ead16cba6 100644 --- a/crypto/evp/evp_err.c +++ b/crypto/evp/evp_err.c @@ -86,6 +86,7 @@ static ERR_STRING_DATA EVP_str_functs[]= {ERR_FUNC(EVP_F_EVP_MD_CTX_COPY_EX), "EVP_MD_CTX_copy_ex"}, {ERR_FUNC(EVP_F_EVP_OPENINIT), "EVP_OpenInit"}, {ERR_FUNC(EVP_F_EVP_PBE_ALG_ADD), "EVP_PBE_alg_add"}, +{ERR_FUNC(EVP_F_EVP_PBE_ALG_ADD_TYPE), "EVP_PBE_alg_add_type"}, {ERR_FUNC(EVP_F_EVP_PBE_CIPHERINIT), "EVP_PBE_CipherInit"}, {ERR_FUNC(EVP_F_EVP_PKCS82PKEY), "EVP_PKCS82PKEY"}, {ERR_FUNC(EVP_F_EVP_PKCS82PKEY_BROKEN), "EVP_PKCS82PKEY_BROKEN"}, diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c index 2d63636888..f417b96f71 100644 --- a/crypto/evp/evp_pbe.c +++ b/crypto/evp/evp_pbe.c @@ -220,7 +220,7 @@ int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid, int md_nid, pbe_algs = sk_new(pbe_cmp); if (!(pbe_tmp = (EVP_PBE_CTL*) OPENSSL_malloc (sizeof(EVP_PBE_CTL)))) { - EVPerr(EVP_F_EVP_PBE_ALG_ADD,ERR_R_MALLOC_FAILURE); + EVPerr(EVP_F_EVP_PBE_ALG_ADD_TYPE,ERR_R_MALLOC_FAILURE); return 0; } pbe_tmp->pbe_type = pbe_type; diff --git a/crypto/evp/pmeth_fn.c b/crypto/evp/pmeth_fn.c index 5e08cedd14..d52dc43f07 100644 --- a/crypto/evp/pmeth_fn.c +++ b/crypto/evp/pmeth_fn.c @@ -74,7 +74,7 @@ } \ else if (*arglen < pksize) \ { \ - EVPerr(err, EVP_R_BUFFER_TOO_SMALL); \ + EVPerr(err, EVP_R_BUFFER_TOO_SMALL); /*ckerr_ignore*/\ return 0; \ } \ } |