From a04917833c4fca355123157c4a03ea706fa31c19 Mon Sep 17 00:00:00 2001 From: Zhe Wang <0x1998@gmail.com> Date: Sun, 11 Oct 2015 22:58:31 +0800 Subject: [PATCH] Remove dependency on libavutil --- goldendict.pro | 10 +-- mdictparser.cc | 15 ++-- mdictparser.hh | 2 + ripemd.cc | 183 +++++++++++++++++++++++++++++++++++++++++++++++++ ripemd.hh | 45 ++++++++++++ 5 files changed, 241 insertions(+), 14 deletions(-) create mode 100644 ripemd.cc create mode 100644 ripemd.hh diff --git a/goldendict.pro b/goldendict.pro index f1dc509d..89f2ea16 100644 --- a/goldendict.pro +++ b/goldendict.pro @@ -106,7 +106,7 @@ unix:!mac { CONFIG += link_pkgconfig PKGCONFIG += vorbisfile \ - vorbis \ + vorbis \ ogg \ hunspell isEmpty(DISABLE_INTERNAL_PLAYER) { @@ -294,7 +294,8 @@ HEADERS += folding.hh \ ftshelpers.hh \ dictserver.hh \ helpwindow.hh \ - slob.hh + slob.hh \ + ripemd.hh FORMS += groups.ui \ dictgroupwidget.ui \ @@ -417,10 +418,11 @@ SOURCES += folding.cc \ ftshelpers.cc \ dictserver.cc \ helpwindow.cc \ - slob.cc + slob.cc \ + ripemd.cc win32 { - FORMS += texttospeechsource.ui + FORMS += texttospeechsource.ui SOURCES += mouseover_win32/ThTypes.c \ wordbyauto.cc \ guids.c \ diff --git a/mdictparser.cc b/mdictparser.cc index 5632fc27..6648837a 100644 --- a/mdictparser.cc +++ b/mdictparser.cc @@ -25,10 +25,6 @@ #include #include -extern "C" { -#include -} - #include #include #include @@ -39,6 +35,7 @@ extern "C" { #include "decompress.hh" #include "gddebug.hh" +#include "ripemd.hh" namespace Mdict { @@ -218,14 +215,12 @@ QString MdictParser::toUtf16( const char * fromCode, const char * from, size_t f bool MdictParser::decryptHeadWordIndex(char * buffer, qint64 len) { - struct AVRIPEMD * ripemd = av_ripemd_alloc(); - if ( av_ripemd_init( ripemd, 128 ) != 0 ) - return false; - av_ripemd_update( ripemd, ( const uchar * ) buffer + 4, 4 ); - av_ripemd_update( ripemd, ( const uchar * ) "\x95\x36\x00\x00", 4 ); + RIPEMD128 ripemd; + ripemd.update( ( const uchar * ) buffer + 4, 4 ); + ripemd.update( ( const uchar * ) "\x95\x36\x00\x00", 4 ); uint8_t key[16]; - av_ripemd_final( ripemd, key ); + ripemd.digest( key ); buffer += 8; len -= 8; diff --git a/mdictparser.hh b/mdictparser.hh index f7e85768..b8dee43e 100644 --- a/mdictparser.hh +++ b/mdictparser.hh @@ -1,8 +1,10 @@ // https://bitbucket.org/xwang/mdict-analysis +// https://github.com/zhansliu/writemdict/blob/master/fileformat.md // Octopus MDict Dictionary File (.mdx) and Resource File (.mdd) Analyser // // Copyright (C) 2012, 2013 Xiaoqiang Wang // Copyright (C) 2013 Timon Wong +// Copyright (C) 2015 Zhe Wang <0x1998 AT gmail DOT com> // // This program is a free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/ripemd.cc b/ripemd.cc new file mode 100644 index 00000000..bad8fc71 --- /dev/null +++ b/ripemd.cc @@ -0,0 +1,183 @@ +// Copyright (C) 2007 Michael Niedermayer +// Copyright (C) 2013 James Almer +// Copyright (C) 2015 Zhe Wang <0x1998@gmail.com> +// +// Based on the RIPEMD-128 implementation from libavutil +// +// This program is a free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// You can get a copy of GNU General Public License along this program +// But you can always get it from http://www.gnu.org/licenses/gpl.txt +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +#include "ripemd.hh" + +#include +#include + + +static const uint32_t KA[4] = { + 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xa953fd4e +}; + +static const uint32_t KB[4] = { + 0x50a28be6, 0x5c4dd124, 0x6d703ef3, 0x7a6d76e9 +}; + +static const int ROTA[80] = { + 11, 14, 15, 12, 5, 8, 7 , 9, 11, 13, 14, 15, 6, 7, 9, 8, + 7 , 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12, + 11, 13, 6, 7, 14, 9, 13, 15, 14, 8, 13, 6, 5, 12, 7, 5, + 11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12, + 9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6 +}; + +static const int ROTB[80] = { + 8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6, + 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11, + 9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5, + 15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8, + 8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11 +}; + +static const int WA[80] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8, + 3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, 13, 11, 5, 12, + 1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2, + 4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13 +}; + +static const int WB[80] = { + 5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12, + 6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2, + 15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, 2, 10, 0, 4, 13, + 8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14, + 12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11 +}; + +#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) + +#define ROUND128_0_TO_15(a,b,c,d,e,f,g,h) \ + a = rol(a + (( b ^ c ^ d) + block[WA[n]]), ROTA[n]); \ + e = rol(e + ((((f ^ g) & h) ^ g) + block[WB[n]] + KB[0]), ROTB[n]); \ + n++ + +#define ROUND128_16_TO_31(a,b,c,d,e,f,g,h) \ + a = rol(a + ((((c ^ d) & b) ^ d) + block[WA[n]] + KA[0]), ROTA[n]); \ + e = rol(e + (((~g | f) ^ h) + block[WB[n]] + KB[1]), ROTB[n]); \ + n++ + +#define ROUND128_32_TO_47(a,b,c,d,e,f,g,h) \ + a = rol(a + (((~c | b) ^ d) + block[WA[n]] + KA[1]), ROTA[n]); \ + e = rol(e + ((((g ^ h) & f) ^ h) + block[WB[n]] + KB[2]), ROTB[n]); \ + n++ + +#define ROUND128_48_TO_63(a,b,c,d,e,f,g,h) \ + a = rol(a + ((((b ^ c) & d) ^ c) + block[WA[n]] + KA[2]), ROTA[n]); \ + e = rol(e + (( f ^ g ^ h) + block[WB[n]]), ROTB[n]); \ + n++ + +#define R128_0 \ + ROUND128_0_TO_15(a,b,c,d,e,f,g,h); \ + ROUND128_0_TO_15(d,a,b,c,h,e,f,g); \ + ROUND128_0_TO_15(c,d,a,b,g,h,e,f); \ + ROUND128_0_TO_15(b,c,d,a,f,g,h,e) + +#define R128_16 \ + ROUND128_16_TO_31(a,b,c,d,e,f,g,h); \ + ROUND128_16_TO_31(d,a,b,c,h,e,f,g); \ + ROUND128_16_TO_31(c,d,a,b,g,h,e,f); \ + ROUND128_16_TO_31(b,c,d,a,f,g,h,e) + +#define R128_32 \ + ROUND128_32_TO_47(a,b,c,d,e,f,g,h); \ + ROUND128_32_TO_47(d,a,b,c,h,e,f,g); \ + ROUND128_32_TO_47(c,d,a,b,g,h,e,f); \ + ROUND128_32_TO_47(b,c,d,a,f,g,h,e) + +#define R128_48 \ + ROUND128_48_TO_63(a,b,c,d,e,f,g,h); \ + ROUND128_48_TO_63(d,a,b,c,h,e,f,g); \ + ROUND128_48_TO_63(c,d,a,b,g,h,e,f); \ + ROUND128_48_TO_63(b,c,d,a,f,g,h,e) + + +RIPEMD128::RIPEMD128() + : count(0) + , buffer() + , state() +{ + state[0] = 0x67452301; + state[1] = 0xEFCDAB89; + state[2] = 0x98BADCFE; + state[3] = 0x10325476; +} + +void RIPEMD128::transform( const uint8_t buffer[64] ) +{ + uint32_t a, b, c, d, e, f, g, h; + uint32_t block[16]; + int n; + + a = e = state[0]; + b = f = state[1]; + c = g = state[2]; + d = h = state[3]; + + for (n = 0; n < 16; n++) + block[n] = qFromLittleEndian( buffer + 4 * n ); + n = 0; + + R128_0; R128_0; R128_0; R128_0; + + R128_16; R128_16; R128_16; R128_16; + + R128_32; R128_32; R128_32; R128_32; + + R128_48; R128_48; R128_48; R128_48; + + h += c + state[1]; + state[1] = state[2] + d + e; + state[2] = state[3] + a + f; + state[3] = state[0] + b + g; + state[0] = h; +} + +void RIPEMD128::update( const uint8_t * data, size_t len ) +{ + size_t i, j; + + j = count & 63; + count += len; + if ( ( j + len ) > 63 ) + { + memcpy( &buffer[j], data, ( i = 64 - j ) ); + transform( buffer ); + for ( ; i + 63 < len; i += 64 ) + transform( &data[i] ); + j = 0; + } + else + { + i = 0; + } + memcpy( &buffer[j], &data[i], len - i ); +} + +void RIPEMD128::digest( uint8_t * digest ) +{ + uint64_t finalcount = qFromLittleEndian( count << 3 ); + update( (const uint8_t *) "\200", 1 ); + while ( ( count & 63 ) != 56 ) + update( ( const uint8_t * ) "", 1 ); + update( ( uint8_t * ) &finalcount, 8 ); /* Should cause a transform() */ + for ( int i = 0; i < 4; i++ ) + qToLittleEndian( state[i], digest + i*4 ); +} diff --git a/ripemd.hh b/ripemd.hh new file mode 100644 index 00000000..dc461f51 --- /dev/null +++ b/ripemd.hh @@ -0,0 +1,45 @@ +// Copyright (C) 2007 Michael Niedermayer +// Copyright (C) 2013 James Almer +// Copyright (C) 2015 Zhe Wang <0x1998@gmail.com> +// +// Based on the RIPEMD-128 implementation from libavutil +// +// This program is a free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// You can get a copy of GNU General Public License along this program +// But you can always get it from http://www.gnu.org/licenses/gpl.txt +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +#ifndef __RIPEMD_HH_INCLUDED__ +#define __RIPEMD_HH_INCLUDED__ + +#include +#include + + +class RIPEMD128 +{ +public: + RIPEMD128(); + + // Update hash value + void update( const uint8_t * data, size_t len ); + + // Finish hashing and output digest value. + void digest( uint8_t * digest ); + +private: + uint64_t count; // number of bytes in buffer + uint8_t buffer[64]; // 512-bit buffer of input values used in hash updating + uint32_t state[10]; // current hash value + + void transform( const uint8_t buffer[64] ); +}; + +#endif // __RIPEMD_HH_INCLUDED__