From 086fea980928d7fc6016823fc8e7d573663f802f Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Thu, 31 Aug 2006 15:16:44 +0200 Subject: [PATCH 1/2] Bug#21930 libmysqlclient defines BN_bin2bn which belongs to OpenSSL! Breaks other apps! - Don't add the signatures for CRYPTO_* when compiling yaSSL for MySQL --- extra/yassl/taocrypt/src/misc.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extra/yassl/taocrypt/src/misc.cpp b/extra/yassl/taocrypt/src/misc.cpp index b8095334789..a33ca4fa432 100644 --- a/extra/yassl/taocrypt/src/misc.cpp +++ b/extra/yassl/taocrypt/src/misc.cpp @@ -29,7 +29,7 @@ #include "runtime.hpp" #include "misc.hpp" - +#if !defined(YASSL_MYSQL_COMPATIBLE) extern "C" { // for libcurl configure test, these are the signatures they use @@ -37,6 +37,7 @@ extern "C" { char CRYPTO_lock() { return 0;} char CRYPTO_add_lock() { return 0;} } // extern "C" +#endif #ifdef YASSL_PURE_C From 9af6450e30714030472d2eb798ba7dbdbe13e377 Mon Sep 17 00:00:00 2001 From: "msvensson@shellback.(none)" <> Date: Thu, 31 Aug 2006 15:17:35 +0200 Subject: [PATCH 2/2] Update the generate_prefix_files.pl --- extra/yassl/include/openssl/generate_prefix_files.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/yassl/include/openssl/generate_prefix_files.pl b/extra/yassl/include/openssl/generate_prefix_files.pl index b921ee11e9a..da591b31332 100755 --- a/extra/yassl/include/openssl/generate_prefix_files.pl +++ b/extra/yassl/include/openssl/generate_prefix_files.pl @@ -30,7 +30,7 @@ sub generate_prefix($$) next; } - if ( /^\s*[a-zA-Z0-9*_ ]+\s+([_a-zA-Z0-9]+)\s*\(/ ) + if ( /^\s*[a-zA-Z0-9*_ ]+\s+\*?([_a-zA-Z0-9]+)\s*\(/ ) { print OUT "#define $1 ya$1\n"; }