correct error function code
authorDr. Stephen Henson <steve@openssl.org>
Mon, 5 Nov 2012 13:34:29 +0000 (13:34 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 5 Nov 2012 13:34:29 +0000 (13:34 +0000)
crypto/evp/e_camellia.c
crypto/evp/evp.h
crypto/evp/evp_err.c

index 83365b2f0a880c6163866825b02f5ba2860749fb..1b758c73fc83faec5716e8bc2fd031851597b254 100644 (file)
@@ -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;
                }
 
index 283dcab09b0ee7ad7fabd4bc1ca58a08466adca0..50b568250b4910e581242a56900d5e068dde9f47 100644 (file)
@@ -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
index 5742a949fd80a40a25c1587e1544b8d97228f704..1e2ee182ff537188308a4f1d7322bb7fe4f2fe88 100644 (file)
@@ -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"},