Commit 21e1efc7 authored by unknown's avatar unknown
Browse files

Bug #12526 yassl: Crashes in "integer.cpp" 

 - Disable inlining in integer.cp for sparc solaris Cun C++ 5.6


config/ac-macros/yassl.m4:
  Detect sparc Solaris + Sun C++ 5.6 and disable inlining for integer.cpp
extra/yassl/taocrypt/src/Makefile.am:
  Compile integer.cpp into a separate lib in order to use special CXXFLAGS
  Add the integer.cpp lib to libtaocrypt.la
parent 4f711655

config/ac-macros/yassl.m4

+11 −0
Original line number Diff line number Diff line
@@ -20,6 +20,17 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
    -L\$(top_builddir)/extra/yassl/taocrypt/src -ltaocrypt"

    openssl_includes="-I\$(top_srcdir)/extra/yassl/include"

    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

    yassl_dir=""

    AC_MSG_RESULT(no)

extra/yassl/taocrypt/src/Makefile.am

+5 −2
Original line number Diff line number Diff line 
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 \

	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 \

	template_instnt.cpp

libtaocrypt_la_LIBADD = libtaoint.la

libtaoint_la_SOURCES = integer.cpp

libtaoint_la_CXXFLAGS = @yassl_integer_extra_cxxflags@

EXTRA_DIST = ../include/*.hpp

AM_CXXFLAGS = -DYASSL_PURE_C