Commit 322f190a authored by Richard Levitte's avatar Richard Levitte
Browse files

If an application supports static locks, it MUST support dynamic locks as 

well to be able to use the CHIL engine.
PR: 281
parent c4a150c2

crypto/engine/engine.h

+1 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ void ERR_load_ENGINE_strings(void); 
#define ENGINE_R_INTERNAL_LIST_ERROR			 110

#define ENGINE_R_INVALID_PADDING			 137

#define ENGINE_R_KEY_TOO_LARGE				 138

#define ENGINE_R_LOCKING_MISSING			 143

#define ENGINE_R_MISSING_KEY_COMPONENTS			 111

#define ENGINE_R_MOD_EXP_CRT_FAILED			 134

#define ENGINE_R_MOD_EXP_FAILED				 131

crypto/engine/engine_err.c

+2 −1
Original line number Diff line number Diff line 
/* crypto/engine/engine_err.c */

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

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

 * Copyright (c) 1999-2002 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
@@ -205,6 +205,7 @@ static ERR_STRING_DATA ENGINE_str_reasons[]= 
{ENGINE_R_INTERNAL_LIST_ERROR            ,"internal list error"},

{ENGINE_R_INVALID_PADDING                ,"invalid padding"},

{ENGINE_R_KEY_TOO_LARGE                  ,"key too large"},

{ENGINE_R_LOCKING_MISSING                ,"locking missing"},

{ENGINE_R_MISSING_KEY_COMPONENTS         ,"missing key components"},

{ENGINE_R_MOD_EXP_CRT_FAILED             ,"mod exp crt failed"},

{ENGINE_R_MOD_EXP_FAILED                 ,"mod exp failed"},

crypto/engine/hw_ncipher.c

+16 −8
Original line number Diff line number Diff line
@@ -435,8 +435,9 @@ static int hwcrhk_init() 


	/* Check if the application decided to support dynamic locks,

	   and if it does, use them. */

	if (disable_mutex_callbacks == 0 &&

		CRYPTO_get_dynlock_create_callback() != NULL &&

	if (disable_mutex_callbacks == 0)

		{

		if (CRYPTO_get_dynlock_create_callback() != NULL &&

			CRYPTO_get_dynlock_lock_callback() != NULL &&

			CRYPTO_get_dynlock_destroy_callback() != NULL)

			{
@@ -445,6 +446,13 @@ static int hwcrhk_init() 
			hwcrhk_globals.mutex_release = hwcrhk_mutex_unlock;

			hwcrhk_globals.mutex_destroy = hwcrhk_mutex_destroy;

			}

		else if (CRYPTO_get_locking_callback() != NULL)

			{

			ENGINEerr(ENGINE_F_HWCRHK_INIT,ENGINE_R_LOCKING_MISSING);

			ERR_add_error_data(1,"You HAVE to add dynamic locking callbacks via CRYPTO_set_dynlock_{create,lock,destroy}_callback()");

			goto err;

			}

		}



	/* Try and get a context - if not, we may have a DSO but no

	 * accelerator! */