1 --- cryptsetup-1.1.2/luks/pbkdf.c~ 2009-09-11 16:11:50.000000000 +0200
2 +++ cryptsetup-1.1.2/luks/pbkdf.c 2010-06-21 11:16:57.353421474 +0200
4 if (gcry_md_setkey(prf, P, Plen))
7 - for (i = 1; (uint) i <= l; i++) {
8 + for (i = 1; (unsigned int) i <= l; i++) {
11 for (u = 1; u <= c ; u++) {
16 - for (k = 0; (uint) k < hLen; k++)
17 + for (k = 0; (unsigned int) k < hLen; k++)
20 if (perfcheck && __PBKDF2_performance) {
25 - memcpy(DK + (i - 1) * hLen, T, (uint) i == l ? r : hLen);
26 + memcpy(DK + (i - 1) * hLen, T, (unsigned int) i == l ? r : hLen);
30 --- cryptsetup-1.1.2/luks/keymanage.c.org 2010-06-21 11:25:41.010034880 +0200
31 +++ cryptsetup-1.1.2/luks/keymanage.c 2010-06-21 11:25:47.149697130 +0200
33 #include <sys/types.h>
35 #include <sys/ioctl.h>
38 #include <netinet/in.h>
41 #include <uuid/uuid.h>
42 #include <../lib/internal.h>
45 +#define UINT32_MAX UINT_MAX
48 #define div_round_up(a,b) ({ \
49 typeof(a) __a = (a); \
50 typeof(b) __b = (b); \