diff options
| author | unknown <svoj@mysql.com> | 2005-05-20 01:44:05 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com> | 2005-05-20 01:44:05 +0500 |
| commit | 4679c7a8fe36819df60ecf769351e10efa911548 (patch) | |
| tree | 770cdc4d2e51e24961a9a65462ebcfce7bb2f858 | |
| parent | 9c1bc4252f925a6cf43433492a49f3107ec1b67a (diff) | |
| download | mariadb-git-4679c7a8fe36819df60ecf769351e10efa911548.tar.gz | |
WL#2286 - Compile MySQL w/YASSL support
compilation fixes
extra/yassl/src/cert_wrapper.cpp:
yaSSL compilation fix on nocona
extra/yassl/taocrypt/include/error.hpp:
yaSSL compilation fix
extra/yassl/taocrypt/include/misc.hpp:
yaSSL compilation fix on many platforms
tools/Makefile.am:
mysqltestmanager with yaSSL enabled compilation fix on FreeBSD 5.3
| -rw-r--r-- | extra/yassl/src/cert_wrapper.cpp | 4 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/include/error.hpp | 2 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/include/misc.hpp | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 5 |
4 files changed, 7 insertions, 6 deletions
diff --git a/extra/yassl/src/cert_wrapper.cpp b/extra/yassl/src/cert_wrapper.cpp index ab3cb471990..98861d01287 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 cb7f82731c7..6170d0349b5 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 01a3e8ee731..b9cc9a6fe71 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 3b84aafeaa9..036f0b8a76e 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) |