diff --git a/extra/yassl/src/cert_wrapper.cpp b/extra/yassl/src/cert_wrapper.cpp index ab3cb4719906a4db3c08827bb0803b4eeac435a0..98861d012875a444f6378737fc87a07012963adc 100644 --- a/extra/yassl/src/cert_wrapper.cpp +++ b/extra/yassl/src/cert_wrapper.cpp @@ -273,8 +273,8 @@ int CertManager::SetPrivateKey(const x509& key) privateKey_.assign(key.get_buffer(), key.get_length()); // set key type - if (x509* cert = list_.front()) { - TaoCrypt::Source source(cert->get_buffer(), cert->get_length()); + if (x509* cert509 = list_.front()) { + TaoCrypt::Source source(cert509->get_buffer(), cert509->get_length()); TaoCrypt::CertDecoder cert(source, false); cert.DecodeToKey(); if (int err = cert.GetError().What()) diff --git a/extra/yassl/taocrypt/include/error.hpp b/extra/yassl/taocrypt/include/error.hpp index cb7f82731c71b75c89357a0ea7ab1a8527d4e60e..6170d0349b5afee7762bcdcb0404409e97115512 100644 --- a/extra/yassl/taocrypt/include/error.hpp +++ b/extra/yassl/taocrypt/include/error.hpp @@ -65,7 +65,7 @@ UNKOWN_HASH_E = 1034, // "unknown hash OID" DSA_SZ_E = 1035, // "bad DSA r or s size" BEFORE_DATE_E = 1036, // "before date in the future" AFTER_DATE_E = 1037, // "after date in the past" -SIG_CONFIRM_E = 1038, // "bad signature confirmation" +SIG_CONFIRM_E = 1038 // "bad signature confirmation" }; diff --git a/extra/yassl/taocrypt/include/misc.hpp b/extra/yassl/taocrypt/include/misc.hpp index 01a3e8ee731275eef299817ef8546ae80249e8ca..b9cc9a6fe71b4d3fe07a622ad81f0699c761324c 100644 --- a/extra/yassl/taocrypt/include/misc.hpp +++ b/extra/yassl/taocrypt/include/misc.hpp @@ -97,7 +97,7 @@ typedef unsigned int word32; typedef word32 word; typedef word64 dword; #else - typedef word8 hword; + typedef byte hword; typedef word16 word; typedef word32 dword; #endif diff --git a/tools/Makefile.am b/tools/Makefile.am index 3b84aafeaa98dd64b94c6573772341f8da43d71c..036f0b8a76e37a9770f2886d8039fce0091bff61 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -17,8 +17,9 @@ INCLUDES=-I$(top_srcdir)/include $(openssl_includes) \ -I$(top_builddir)/include -LDADD= @CLIENT_EXTRA_LDFLAGS@ @openssl_libs@ \ - $(top_builddir)/libmysql_r/libmysqlclient_r.la @ZLIB_LIBS@ +LDADD= @CLIENT_EXTRA_LDFLAGS@ \ + $(top_builddir)/libmysql_r/libmysqlclient_r.la \ + @openssl_libs@ @ZLIB_LIBS@ bin_PROGRAMS= mysqltestmanager mysqltestmanager_SOURCES= mysqlmanager.c mysqltestmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)