last fixes for v1.2.6

rhash · Jun 15, 2011 · 3090de1 · 3090de1
1 parent 8efee09
commit 3090de1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,4 @@
-Tue Jun 14 2011 Aleksey
+Thu Jun 16 2011 Aleksey
  * === Version 1.2.6 ===
 
 Sat Jun 11 2011 Aleksey

diff --git a/INSTALL b/INSTALL
@@ -13,7 +13,7 @@ RPM package can be created by commands
  'make rpm' or 'setarch i586 make rpm'.
 
 To compile with openssl support use the following flags
- make ADDCFLAGS="-DUSE_OPENSSL -rdynamic" ADDLDFLAGS=-ldl
+ make ADDCFLAGS="-DUSE_OPENSSL -DOPENSSL_RUNTIME -rdynamic" ADDLDFLAGS="-ldl"
 
 The LibRHash library can be compiled using
  'make lib-static' or 'make lib-shared'

diff --git a/librhash/config.h b/librhash/config.h
@@ -1,2 +1,2 @@
 /* config.h */
-#define OPENSSL_RUNTIME
+/*#define OPENSSL_RUNTIME*/
diff --git a/librhash/plug_openssl.c b/librhash/plug_openssl.c
@@ -57,7 +57,7 @@ OS_METHOD(WHIRLPOOL);
 #define HASH_INFO_METHODS(name) 0, 0, wrap##name##_Final, 0
 #else /* non-runtime linking */
 #define CALL_FINAL(name, result, ctx) name##_Final(result, ctx)
-#define HASH_INFO_METHODS(name) (pinit_t)name##_Init, (pupdate_t)name##_Update, wrap##name##_fin, 0
+#define HASH_INFO_METHODS(name) (pinit_t)name##_Init, (pupdate_t)name##_Update, wrap##name##_Final, 0
 #endif
 
 

diff --git a/rhash.spec.in b/rhash.spec.in
@@ -33,7 +33,7 @@ Program features:
 %setup
 
 %build
-make OPTFLAGS="$RPM_OPT_FLAGS -DNDEBUG" ADDCFLAGS="-DUSE_OPENSSL -rdynamic" ADDLDFLAGS=-ldl
+make OPTFLAGS="$RPM_OPT_FLAGS -DNDEBUG" ADDCFLAGS="-DUSE_OPENSSL -DOPENSSL_RUNTIME -rdynamic" ADDLDFLAGS=-ldl all test
 
 %install
 rm -rf "$RPM_BUILD_ROOT"

diff --git a/win32/vc-2010/rhash.vcxproj b/win32/vc-2010/rhash.vcxproj
@@ -105,7 +105,7 @@
  <ClCompile>
  <Optimization>Disabled</Optimization>
  <AdditionalIncludeDirectories>..\..\librhash;..\..\win32;..\..\ssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>IN_RHASH;USE_OPENSSL;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>IN_RHASH;USE_OPENSSL;OPENSSL_RUNTIME;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <MinimalRebuild>true</MinimalRebuild>
  <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
  <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -129,7 +129,7 @@
  <ClCompile>
  <Optimization>Disabled</Optimization>
  <AdditionalIncludeDirectories>..\..\librhash;..\..\win32;..\..\ssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>IN_RHASH;USE_OPENSSL;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>IN_RHASH;USE_OPENSSL;OPENSSL_RUNTIME;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
  <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  <PrecompiledHeader>
@@ -154,7 +154,7 @@
  <ClCompile>
  <Optimization>Full</Optimization>
  <AdditionalIncludeDirectories>..\..\librhash;..\..\win32;..\..\ssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>IN_RHASH;USE_OPENSSL;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>IN_RHASH;USE_OPENSSL;OPENSSL_RUNTIME;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  <BufferSecurityCheck>false</BufferSecurityCheck>
  <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -186,7 +186,7 @@
  <ClCompile>
  <Optimization>Full</Optimization>
  <AdditionalIncludeDirectories>..\..\librhash;..\..\win32;..\..\ssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>IN_RHASH;USE_OPENSSL;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>IN_RHASH;USE_OPENSSL;OPENSSL_RUNTIME;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  <BufferSecurityCheck>false</BufferSecurityCheck>
  <FunctionLevelLinking>true</FunctionLevelLinking>