giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: 'openssl: double free or corruption' (load gost engine before loading engine_pkcs11 (which loading gost engine)) 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4397 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
s 2010-06-04 22:23:47 +00:00
parent 073ad7a4c4
commit 7f3f6dec6b
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/pkcs11/openssl.c
View File

@ -189,21 +189,27 @@ void
sc_pkcs11_register_openssl_mechanisms(struct sc_pkcs11_card *card) sc_pkcs11_register_openssl_mechanisms(struct sc_pkcs11_card *card)
{ {
#if OPENSSL_VERSION_NUMBER >= 0x10000000L && !defined(OPENSSL_NO_ENGINE) #if OPENSSL_VERSION_NUMBER >= 0x10000000L && !defined(OPENSSL_NO_ENGINE)
ENGINE *e = NULL; ENGINE *e = ENGINE_by_id("gost");
if (!e)
{
#if !defined(OPENSSL_NO_STATIC_ENGINE) && !defined(OPENSSL_NO_GOST) #if !defined(OPENSSL_NO_STATIC_ENGINE) && !defined(OPENSSL_NO_GOST)
ENGINE_load_gost(); ENGINE_load_gost();
e = ENGINE_by_id("gost"); e = ENGINE_by_id("gost");
#else #else
/* try to load dynamic gost engine */ /* try to load dynamic gost engine */
ENGINE_load_dynamic(); e = ENGINE_by_id("dynamic");
e = ENGINE_by_id("dynamic"); if (!e) {
if (e && (!ENGINE_ctrl_cmd_string(e, "SO_PATH", "gost", 0) || ENGINE_load_dynamic();
!ENGINE_ctrl_cmd_string(e, "LOAD", NULL, 0))) { e = ENGINE_by_id("dynamic");
ENGINE_free(e); }
e = NULL; if (e && (!ENGINE_ctrl_cmd_string(e, "SO_PATH", "gost", 0) ||
} !ENGINE_ctrl_cmd_string(e, "LOAD", NULL, 0))) {
ENGINE_free(e);
e = NULL;
}
#endif /* !OPENSSL_NO_STATIC_ENGINE && !OPENSSL_NO_GOST */ #endif /* !OPENSSL_NO_STATIC_ENGINE && !OPENSSL_NO_GOST */
}
if (e) { if (e) {
ENGINE_set_default(e, ENGINE_METHOD_ALL); ENGINE_set_default(e, ENGINE_METHOD_ALL);
ENGINE_free(e); ENGINE_free(e);