Commit 0f1d77a8 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix error code.

parent d9d0f1b5

crypto/engine/eng_aesni.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -259,7 +259,7 @@ aesni_init_key (EVP_CIPHER_CTX *ctx, const unsigned char *user_key, 
		ret=aesni_set_decrypt_key(user_key, ctx->key_len * 8, key);

		ret=aesni_set_decrypt_key(user_key, ctx->key_len * 8, key);





	if(ret < 0) {

	if(ret < 0) {

		EVPerr(EVP_F_AES_INIT_KEY,EVP_R_AES_KEY_SETUP_FAILED);

		EVPerr(EVP_F_AESNI_INIT_KEY,EVP_R_AES_KEY_SETUP_FAILED);

		return 0;

		return 0;

	}

	}

crypto/evp/evp.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -1177,6 +1177,7 @@ void ERR_load_EVP_strings(void); 
/* Error codes for the EVP functions. */

/* Error codes for the EVP functions. */





/* Function codes. */

/* Function codes. */

#define EVP_F_AESNI_INIT_KEY				 163

#define EVP_F_AES_INIT_KEY				 133

#define EVP_F_AES_INIT_KEY				 133

#define EVP_F_CAMELLIA_INIT_KEY				 159

#define EVP_F_CAMELLIA_INIT_KEY				 159

#define EVP_F_D2I_PKEY					 100

#define EVP_F_D2I_PKEY					 100

crypto/evp/evp_err.c

+3 −2
Original line number Original line Diff line number Diff line 
/* crypto/evp/evp_err.c */

/* crypto/evp/evp_err.c */

/* ====================================================================

/* ====================================================================

 * Copyright (c) 1999-2008 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1999-2009 The OpenSSL Project.  All rights reserved.

 *

 *

 * Redistribution and use in source and binary forms, with or without

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * modification, are permitted provided that the following conditions
@@ -70,6 +70,7 @@ 




static ERR_STRING_DATA EVP_str_functs[]=

static ERR_STRING_DATA EVP_str_functs[]=

	{

	{

{ERR_FUNC(EVP_F_AESNI_INIT_KEY),	"AESNI_INIT_KEY"},

{ERR_FUNC(EVP_F_AES_INIT_KEY),	"AES_INIT_KEY"},

{ERR_FUNC(EVP_F_AES_INIT_KEY),	"AES_INIT_KEY"},

{ERR_FUNC(EVP_F_CAMELLIA_INIT_KEY),	"CAMELLIA_INIT_KEY"},

{ERR_FUNC(EVP_F_CAMELLIA_INIT_KEY),	"CAMELLIA_INIT_KEY"},

{ERR_FUNC(EVP_F_D2I_PKEY),	"D2I_PKEY"},

{ERR_FUNC(EVP_F_D2I_PKEY),	"D2I_PKEY"},
@@ -85,7 +86,7 @@ static ERR_STRING_DATA EVP_str_functs[]= 
{ERR_FUNC(EVP_F_EVP_DIGESTINIT_EX),	"EVP_DigestInit_ex"},

{ERR_FUNC(EVP_F_EVP_DIGESTINIT_EX),	"EVP_DigestInit_ex"},

{ERR_FUNC(EVP_F_EVP_ENCRYPTFINAL_EX),	"EVP_EncryptFinal_ex"},

{ERR_FUNC(EVP_F_EVP_ENCRYPTFINAL_EX),	"EVP_EncryptFinal_ex"},

{ERR_FUNC(EVP_F_EVP_MD_CTX_COPY_EX),	"EVP_MD_CTX_copy_ex"},

{ERR_FUNC(EVP_F_EVP_MD_CTX_COPY_EX),	"EVP_MD_CTX_copy_ex"},

{ERR_FUNC(EVP_F_EVP_MD_SIZE),	"EVP_MD_SIZE"},

{ERR_FUNC(EVP_F_EVP_MD_SIZE),	"EVP_MD_size"},

{ERR_FUNC(EVP_F_EVP_OPENINIT),	"EVP_OpenInit"},

{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),	"EVP_PBE_alg_add"},

{ERR_FUNC(EVP_F_EVP_PBE_ALG_ADD_TYPE),	"EVP_PBE_alg_add_type"},

{ERR_FUNC(EVP_F_EVP_PBE_ALG_ADD_TYPE),	"EVP_PBE_alg_add_type"},