diff options
Diffstat (limited to 'poky/meta/recipes-support/beecrypt/beecrypt')
6 files changed, 205 insertions, 0 deletions
diff --git a/poky/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch b/poky/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch new file mode 100644 index 000000000..b3298ce2d --- /dev/null +++ b/poky/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch @@ -0,0 +1,34 @@ +Add config option --with-dev-dsp. + +Upstream-Status: Pending + +Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> +--- +--- a/configure.ac ++++ b/configure.ac +@@ -106,6 +106,16 @@ AC_ARG_WITH(python,[ --with-python[[=AR + fi + ]) + ++AC_ARG_WITH(dev-dsp,[ --with-dev-dsp enables dev/dsp for entropy producing. auto for auto-detecting dev/dep on host. [[default=no]]],[ ++ if test "$withval" = yes; then ++ AC_DEFINE([HAVE_DEV_DSP], 1) ++ else ++ if test "$withval" = auto; then ++ ac_detect_dev_dsp=yes ++ fi ++ fi ++ ],[ac_detect_dev_dsp=no]) ++ + # Check for expert mode + if test "$ac_enable_expert_mode" = yes; then + BEE_EXPERT_MODE +@@ -464,7 +474,7 @@ linux*) + ac_cv_have_dev_dsp=no + fi + ]) +- if test "$ac_cv_have_dev_dsp" = yes; then ++ if test "$ac_cv_have_dev_dsp" = yes && test "$ac_detect_dev_dsp" = yes; then + AC_DEFINE([HAVE_DEV_DSP], 1) + fi + ;; diff --git a/poky/meta/recipes-support/beecrypt/beecrypt/beecrypt-enable-ptest-support.patch b/poky/meta/recipes-support/beecrypt/beecrypt/beecrypt-enable-ptest-support.patch new file mode 100644 index 000000000..3e5513fce --- /dev/null +++ b/poky/meta/recipes-support/beecrypt/beecrypt/beecrypt-enable-ptest-support.patch @@ -0,0 +1,37 @@ +beecrypt: enable ptest support + +Upstream-Status: Inappropriate [embedded specific] + +Add install-ptest rules. + +Signed-off-by: Chong Lu <Chong.Lu@windriver.com> +--- + Makefile.am | 3 +++ + tests/Makefile.am | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index b7e7869..5076f59 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -73,3 +73,6 @@ DISTCLEANFILES = mpopt.s blowfishopt.s sha1opt.s + + bench: + (cd tests && $(MAKE) $(AM_MAKEFLAGS) bench) ++ ++install-ptest: ++ (cd tests && $(MAKE) $(AM_MAKEFLAGS) check_PROGRAMS) +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 1604e5e..d8db8d8 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -101,3 +101,6 @@ bench: benchme benchrsa benchhf benchbc + ./benchbc AES 128 + ./benchbc Blowfish 128 + ./benchbc Blowfish 128 ++ ++check_PROGRAMS: ++ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) +-- +1.8.1.2 + diff --git a/poky/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch b/poky/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch new file mode 100644 index 000000000..91b1fa6ef --- /dev/null +++ b/poky/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch @@ -0,0 +1,43 @@ +We are unable to run code at configure time in a cross environemnt, but as we +control the build we can be fairly certain this dependency is met. + +Upstream-Status: Inappropriate [embedded specific] + +JL 05/07/10 +Index: beecrypt-4.2.1/configure.ac +=================================================================== +--- beecrypt-4.2.1.orig/configure.ac 2010-11-26 17:12:25.000000000 +0800 ++++ beecrypt-4.2.1/configure.ac 2010-11-26 17:12:30.000000000 +0800 +@@ -292,32 +292,6 @@ + # Predefines and checks for C++ API support + AH_TEMPLATE([CPPGLUE],[Define to 1 if you want to include the C++ code]) + +-if test "$ac_with_cplusplus" = yes; then +- AC_MSG_CHECKING([for IBM's ICU library version >= 2.8]) +- AC_LANG_PUSH(C) +- AC_RUN_IFELSE([ +- AC_LANG_PROGRAM([[#include <unicode/uversion.h>]],[[ +- #if U_ICU_VERSION_MAJOR_NUM < 2 +- exit(1); +- #elif U_ICU_VERSION_MAJOR_NUM == 2 +- # if U_ICU_VERSION_MINOR_NUM < 8 +- exit(1); +- # else +- exit(0); +- # endif +- #else +- exit(0); +- #endif +- ]])],[ +- AC_MSG_RESULT([yes]) +- ],[ +- AC_MSG_RESULT([no]) +- AC_MSG_WARN([disabling cplusplus]) +- ac_with_cplusplus=no +- ]) +- AC_LANG_POP(C) +-fi +- + AM_CONDITIONAL([WITH_CPLUSPLUS],[test "$ac_with_cplusplus" = yes]) + + if test "$ac_with_cplusplus" = yes ; then diff --git a/poky/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch b/poky/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch new file mode 100644 index 000000000..8144e39be --- /dev/null +++ b/poky/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch @@ -0,0 +1,39 @@ + +gcc-4.7 seems to be stricter about some things, so follow +the suggestion from the error/note information. + + ../../x86_64-linux-libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I../.. + x86_64-linux-libtool: compile: g++ -DHAVE_CONFIG_H -I. -I../.. -I../../include -isyst + In file included from ../../include/beecrypt/c++/util/Hashtable.h:42:0, + from ../../include/beecrypt/c++/util/Properties.h:36, + from Properties.cxx:25: + ../../include/beecrypt/c++/util/AbstractSet.h: In instantiation of 'bool beecrypt::uti + Properties.cxx:228:1: required from here + ../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not decl + ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: declarations in dependent b + ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: use 'this->containsAll' ins + ../../include/beecrypt/c++/util/AbstractSet.h: In instantiation of 'bool beecrypt::uti + Properties.cxx:228:1: required from here + ../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not decl + ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: declarations in dependent b + ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: use 'this->containsAll' ins + + +Upstream-Status: Pending + +Signed-off-by: Saul Wold <sgw@linux.intel.com> + + +Index: beecrypt-4.2.1/include/beecrypt/c++/util/AbstractSet.h +=================================================================== +--- beecrypt-4.2.1.orig/include/beecrypt/c++/util/AbstractSet.h ++++ beecrypt-4.2.1/include/beecrypt/c++/util/AbstractSet.h +@@ -56,7 +56,7 @@ namespace beecrypt { + if (c->size() != size()) + return false; + +- return containsAll(*c); ++ return this->containsAll(*c); + } + return false; + } diff --git a/poky/meta/recipes-support/beecrypt/beecrypt/fix-security.patch b/poky/meta/recipes-support/beecrypt/beecrypt/fix-security.patch new file mode 100644 index 000000000..6cb0c0020 --- /dev/null +++ b/poky/meta/recipes-support/beecrypt/beecrypt/fix-security.patch @@ -0,0 +1,47 @@ +Fix visibility of various C++ functions, inspired by a similar patch in the Fink +project: +http://www.mail-archive.com/fink-commits@lists.sourceforge.net/msg75742.html + +JL 05/07/10 + +Upstream-Status: Pending + +Index: beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h +=================================================================== +--- beecrypt-4.2.1.orig/include/beecrypt/c++/beeyond/BeeCertificate.h 2010-11-26 17:22:57.000000000 +0800 ++++ beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h 2010-11-26 17:23:01.000000000 +0800 +@@ -147,13 +147,13 @@ + mutable bytearray* enc; + + BeeCertificate(); +- BeeCertificate(InputStream& in) throw (IOException); + + void encodeTBS(DataOutputStream& out) const throw (IOException); + + bytearray* encodeTBS() const throw (CertificateEncodingException); + + public: ++ BeeCertificate(InputStream& in) throw (IOException); + BeeCertificate(const BeeCertificate&) throw (CloneNotSupportedException); + virtual ~BeeCertificate(); + +Index: beecrypt-4.2.1/include/beecrypt/c++/security/Security.h +=================================================================== +--- beecrypt-4.2.1.orig/include/beecrypt/c++/security/Security.h 2010-11-26 17:20:55.000000000 +0800 ++++ beecrypt-4.2.1/include/beecrypt/c++/security/Security.h 2010-11-26 17:21:36.000000000 +0800 +@@ -61,7 +61,6 @@ + friend class SecureRandom; + friend class Signature; + +- private: + struct spi + { + Object* cspi; +@@ -76,6 +75,7 @@ + static spi* getSpi(const String& algo, const String& type, const Provider&) throw (NoSuchAlgorithmException); + static spi* getFirstSpi(const String& type); + ++ private: + static const String& getKeyStoreDefault(); + + static bool _init; diff --git a/poky/meta/recipes-support/beecrypt/beecrypt/run-ptest b/poky/meta/recipes-support/beecrypt/beecrypt/run-ptest new file mode 100644 index 000000000..2ee294d99 --- /dev/null +++ b/poky/meta/recipes-support/beecrypt/beecrypt/run-ptest @@ -0,0 +1,5 @@ +#!/bin/sh + +cd tests +for i in `ls`; do ./$i; if [ $? -eq 0 ]; then echo "PASS: $i"; \ + else echo "FAIL: $i"; fi; done |
