Commit 36f1f1ca authored by unknown's avatar unknown

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526

parents b34d5bd2 21e1efc7
...@@ -20,6 +20,17 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ ...@@ -20,6 +20,17 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
-L\$(top_builddir)/extra/yassl/taocrypt/src -ltaocrypt" -L\$(top_builddir)/extra/yassl/taocrypt/src -ltaocrypt"
openssl_includes="-I\$(top_srcdir)/extra/yassl/include" openssl_includes="-I\$(top_srcdir)/extra/yassl/include"
AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.]) AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
# System specific checks
yassl_integer_extra_cxxflags=""
case $SYSTEM_TYPE--$CXX_VERSION in
sparc*solaris*--*Sun*C++*5.6*)
# Disable inlining when compiling taocrypt/src/integer.cpp
yassl_integer_extra_cxxflags="+d"
;;
esac
AC_SUBST([yassl_integer_extra_cxxflags])
else else
yassl_dir="" yassl_dir=""
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
......
INCLUDES = -I../include -I../../mySTL INCLUDES = -I../include -I../../mySTL
noinst_LTLIBRARIES = libtaocrypt.la noinst_LTLIBRARIES = libtaocrypt.la libtaoint.la
libtaocrypt_la_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \ libtaocrypt_la_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.cpp integer.cpp \ coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.cpp \
md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \ md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \
template_instnt.cpp template_instnt.cpp
libtaocrypt_la_LIBADD = libtaoint.la
libtaoint_la_SOURCES = integer.cpp
libtaoint_la_CXXFLAGS = @yassl_integer_extra_cxxflags@
EXTRA_DIST = ../include/*.hpp EXTRA_DIST = ../include/*.hpp
AM_CXXFLAGS = -DYASSL_PURE_C AM_CXXFLAGS = -DYASSL_PURE_C
...@@ -568,13 +568,13 @@ public: ...@@ -568,13 +568,13 @@ public:
static word Add(word *C, const word *A, const word *B, unsigned int N); static word Add(word *C, const word *A, const word *B, unsigned int N);
static word Subtract(word *C, const word *A, const word*B, unsigned int N); static word Subtract(word *C, const word *A, const word*B, unsigned int N);
static void Multiply2(word *C, const word *A, const word *B); static inline void Multiply2(word *C, const word *A, const word *B);
static word Multiply2Add(word *C, const word *A, const word *B); static inline word Multiply2Add(word *C, const word *A, const word *B);
static void Multiply4(word *C, const word *A, const word *B); static void Multiply4(word *C, const word *A, const word *B);
static void Multiply8(word *C, const word *A, const word *B); static void Multiply8(word *C, const word *A, const word *B);
static inline unsigned int MultiplyRecursionLimit() {return 8;} static inline unsigned int MultiplyRecursionLimit() {return 8;}
static void Multiply2Bottom(word *C, const word *A, const word *B); static inline void Multiply2Bottom(word *C, const word *A, const word *B);
static void Multiply4Bottom(word *C, const word *A, const word *B); static void Multiply4Bottom(word *C, const word *A, const word *B);
static void Multiply8Bottom(word *C, const word *A, const word *B); static void Multiply8Bottom(word *C, const word *A, const word *B);
static inline unsigned int MultiplyBottomRecursionLimit() {return 8;} static inline unsigned int MultiplyBottomRecursionLimit() {return 8;}
...@@ -668,7 +668,7 @@ void Portable::Multiply2(word *C, const word *A, const word *B) ...@@ -668,7 +668,7 @@ void Portable::Multiply2(word *C, const word *A, const word *B)
C[3] = t.GetHighHalf(); C[3] = t.GetHighHalf();
} }
void Portable::Multiply2Bottom(word *C, const word *A, const word *B) inline void Portable::Multiply2Bottom(word *C, const word *A, const word *B)
{ {
DWord t = DWord::Multiply(A[0], B[0]); DWord t = DWord::Multiply(A[0], B[0]);
C[0] = t.GetLowHalf(); C[0] = t.GetLowHalf();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment