Fix location of online docs in readme

Some fixes for the Windows installer config

Remove the SIMD rotate overloads; VC 2010 does not like passing a
__m128i by value, which is required to match the template overload for
the regular rotates. Could change it to a const reference, but I would
worry this would inhibit compiler optimizations. Only used in one
place (Noekeon), so just use the long expressions there.

4 files changed, 16 insertions, 24 deletions

diff --git a/readme.txt b/readme.txt
index 54d2de0fe..ef6f2c77d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -8,7 +8,7 @@ Bugzilla (http://bugs.randombit.net/) or by sending a report to the
 botan-devel mailing list. More information about the mailing list is
 at http://lists.randombit.net/mailman/listinfo/botan-devel/
 
-You can find documentation online at http://botan.randombit.net/manual
+You can find documentation online at http://botan.randombit.net/docs
 and http://botan.randombit.net/doxygen. A set of example programs can
 be found in the examples directory.
 
diff --git a/src/block/noekeon_simd/noekeon_simd.cpp b/src/block/noekeon_simd/noekeon_simd.cpp
index 97158593a..b2beafc82 100644
--- a/src/block/noekeon_simd/noekeon_simd.cpp
+++ b/src/block/noekeon_simd/noekeon_simd.cpp
@@ -16,7 +16,12 @@ namespace Botan {
 #define NOK_SIMD_THETA(A0, A1, A2, A3, K0, K1, K2, K3)  \
    do {                                                 \
       SIMD_32 T = A0 ^ A2;                              \
-      T ^= rotate_left(T, 8) ^ rotate_right(T, 8);      \
+      SIMD_32 T_l8 = T;                                 \
+      SIMD_32 T_r8 = T;                                 \
+      T_l8.rotate_left(8);                              \
+      T_r8.rotate_right(8);                             \
+      T ^= T_l8;                                        \
+      T ^= T_r8;                                        \
       A1 ^= T;                                          \
       A3 ^= T;                                          \
                                                         \
@@ -26,7 +31,12 @@ namespace Botan {
       A3 ^= K3;                                         \
                                                         \
       T = A1 ^ A3;                                      \
-      T ^= rotate_left(T, 8) ^ rotate_right(T, 8);      \
+      T_l8 = T;                                         \
+      T_r8 = T;                                         \
+      T_l8.rotate_left(8);                              \
+      T_r8.rotate_right(8);                             \
+      T ^= T_l8;                                        \
+      T ^= T_r8;                                        \
       A0 ^= T;                                          \
       A2 ^= T;                                          \
       } while(0)
diff --git a/src/build-data/innosetup.in b/src/build-data/innosetup.in
index 0a7eeb8f6..ed618e8fb 100644
--- a/src/build-data/innosetup.in
+++ b/src/build-data/innosetup.in
@@ -41,19 +41,19 @@ name: "docs"; Description: "Developer Documentation"; Types: devel
 ; DLL and license file is always included
 Source: "..\doc\license.txt"; DestDir: "{app}"; Components: dll; AfterInstall: ConvertLineEndings
 Source: "..\botan.dll"; DestDir: "{app}"; Components: dll
-Source: "..\botan.dll.manifest"; DestDir: "{app}"; Components: dll
+Source: "..\botan.dll.manifest"; DestDir: "{app}"; Components: dll; Flags: skipifsourcedoesntexist
 
 Source: "include\botan\*"; DestDir: "{app}\include\botan"; Components: includes; AfterInstall: ConvertLineEndings
 
 Source: "..\readme.txt"; DestDir: "{app}\doc"; Components: docs; AfterInstall: ConvertLineEndings
-Source: "..\doc\log.txt"; DestDir: "{app}\doc"; Components: docs; AfterInstall: ConvertLineEndings
+Source: "..\doc\*.txt"; DestDir: "{app}\doc"; Excludes: "license.txt"; Components: docs; AfterInstall: ConvertLineEndings
 
 Source: "..\doc\examples\*.cpp"; DestDir: "{app}\doc\examples"; Components: docs; AfterInstall: ConvertLineEndings
 
 Source: "..\botan.exp"; DestDir: "{app}"; Components: implib
 Source: "..\botan.lib"; DestDir: "{app}"; Components: implib
 
-Source: "..\doc\api.pdf"; DestDir: "{app}\doc"; Components: docs; Flags: skipifsourcedoesntexist
+Source: "..\doc\manual.pdf"; DestDir: "{app}\doc"; Components: docs; Flags: skipifsourcedoesntexist
 Source: "..\doc\tutorial.pdf"; DestDir: "{app}\doc"; Components: docs; Flags: skipifsourcedoesntexist
 
 [Code]
diff --git a/src/utils/simd_32/simd_32.h b/src/utils/simd_32/simd_32.h
index e2c483d20..e172fa919 100644
--- a/src/utils/simd_32/simd_32.h
+++ b/src/utils/simd_32/simd_32.h
@@ -28,22 +28,4 @@
 
 #endif
 
-namespace Botan {
-
-template<>
-inline SIMD_32 rotate_left(SIMD_32 x, size_t rot)
-   {
-   x.rotate_left(rot);
-   return x;
-   }
-
-template<>
-inline SIMD_32 rotate_right(SIMD_32 x, size_t rot)
-   {
-   x.rotate_right(rot);
-   return x;
-   }
-
-}
-
 #endif