Skip to content

Commit 34902eb

Browse files
committed
Merge branch 'hotfix/v0.1.1'
2 parents 40a9e24 + aec4c00 commit 34902eb

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

appveyor.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
version: 0.1.0-build{build}
1+
version: 0.1.1-build{build}
22
skip_non_tags: true
33
os: Windows Server 2012 R2
44
shallow_clone: true
55

66
branches:
77
only:
88
- master
9-
10-
configuration:
11-
- release
9+
10+
configuration: Release
1211

1312
environment:
14-
qtcryptohash_version: 0.1.0
13+
qtcryptohash_version: 0.1.1
1514
qt_version: 5.5
1615
msvc_dir: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC
1716
mingw_dir: C:\Qt\Tools\mingw492_32\bin

lib/lib.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ HEADERS += \
2929

3030
VER_MAJ = 0
3131
VER_MIN = 1
32-
VER_PAT = 0
32+
VER_PAT = 1
3333
VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
3434

3535
######################## OS DEPENDENT OPTIONS ########################
@@ -41,7 +41,7 @@ win32 {
4141
# CONTENT OF THE RC FILE #
4242
QMAKE_TARGET_PRODUCT = QtCryptoHash
4343
QMAKE_TARGET_COMPANY = rikyoz
44-
QMAKE_TARGET_COPYRIGHT = Copyright (c) 2015 $${QMAKE_TARGET_COMPANY}
44+
QMAKE_TARGET_COPYRIGHT = Copyright (c) 2016 $${QMAKE_TARGET_COMPANY}
4545
}
4646

4747
!win32-g++ {

lib/src/whirlpool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ void Whirlpool::write( const byte* source, int sourceBits ) {
941941
sourceBits -= 8 - bufferRem;
942942
/* now 0 <= sourceBits < 8;
943943
furthermore, all data (if any is left) is in source[sourcePos].*/
944-
if ( bufferBits == WHIRLPOOL_DIGEST_SIZE ) {
944+
if ( bufferBits == WHIRLPOOL_DIGEST_BITSIZE ) {
945945
// process data block:
946946
processBuffer();
947947
// reset buffer:

0 commit comments

Comments
 (0)