1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use #define before including SHA-2 3rdparty code

Browse Source 
Using typedef causes errors due to re-definition, so #define the types
needed by the SHA-2 code to the q[u]int* equivalents instead.

Change-Id: I6fc29788dd05aeee28723820f511527d482d31f2
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
This commit is contained in:
Bradley T. Hughes 2012-03-02 08:07:23 +01:00 committed by Qt by Nokia
parent 888fed8065
commit ebb94587f6
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/corelib/tools/qcryptographichash.cpp
View File

@ -48,23 +48,16 @@
#include "../../3rdparty/sha1/sha1.cpp" #include "../../3rdparty/sha1/sha1.cpp"
/* /*
These typedefs are needed by the RFC6234 code. Normally they would come These #defines replace the typedefs needed by the RFC6234 code. Normally
from from stdint.h, but since this header is not available on all platforms the typedefs would come from from stdint.h, but since this header is not
(MSVC 2008, for example), we need to define them ourselves. available on all platforms (MSVC 2008, for example), we #define them to the
Qt equivalents.
*/ */
#ifndef _UINT64_T_DECLARED #define uint64_t QT_PREPEND_NAMESPACE(quint64)
typedef QT_PREPEND_NAMESPACE(quint64) uint64_t; #define uint32_t QT_PREPEND_NAMESPACE(quint32)
#endif #define uint8_t QT_PREPEND_NAMESPACE(quint8)
#define int_least16_t QT_PREPEND_NAMESPACE(qint16)
#ifndef _UINT32_T_DECLARED
typedef QT_PREPEND_NAMESPACE(quint32) uint32_t;
#endif
#ifndef _UINT8_T_DECLARED
typedef QT_PREPEND_NAMESPACE(quint8) uint8_t;
#endif
typedef QT_PREPEND_NAMESPACE(qint16) int_least16_t;
// Header from rfc6234 with 1 modification: // Header from rfc6234 with 1 modification:
// sha1.h - commented out '#include <stdint.h>' on line 74 // sha1.h - commented out '#include <stdint.h>' on line 74
#include "../../3rdparty/rfc6234/sha.h" #include "../../3rdparty/rfc6234/sha.h"
@ -90,16 +83,21 @@ static int SHA384_512AddLength(SHA512Context *context, unsigned int length);
// sha384-512.c - appended 'M' to the SHA224_256AddLength macro on line 304 // sha384-512.c - appended 'M' to the SHA224_256AddLength macro on line 304
#include "../../3rdparty/rfc6234/sha384-512.c" #include "../../3rdparty/rfc6234/sha384-512.c"
#undef uint64_t
#undef uint32_t
#undef uint68_t
#undef int_least16_t
#include <qiodevice.h> #include <qiodevice.h>
static inline int SHA224_256AddLength(SHA256Context *context, unsigned int length) static inline int SHA224_256AddLength(SHA256Context *context, unsigned int length)
{ {
uint32_t addTemp; QT_PREPEND_NAMESPACE(quint32) addTemp;
return SHA224_256AddLengthM(context, length); return SHA224_256AddLengthM(context, length);
} }
static inline int SHA384_512AddLength(SHA512Context *context, unsigned int length) static inline int SHA384_512AddLength(SHA512Context *context, unsigned int length)
{ {
uint64_t addTemp; QT_PREPEND_NAMESPACE(quint64) addTemp;
return SHA384_512AddLengthM(context, length); return SHA384_512AddLengthM(context, length);
} }