diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-11-05 13:34:29 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-11-05 13:34:29 +0000 |
| commit | 7c43ea50fdecdbb743a6b2c24898ef038d3a3bc9 (patch) | |
| tree | 89102d7397b29b827895641c7a517c523111f964 /crypto | |
| parent | c0832990f54e8c01c00931761e9c1db09cab469c (diff) | |
| download | openssl-7c43ea50fdecdbb743a6b2c24898ef038d3a3bc9.tar.gz | |
correct error function code
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/evp/e_camellia.c | 2 | ||||
| -rw-r--r-- | crypto/evp/evp.h | 1 | ||||
| -rw-r--r-- | crypto/evp/evp_err.c | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/crypto/evp/e_camellia.c b/crypto/evp/e_camellia.c index 83365b2f0a..1b758c73fc 100644 --- a/crypto/evp/e_camellia.c +++ b/crypto/evp/e_camellia.c @@ -177,7 +177,7 @@ static int cmll_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, if(ret < 0) { - EVPerr(EVP_F_CAMELLIA_INIT_KEY,EVP_R_CAMELLIA_KEY_SETUP_FAILED); + EVPerr(EVP_F_CMLL_T4_INIT_KEY,EVP_R_CAMELLIA_KEY_SETUP_FAILED); return 0; } diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 283dcab09b..50b568250b 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -1291,6 +1291,7 @@ void ERR_load_EVP_strings(void); #define EVP_F_ALG_MODULE_INIT 177 #define EVP_F_CAMELLIA_INIT_KEY 159 #define EVP_F_CMAC_INIT 173 +#define EVP_F_CMLL_T4_INIT_KEY 179 #define EVP_F_D2I_PKEY 100 #define EVP_F_DO_SIGVER_INIT 161 #define EVP_F_DSAPKEY2PKCS8 134 diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c index 5742a949fd..1e2ee182ff 100644 --- a/crypto/evp/evp_err.c +++ b/crypto/evp/evp_err.c @@ -1,6 +1,6 @@ /* crypto/evp/evp_err.c */ /* ==================================================================== - * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2012 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -79,6 +79,7 @@ static ERR_STRING_DATA EVP_str_functs[]= {ERR_FUNC(EVP_F_ALG_MODULE_INIT), "ALG_MODULE_INIT"}, {ERR_FUNC(EVP_F_CAMELLIA_INIT_KEY), "CAMELLIA_INIT_KEY"}, {ERR_FUNC(EVP_F_CMAC_INIT), "CMAC_INIT"}, +{ERR_FUNC(EVP_F_CMLL_T4_INIT_KEY), "CMLL_T4_INIT_KEY"}, {ERR_FUNC(EVP_F_D2I_PKEY), "D2I_PKEY"}, {ERR_FUNC(EVP_F_DO_SIGVER_INIT), "DO_SIGVER_INIT"}, {ERR_FUNC(EVP_F_DSAPKEY2PKCS8), "DSAPKEY2PKCS8"}, |