propagate from branch 'net.randombit.botan.1_8' (head 3158f8272a3582dd44dfb771665eb71f7d005339)

            to branch 'net.randombit.botan' (head bf629b13dd132b263e76a72b7eca0f7e4ab19aac)

24 files changed, 148 insertions, 4 deletions

diff --git a/src/build-data/arch/m68k.txt b/src/build-data/arch/m68k.txt
index 27f246abc..759a3dac1 100644
--- a/src/build-data/arch/m68k.txt
+++ b/src/build-data/arch/m68k.txt
@@ -2,6 +2,11 @@ realname "Motorola 680x0"
 
 default_submodel 68020
 
+endian big
+
+# Except for Coldfire
+#unaligned ok
+
 <aliases>
 680x0
 68k
diff --git a/src/build-data/arch/ppc.txt b/src/build-data/arch/ppc.txt
index 16112f389..e2dfa6ea2 100644
--- a/src/build-data/arch/ppc.txt
+++ b/src/build-data/arch/ppc.txt
@@ -1,6 +1,7 @@
 realname "PowerPC"
 
 endian big
+unaligned ok
 
 default_submodel ppc604
 
diff --git a/src/build-data/arch/s390.txt b/src/build-data/arch/s390.txt
index 392f51397..312b262c4 100644
--- a/src/build-data/arch/s390.txt
+++ b/src/build-data/arch/s390.txt
@@ -2,6 +2,9 @@ realname "S/390 31-bit"
 
 default_submodel s390
 
+endian big
+unaligned ok
+
 <submodels>
 s390
 </submodels>
diff --git a/src/build-data/arch/s390x.txt b/src/build-data/arch/s390x.txt
index 49fb0bda7..9fe6bd615 100644
--- a/src/build-data/arch/s390x.txt
+++ b/src/build-data/arch/s390x.txt
@@ -2,6 +2,9 @@ realname "S/390 64-bit"
 
 default_submodel s390x
 
+endian big
+unaligned ok
+
 <submodels>
 s390x
 </submodels>
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index e4ab0f44b..e0d8368ed 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -22,6 +22,18 @@
 #define BOTAN_KARAT_SQR_THRESHOLD 32
 #define BOTAN_PRIVATE_KEY_OP_BLINDING_BITS 64
 
+/*
+* Toggles for parallel block cipher mode processing
+*
+* CBC and CFB can only use parallel processing in decryption mode
+*/
+#define BOTAN_PARALLEL_BLOCKS_ECB 8
+#define BOTAN_PARALLEL_BLOCKS_CBC 8
+#define BOTAN_PARALLEL_BLOCKS_CFB 8
+#define BOTAN_PARALLEL_BLOCKS_CTR 8
+#define BOTAN_PARALLEL_BLOCKS_EAX 8
+#define BOTAN_PARALLEL_BLOCKS_XTS 8
+
 /* PK key consistency checking toggles */
 #define BOTAN_PUBLIC_KEY_STRONG_CHECKS_ON_LOAD 1
 #define BOTAN_PRIVATE_KEY_STRONG_CHECKS_ON_LOAD 1
diff --git a/src/build-data/cc/bcc.txt b/src/build-data/cc/bcc.txt
index df09daff0..fe88c270e 100644
--- a/src/build-data/cc/bcc.txt
+++ b/src/build-data/cc/bcc.txt
@@ -1,5 +1,7 @@
 realname "Borland C++"
 
+macro_name "BORLAND"
+
 binary_name "bcc32"
 
 compile_option "-c "
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
new file mode 100644
index 000000000..480794faf
--- /dev/null
+++ b/src/build-data/cc/clang.txt
@@ -0,0 +1,46 @@
+realname "Clang/LLVM"
+
+# Largely copied from the gcc config
+
+macro_name "CLANG"
+
+binary_name clang
+
+compile_option "-c "
+output_to_option "-o "
+add_include_dir_option "-I"
+add_lib_dir_option "-L"
+add_lib_option "-l"
+
+lang_flags "-D_REENTRANT -ansi -Wno-long-long"
+warning_flags "-W -Wall"
+
+makefile_style unix
+
+lib_opt_flags "-O2"
+check_opt_flags "-O2"
+shared_flags "-fPIC"
+debug_flags "-g"
+no_debug_flags "-finline-functions"
+
+<so_link_flags>
+# The default works for GNU ld and several other Unix linkers
+default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
+</so_link_flags>
+
+<mach_abi_linking>
+amd64   -> "-m64"
+mips64  -> "-mabi=64"
+s390    -> "-m31"
+s390x   -> "-m64"
+sparc32 -> "-m32 -mno-app-regs"
+sparc64 -> "-m64 -mno-app-regs"
+ppc64   -> "-m64"
+
+# This should probably be used on most/all targets, but the docs are incomplete
+openbsd -> "-pthread"
+freebsd -> "-pthread"
+dragonfly -> "-pthread"
+netbsd  -> "-pthread -D_NETBSD_SOURCE"
+qnx     -> "-fexceptions -D_QNX_SOURCE"
+</mach_abi_linking>
diff --git a/src/build-data/cc/compaq.txt b/src/build-data/cc/compaq.txt
index 66d3a5219..94075e888 100644
--- a/src/build-data/cc/compaq.txt
+++ b/src/build-data/cc/compaq.txt
@@ -1,5 +1,7 @@
 realname "Compaq C++"
 
+macro_name "COMPAQ"
+
 binary_name "cxx"
 
 compile_option "-c "
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
index ca2471059..38516e2f3 100644
--- a/src/build-data/cc/ekopath.txt
+++ b/src/build-data/cc/ekopath.txt
@@ -1,5 +1,7 @@
 realname "PathScale EKOPath C++"
 
+macro_name "PATHSCALE"
+
 binary_name "pathCC"
 
 compile_option "-c "
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 978ed6d58..9adef8cfb 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -1,5 +1,7 @@
 realname "GNU C++"
 
+macro_name "GCC"
+
 binary_name "g++"
 
 compiler_has_tr1 yes
@@ -14,10 +16,11 @@ lang_flags "-D_REENTRANT -ansi -Wno-long-long"
 warning_flags "-W -Wall"
 #warning_flags "-Wextra -Wall -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wno-unused-parameter"
 
-lib_opt_flags "-O2 -finline-functions"
-check_opt_flags "-O2"
+lib_opt_flags "-O2"
+check_opt_flags "-O"
 shared_flags "-fPIC"
 debug_flags "-g"
+no_debug_flags "-finline-functions"
 
 dll_import_flags ""
 dll_export_flags ""
diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt
index 284e92ca6..9c0d4a784 100644
--- a/src/build-data/cc/hpcc.txt
+++ b/src/build-data/cc/hpcc.txt
@@ -1,5 +1,7 @@
 realname "HP-UX C++"
 
+macro_name "HP_ACC"
+
 binary_name "aCC"
 
 compile_option "-c "
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index 7d8e9682f..9595714f6 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -1,5 +1,7 @@
 realname "Intel C++"
 
+macro_name "INTEL"
+
 binary_name "icpc"
 
 compiler_has_tr1 yes
diff --git a/src/build-data/cc/kai.txt b/src/build-data/cc/kai.txt
index 8585e54e0..52ddba4ab 100644
--- a/src/build-data/cc/kai.txt
+++ b/src/build-data/cc/kai.txt
@@ -1,5 +1,7 @@
 realname "KAI C++"
 
+macro_name "KAI"
+
 binary_name "KCC"
 
 compile_option "-c "
diff --git a/src/build-data/cc/mipspro.txt b/src/build-data/cc/mipspro.txt
index b75fc4fb3..a4cfbd1ee 100644
--- a/src/build-data/cc/mipspro.txt
+++ b/src/build-data/cc/mipspro.txt
@@ -1,5 +1,7 @@
 realname "SGI MIPSPro C++"
 
+macro_name "MIPSPRO"
+
 binary_name "CC"
 
 compile_option "-c "
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index 68e4517f8..c19d93e2b 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -1,5 +1,7 @@
 realname "Visual C++"
 
+macro_name "MSVC"
+
 binary_name "cl.exe"
 
 compile_option "/nologo /c "
diff --git a/src/build-data/cc/open64.txt b/src/build-data/cc/open64.txt
index b7c1e9e99..0157440cf 100644
--- a/src/build-data/cc/open64.txt
+++ b/src/build-data/cc/open64.txt
@@ -1,5 +1,7 @@
 realname "Open64"
 
+macro_name "OPEN64"
+
 binary_name "openCC"
 
 compile_option "-c "
diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt
index 35f466477..c4fdb9e70 100644
--- a/src/build-data/cc/pgi.txt
+++ b/src/build-data/cc/pgi.txt
@@ -1,5 +1,7 @@
 realname "Portland Group C++"
 
+macro_name "PORTLAND_GROUP"
+
 binary_name "pgCC"
 
 compile_option "-c "
diff --git a/src/build-data/cc/sgipro64.txt b/src/build-data/cc/sgipro64.txt
index 28132ffcc..be91ac69a 100644
--- a/src/build-data/cc/sgipro64.txt
+++ b/src/build-data/cc/sgipro64.txt
@@ -1,5 +1,7 @@
 realname "SGI Pro64"
 
+macro_name "SGI_PRO64"
+
 binary_name "sgiCC"
 
 compile_option "-c "
diff --git a/src/build-data/cc/sunwspro.txt b/src/build-data/cc/sunwspro.txt
index e1bc0b26f..9756f8538 100644
--- a/src/build-data/cc/sunwspro.txt
+++ b/src/build-data/cc/sunwspro.txt
@@ -1,5 +1,7 @@
 realname "Sun Workshop Pro C++"
 
+macro_name "SUN_WORKSHOP"
+
 binary_name "CC"
 
 compile_option "-c "
diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt
index 64b888421..6d06b4c43 100644
--- a/src/build-data/cc/xlc.txt
+++ b/src/build-data/cc/xlc.txt
@@ -1,5 +1,7 @@
 realname "IBM XL C/C++"
 
+macro_name "IBM_XLC"
+
 binary_name "xlC"
 
 compile_option "-c "
diff --git a/src/build-data/makefile/python.in b/src/build-data/makefile/python.in
new file mode 100644
index 000000000..9658c70ce
--- /dev/null
+++ b/src/build-data/makefile/python.in
@@ -0,0 +1,29 @@
+CXX = g++
+
+PYTHON_ROOT = /usr/lib/python%{python_version}/config
+PYTHON_INC = -I/usr/include/python%{python_version}
+PYTHON_SITE_PACKAGE_DIR = /usr/lib/python%{python_version}/site-packages/
+
+PYTHON_FLAGS = -Isrc/wrap/python -Os -fPIC -ftemplate-depth-255 -Wall -Wno-unused $(PYTHON_INC)
+
+PYTHON_OBJS   = %{python_objs}
+
+BOTAN_PYTHON_MODDIR = build/botan-python
+
+all: $(BOTAN_PYTHON_MODDIR)/_botan.so
+
+%{python_build_cmds}
+
+$(BOTAN_PYTHON_MODDIR)/_botan.so: $(PYTHON_OBJS)
+	rm -rf $(BOTAN_PYTHON_MODDIR)
+	mkdir $(BOTAN_PYTHON_MODDIR)
+	cp src/wrap/python/*.py $(BOTAN_PYTHON_MODDIR)
+	$(CXX) -shared -o $@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) -lbotan -lboost_python -Wl,-rpath-link,. -Wl,-soname,$@
+
+clean:
+	rm -f $(PYTHON_OBJS) $(BOTAN_PYTHON_MODDIR)
+
+install:
+	mkdir -p $(PYTHON_SITE_PACKAGE_DIR)/botan
+	cp $(BOTAN_PYTHON_MODDIR)/* $(PYTHON_SITE_PACKAGE_DIR)/botan
+	chmod -R u=rwX,go=rX $(PYTHON_SITE_PACKAGE_DIR)/botan
diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in
index a48a5a17e..8e0e35b87 100644
--- a/src/build-data/makefile/unix.in
+++ b/src/build-data/makefile/unix.in
@@ -101,7 +101,7 @@ clean:
 distclean: clean
 	$(RM_R) %{build_dir}
 	$(RM_R) %{doc_src_dir}/doxygen %{doc_src_dir}/botan.doxy
-	$(RM) Makefile $(CONFIG_SCRIPT) $(PKGCONFIG)
+	$(RM) Makefile* $(CONFIG_SCRIPT) $(PKGCONFIG)
 
 install: $(LIBRARIES)
 	$(ECHO) "Installing Botan into $(DESTDIR)... "
diff --git a/src/build-data/makefile/unix_shr.in b/src/build-data/makefile/unix_shr.in
index f718d1160..cfc8e3223 100644
--- a/src/build-data/makefile/unix_shr.in
+++ b/src/build-data/makefile/unix_shr.in
@@ -115,7 +115,7 @@ clean:
 distclean: clean
 	$(RM_R) %{build_dir}
 	$(RM_R) %{doc_src_dir}/doxygen %{doc_src_dir}/botan.doxy
-	$(RM) Makefile $(CONFIG_SCRIPT) $(PKGCONFIG)
+	$(RM) Makefile* $(CONFIG_SCRIPT) $(PKGCONFIG)
 
 install: $(LIBRARIES)
 	$(ECHO) "Installing Botan into $(DESTDIR)... "
diff --git a/src/build-data/os/hurd b/src/build-data/os/hurd
new file mode 100644
index 000000000..ed56dad75
--- /dev/null
+++ b/src/build-data/os/hurd
@@ -0,0 +1,16 @@
+realname "Hurd"
+
+os_type unix
+
+<target_features>
+posix_mlock
+</target_features>
+
+# Is this correct?
+<supports_shared>
+all
+</supports_shared>
+
+<aliases>
+gnu
+</aliases>