wine-commits November 2007

wine-commits@winehq.org

3 participants
757 discussions

Juan Lang : crypt32: Use 3DES to encrypt data.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 72ab894db12cdc714c151cb51a707d1fc6fc2cf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ab894db12cdc714c151cb51… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 09:16:48 2007 -0800 crypt32: Use 3DES to encrypt data. --- dlls/crypt32/protectdata.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index ea27978..d5ec287 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -49,8 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); #define CRYPT32_PROTECTDATA_PROV PROV_RSA_FULL #define CRYPT32_PROTECTDATA_HASH_CALG CALG_SHA1 #define CRYPT32_PROTECTDATA_HASH_LEN 160 -#define CRYPT32_PROTECTDATA_KEY_CALG CALG_RC2 -#define CRYPT32_PROTECTDATA_KEY_LEN 40 +#define CRYPT32_PROTECTDATA_KEY_CALG CALG_3DES +#define CRYPT32_PROTECTDATA_KEY_LEN 168 #define CRYPT32_PROTECTDATA_SALT_LEN 16 static const BYTE crypt32_protectdata_secret[] = {

1 0

Juan Lang : crypt32: Fix a leak.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 571d75187a0e1c6b008a7e0186a1cf99e2dc2f9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=571d75187a0e1c6b008a7e018… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 09:24:55 2007 -0800 crypt32: Fix a leak. --- dlls/crypt32/tests/protectdata.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index 8ea0158..64ffa68 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -195,6 +195,7 @@ static void test_cryptunprotectdata(void) ok(data_desc!=NULL,"Description not allocated\n"); ok(data_desc[0]=='\0',"Description not empty\n"); + LocalFree(data_desc); LocalFree(plain.pbData); plain.pbData=NULL;

1 0

Juan Lang : crypt32: Set correct bit lengths for algorithms.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 46ef0fb4e8af542256dbe0e33cda6d9d1198026b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ef0fb4e8af542256dbe0e33… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 09:16:05 2007 -0800 crypt32: Set correct bit lengths for algorithms. --- dlls/crypt32/protectdata.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index f3bac9c..ea27978 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -48,7 +48,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); #define CRYPT32_PROTECTDATA_PROV PROV_RSA_FULL #define CRYPT32_PROTECTDATA_HASH_CALG CALG_SHA1 +#define CRYPT32_PROTECTDATA_HASH_LEN 160 #define CRYPT32_PROTECTDATA_KEY_CALG CALG_RC2 +#define CRYPT32_PROTECTDATA_KEY_LEN 40 #define CRYPT32_PROTECTDATA_SALT_LEN 16 static const BYTE crypt32_protectdata_secret[] = { @@ -597,13 +599,13 @@ BOOL fill_protect_data(struct protect_data_t * pInfo, LPCWSTR szDataDescr, } pInfo->cipher_alg=CRYPT32_PROTECTDATA_KEY_CALG; - pInfo->cipher_key_len=0x0000; /* FIXME: get correct value */ + pInfo->cipher_key_len=CRYPT32_PROTECTDATA_KEY_LEN; convert_str_to_blob(crypt_magic_str, &pInfo->data0); pInfo->null1=0x0000; pInfo->hash_alg=CRYPT32_PROTECTDATA_HASH_CALG; - pInfo->hash_len=0x0000; /* FIXME: get correct value */ + pInfo->hash_len=CRYPT32_PROTECTDATA_HASH_LEN; /* allocate memory to hold a salt */ pInfo->salt.cbData=CRYPT32_PROTECTDATA_SALT_LEN;

1 0

Juan Lang : crypt32: Pass key length to CryptDeriveKey.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 8456f67a2de388b12ad86498872b3e8e24b957fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8456f67a2de388b12ad864988… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 09:14:05 2007 -0800 crypt32: Pass key length to CryptDeriveKey. --- dlls/crypt32/protectdata.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index 8940a4e..f3bac9c 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -704,7 +704,7 @@ BOOL hash_matches_blob(HCRYPTHASH hHash, const DATA_BLOB *two) /* create an encryption key from a given salt and optional entropy */ static -BOOL load_encryption_key(HCRYPTPROV hProv, const DATA_BLOB *salt, +BOOL load_encryption_key(HCRYPTPROV hProv, DWORD key_len, const DATA_BLOB *salt, const DATA_BLOB *pOptionalEntropy, HCRYPTKEY *phKey) { BOOL rc = TRUE; @@ -753,7 +753,7 @@ BOOL load_encryption_key(HCRYPTPROV hProv, const DATA_BLOB *salt, /* produce a symmetric key */ if (rc && !CryptDeriveKey(hProv,CRYPT32_PROTECTDATA_KEY_CALG, - hSaltHash,CRYPT_EXPORTABLE,phKey)) + hSaltHash,key_len << 16 | CRYPT_EXPORTABLE,phKey)) { ERR("CryptDeriveKey\n"); rc = FALSE; @@ -871,7 +871,7 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* pDataIn, } /* load key */ - if (!load_encryption_key(hProv,&protect_data.salt,pOptionalEntropy,&hKey)) + if (!load_encryption_key(hProv,protect_data.cipher_key_len,&protect_data.salt,pOptionalEntropy,&hKey)) { goto free_protect_data; } @@ -1050,7 +1050,7 @@ BOOL WINAPI CryptUnprotectData(DATA_BLOB* pDataIn, } /* load key */ - if (!load_encryption_key(hProv,&protect_data.salt,pOptionalEntropy,&hKey)) + if (!load_encryption_key(hProv,protect_data.cipher_key_len,&protect_data.salt,pOptionalEntropy,&hKey)) { goto free_context; }

1 0

Juan Lang : crypt32: Use the enhanced provider rather than the default ( base) provider.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: fd1dd39a36b244cff6e24a89d9308c82e3677940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd1dd39a36b244cff6e24a89d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 09:11:49 2007 -0800 crypt32: Use the enhanced provider rather than the default (base) provider. --- dlls/crypt32/protectdata.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index 1b59e4a..8940a4e 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -857,7 +857,7 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* pDataIn, szDataDescr = empty_str; /* get crypt context */ - if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT)) + if (!CryptAcquireContextW(&hProv,NULL,MS_ENHANCED_PROV_W,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT)) { ERR("CryptAcquireContextW failed\n"); goto finished; @@ -1043,7 +1043,7 @@ BOOL WINAPI CryptUnprotectData(DATA_BLOB* pDataIn, } /* get a crypt context */ - if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT)) + if (!CryptAcquireContextW(&hProv,NULL,MS_ENHANCED_PROV_W,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT)) { ERR("CryptAcquireContextW failed\n"); goto free_protect_data;

1 0

Juan Lang : crypt32: Use SHA1 rather than MD5 to protect data.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 11a4968734d88026836084c8bd1f1bbb08667b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a4968734d88026836084c8b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 08:54:04 2007 -0800 crypt32: Use SHA1 rather than MD5 to protect data. --- dlls/crypt32/protectdata.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index fa91a09..1b59e4a 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); #define CRYPT32_PROTECTDATA_PROV PROV_RSA_FULL -#define CRYPT32_PROTECTDATA_HASH_CALG CALG_MD5 +#define CRYPT32_PROTECTDATA_HASH_CALG CALG_SHA1 #define CRYPT32_PROTECTDATA_KEY_CALG CALG_RC2 #define CRYPT32_PROTECTDATA_SALT_LEN 16

1 0

Juan Lang : crypt32: Save alg IDs in CryptProtectData output.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: ba8d0d0237d3c2ddd66a0bf1889441b643284766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba8d0d0237d3c2ddd66a0bf18… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 08:16:31 2007 -0800 crypt32: Save alg IDs in CryptProtectData output. --- dlls/crypt32/protectdata.c | 56 ++++++++++++++++++++++---------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index 07a5e16..fa91a09 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -95,12 +95,12 @@ struct protect_data_t DATA_BLOB info1; DWORD null0; WCHAR * szDataDescr; /* serialized differently than the DATA_BLOBs */ - DWORD unknown0; /* perhaps the HASH alg const should go here? */ - DWORD unknown1; + ALG_ID cipher_alg; + DWORD cipher_key_len; DATA_BLOB data0; DWORD null1; - DWORD unknown2; /* perhaps the KEY alg const should go here? */ - DWORD unknown3; + ALG_ID hash_alg; + DWORD hash_len; DATA_BLOB salt; DATA_BLOB cipher; DATA_BLOB fingerprint; @@ -288,11 +288,11 @@ BOOL serialize(const struct protect_data_t *pInfo, DATA_BLOB *pSerial) (dwStrLen+1)*sizeof(WCHAR),sizeof(BYTE),TRUE); /*TRACE("used %u\n",ptr-pSerial->pbData);*/ - /* unknown0 */ - serialize_dword(pInfo->unknown0,&ptr); + /* cipher_alg */ + serialize_dword(pInfo->cipher_alg,&ptr); /*TRACE("used %u\n",ptr-pSerial->pbData);*/ - /* unknown1 */ - serialize_dword(pInfo->unknown1,&ptr); + /* cipher_key_len */ + serialize_dword(pInfo->cipher_key_len,&ptr); /*TRACE("used %u\n",ptr-pSerial->pbData);*/ /* data0 */ @@ -304,11 +304,11 @@ BOOL serialize(const struct protect_data_t *pInfo, DATA_BLOB *pSerial) serialize_dword(pInfo->null1,&ptr); /*TRACE("used %u\n",ptr-pSerial->pbData);*/ - /* unknown2 */ - serialize_dword(pInfo->unknown2,&ptr); + /* hash_alg */ + serialize_dword(pInfo->hash_alg,&ptr); /*TRACE("used %u\n",ptr-pSerial->pbData);*/ - /* unknown3 */ - serialize_dword(pInfo->unknown3,&ptr); + /* hash_len */ + serialize_dword(pInfo->hash_len,&ptr); /*TRACE("used %u\n",ptr-pSerial->pbData);*/ /* salt */ @@ -401,17 +401,17 @@ BOOL unserialize(const DATA_BLOB *pSerial, struct protect_data_t *pInfo) return FALSE; } - /* unknown0 */ - if (!unserialize_dword(ptr,&index,size,&pInfo->unknown0)) + /* cipher_alg */ + if (!unserialize_dword(ptr,&index,size,&pInfo->cipher_alg)) { - ERR("reading unknown0 failed!\n"); + ERR("reading cipher_alg failed!\n"); return FALSE; } - /* unknown1 */ - if (!unserialize_dword(ptr,&index,size,&pInfo->unknown1)) + /* cipher_key_len */ + if (!unserialize_dword(ptr,&index,size,&pInfo->cipher_key_len)) { - ERR("reading unknown1 failed!\n"); + ERR("reading cipher_key_len failed!\n"); return FALSE; } @@ -430,17 +430,17 @@ BOOL unserialize(const DATA_BLOB *pSerial, struct protect_data_t *pInfo) return FALSE; } - /* unknown2 */ - if (!unserialize_dword(ptr,&index,size,&pInfo->unknown2)) + /* hash_alg */ + if (!unserialize_dword(ptr,&index,size,&pInfo->hash_alg)) { - ERR("reading unknown2 failed!\n"); + ERR("reading hash_alg failed!\n"); return FALSE; } - /* unknown3 */ - if (!unserialize_dword(ptr,&index,size,&pInfo->unknown3)) + /* hash_len */ + if (!unserialize_dword(ptr,&index,size,&pInfo->hash_len)) { - ERR("reading unknown3 failed!\n"); + ERR("reading hash_len failed!\n"); return FALSE; } @@ -596,14 +596,14 @@ BOOL fill_protect_data(struct protect_data_t * pInfo, LPCWSTR szDataDescr, memcpy(pInfo->szDataDescr,szDataDescr,(dwStrLen+1)*sizeof(WCHAR)); } - pInfo->unknown0=0x0000; - pInfo->unknown1=0x0000; + pInfo->cipher_alg=CRYPT32_PROTECTDATA_KEY_CALG; + pInfo->cipher_key_len=0x0000; /* FIXME: get correct value */ convert_str_to_blob(crypt_magic_str, &pInfo->data0); pInfo->null1=0x0000; - pInfo->unknown2=0x0000; - pInfo->unknown3=0x0000; + pInfo->hash_alg=CRYPT32_PROTECTDATA_HASH_CALG; + pInfo->hash_len=0x0000; /* FIXME: get correct value */ /* allocate memory to hold a salt */ pInfo->salt.cbData=CRYPT32_PROTECTDATA_SALT_LEN;

1 0

Juan Lang : crypt32: Describe CryptProtectData data format more accurately.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 0d9a5adb0b49f2a3f01b7e22ded6fd22b483ebb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d9a5adb0b49f2a3f01b7e22d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 08:09:42 2007 -0800 crypt32: Describe CryptProtectData data format more accurately. --- dlls/crypt32/protectdata.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index 3ecd35b..07a5e16 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -61,21 +61,22 @@ static const BYTE crypt32_protectdata_secret[] = { * to be something like this: DWORD count0; - how many "info0_*[16]" blocks follow (was always 1) - BYTE info0_0[16]; - unknown information - ... + BYTE info0_0[16]; - unknown information - persistent across invocations, + ... reboots, password changes, and users DWORD count1; - how many "info1_*[16]" blocks follow (was always 1) - BYTE info1_0[16]; - unknown information - ... + BYTE info1_0[16]; - unknown information - unique to each user, but + ... persistent across reboots and password changes DWORD null0; - NULL "end of records"? - DWORD str_len; - length of WCHAR string including term - WCHAR str[str_len]; - The "dataDescription" value - DWORD unknown0; - unknown value (seems large, but only WORD large) - DWORD unknown1; - unknown value (seems small, less than a BYTE) + DWORD str_len; - byte length of WCHAR string including term + BYTE str[str_len]; - The "dataDescription" value as a NULL-terminated + little-endian WCHAR string + ALG_ID cipher_alg; - cipher algo - was CALG_3DES + DWORD cipher_key_len; - cipher key bit length - was 0xa8==168 DWORD data_len; - length of data (was 16 in samples) BYTE data[data_len]; - unknown data (fingerprint?) DWORD null1; - NULL ? - DWORD unknown2; - unknown value (seems large, but only WORD large) - DWORD unknown3; - unknown value (seems small, less than a BYTE) + ALG_ID hash_alg; - hash algo - was CALG_SHA1 + DWORD hash_len; - bit length of hash - was 0xa0==160 DWORD salt_len; - length of salt(?) data BYTE salt[salt_len]; - salt(?) for symmetric encryption DWORD cipher_len; - length of cipher(?) data - was close to plain len

1 0

Juan Lang : rsaenh: Fix a comment.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 61d58c15aaf9660f9e13f45b33a0559201f84617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d58c15aaf9660f9e13f45b3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 08:15:12 2007 -0800 rsaenh: Fix a comment. --- dlls/rsaenh/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 776c6e7..4bb64ab 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1002,7 +1002,7 @@ static BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags) * Stores key container's keys in a persistent location. * * PARAMS - * pKeyContainer [I] Pointer to the key container to be destroyed. + * pKeyContainer [I] Pointer to the key container whose keys are to be saved */ static void store_key_container_keys(KEYCONTAINER *pKeyContainer) {

1 0

Alex Villacís Lasso : user32: Fix for failing tests of LB_GETTEXT on listbox on Win98.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 188610e603ec1a9daa2229a69472fc1421c75555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=188610e603ec1a9daa2229a69… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Nov 7 10:36:53 2007 -0500 user32: Fix for failing tests of LB_GETTEXT on listbox on Win98. --- dlls/user32/tests/listbox.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 7fd5659..8009d38 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -166,15 +166,23 @@ check (const struct listbox_test test) DWORD size = SendMessage (hLB, LB_GETTEXTLEN, i, 0); CHAR *txt; WCHAR *txtw; + int resA, resW; txt = HeapAlloc (GetProcessHeap(), 0, size+1); - SendMessageA(hLB, LB_GETTEXT, i, (LPARAM)txt); + memset(txt, 0, size+1); + resA=SendMessageA(hLB, LB_GETTEXT, i, (LPARAM)txt); ok(!strcmp (txt, strings[i]), "returned string for item %d does not match %s vs %s\n", i, txt, strings[i]); txtw = HeapAlloc (GetProcessHeap(), 0, 2*size+2); - SendMessageW(hLB, LB_GETTEXT, i, (LPARAM)txtw); - WideCharToMultiByte( CP_ACP, 0, txtw, -1, txt, size, NULL, NULL ); - ok(!strcmp (txt, strings[i]), "returned string for item %d does not match %s vs %s\n", i, txt, strings[i]); + memset(txtw, 0, 2*size+2); + resW=SendMessageW(hLB, LB_GETTEXT, i, (LPARAM)txtw); + if (resA != resW) { + trace("SendMessageW(LB_GETTEXT) not supported on this platform (resA=%d resW=%d), skipping...\n", + resA, resW); + } else { + WideCharToMultiByte( CP_ACP, 0, txtw, -1, txt, size, NULL, NULL ); + ok(!strcmp (txt, strings[i]), "returned string for item %d does not match %s vs %s\n", i, txt, strings[i]); + } HeapFree (GetProcessHeap(), 0, txtw); HeapFree (GetProcessHeap(), 0, txt);

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2007