Merge branch 'hotfix/v0.1.1'

rikyoz · Mar 17, 2016 · 34902eb · 34902eb
2 parents 40a9e24 + aec4c00
commit 34902eb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,17 +1,16 @@
-version: 0.1.0-build{build}
+version: 0.1.1-build{build}
 skip_non_tags: true
 os: Windows Server 2012 R2
 shallow_clone: true
 
 branches:
  only:
  - master
-
-configuration:
- - release
+
+configuration: Release
 
 environment:
- qtcryptohash_version: 0.1.0
+ qtcryptohash_version: 0.1.1
  qt_version: 5.5
  msvc_dir: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC
  mingw_dir: C:\Qt\Tools\mingw492_32\bin

diff --git a/lib/lib.pro b/lib/lib.pro
@@ -29,7 +29,7 @@ HEADERS += \
 
 VER_MAJ = 0
 VER_MIN = 1
-VER_PAT = 0
+VER_PAT = 1
 VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
 
 ######################## OS DEPENDENT OPTIONS ########################
@@ -41,7 +41,7 @@ win32 {
  # CONTENT OF THE RC FILE #
  QMAKE_TARGET_PRODUCT = QtCryptoHash
  QMAKE_TARGET_COMPANY = rikyoz
- QMAKE_TARGET_COPYRIGHT = Copyright (c) 2015 $${QMAKE_TARGET_COMPANY}
+ QMAKE_TARGET_COPYRIGHT = Copyright (c) 2016 $${QMAKE_TARGET_COMPANY}
  }
 
  !win32-g++ {

diff --git a/lib/src/whirlpool.cpp b/lib/src/whirlpool.cpp
@@ -941,7 +941,7 @@ void Whirlpool::write( const byte* source, int sourceBits ) {
  sourceBits -= 8 - bufferRem;
  /* now 0 <= sourceBits < 8;
  furthermore, all data (if any is left) is in source[sourcePos].*/
- if ( bufferBits == WHIRLPOOL_DIGEST_SIZE ) {
+ if ( bufferBits == WHIRLPOOL_DIGEST_BITSIZE ) {
  // process data block:
  processBuffer();
  // reset buffer: