aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure.pl2
-rw-r--r--doc/info.txt5
-rw-r--r--misc/config/arch/alpha2
-rw-r--r--misc/config/arch/hppa2
-rw-r--r--misc/config/arch/ia323
-rw-r--r--misc/config/arch/m68k2
-rw-r--r--misc/config/arch/ppc3
-rw-r--r--src/hash/sha1_sse2/info.txt1
8 files changed, 14 insertions, 6 deletions
diff --git a/configure.pl b/configure.pl
index 501a52597..87ec7f90b 100755
--- a/configure.pl
+++ b/configure.pl
@@ -1870,7 +1870,9 @@ sub guess_cpu_from_this
$cpu = 'athlon' if($cpuinfo =~ /athlon/);
$cpu = 'pentium4' if($cpuinfo =~ /pentium 4/);
+ $cpu = 'pentium4' if($cpuinfo =~ /pentium 4/);
$cpu = 'pentium4' if($cpuinfo =~ /pentium\(r\) 4/);
+ $cpu = 'pentium-m' if($cpuinfo =~ /pentium\(r\) m/);
$cpu = 'pentium3' if($cpuinfo =~ /pentium iii/);
$cpu = 'pentium2' if($cpuinfo =~ /pentium ii/);
$cpu = 'pentium3' if($cpuinfo =~ /pentium 3/);
diff --git a/doc/info.txt b/doc/info.txt
index 52afda968..b73b01738 100644
--- a/doc/info.txt
+++ b/doc/info.txt
@@ -25,6 +25,11 @@ Botan supports the following basic cryptographic algorithms:
For build instructions, read 'doc/building.pdf'. The license can be
found in 'doc/license.txt', and the ChangeLog is in 'doc/log.txt'.
+Higher level protocols are implemented on top of Botan by:
+
+NetSieben SSH Library (SSHv2): http://www.netsieben.com/products/ssh/
+Ajisai (SSLv3/TLSv1): http://www.randombit.net/code/ajisai/
+
Check http://botan.randombit.net/ for announcements and news. If
you'll be developing code using Botan, consider joining the mailing
lists; links to subscriptions forms and the archives can be found on
diff --git a/misc/config/arch/alpha b/misc/config/arch/alpha
index 16159207f..60b264396 100644
--- a/misc/config/arch/alpha
+++ b/misc/config/arch/alpha
@@ -1,6 +1,6 @@
realname "DEC Alpha"
-default_submodel alpha-ev5
+default_submodel alpha-ev4
endian little
<aliases>
diff --git a/misc/config/arch/hppa b/misc/config/arch/hppa
index e01da76db..4cdd40889 100644
--- a/misc/config/arch/hppa
+++ b/misc/config/arch/hppa
@@ -1,6 +1,6 @@
realname "HP-PA"
-default_submodel hppa1.1
+default_submodel hppa1.0
<aliases>
hp-pa
diff --git a/misc/config/arch/ia32 b/misc/config/arch/ia32
index 1d2b36af1..5976c5c78 100644
--- a/misc/config/arch/ia32
+++ b/misc/config/arch/ia32
@@ -1,6 +1,6 @@
realname "IA-32"
-default_submodel i686
+default_submodel i386
endian little
unaligned ok
@@ -18,6 +18,7 @@ i486
i586
i686
pentium4
+pentium-m
k6
athlon
</submodels>
diff --git a/misc/config/arch/m68k b/misc/config/arch/m68k
index 324a724b8..27f246abc 100644
--- a/misc/config/arch/m68k
+++ b/misc/config/arch/m68k
@@ -1,6 +1,6 @@
realname "Motorola 680x0"
-default_submodel 68040
+default_submodel 68020
<aliases>
680x0
diff --git a/misc/config/arch/ppc b/misc/config/arch/ppc
index 0f7ceac2b..16112f389 100644
--- a/misc/config/arch/ppc
+++ b/misc/config/arch/ppc
@@ -2,8 +2,7 @@ realname "PowerPC"
endian big
-# G3; probably a reasonable assumption these days
-default_submodel ppc740
+default_submodel ppc604
<aliases>
powerpc
diff --git a/src/hash/sha1_sse2/info.txt b/src/hash/sha1_sse2/info.txt
index 8af271a2a..4177c0ab7 100644
--- a/src/hash/sha1_sse2/info.txt
+++ b/src/hash/sha1_sse2/info.txt
@@ -11,6 +11,7 @@ sha1_sse.cpp
</add>
<arch>
+pentium-m
pentium4
amd64
</arch>