January 2009 - Wine-commits

Marcus Meissner : regedit: Check HeapAlloc results (coverity).
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 1082779ddc55cec4f1a6e076140e109baf707502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1082779ddc55cec4f1a6e0761… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jan 29 08:47:42 2009 +0100 regedit: Check HeapAlloc results (coverity). --- programs/regedit/listview.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index fb7688f..333b2a4 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -533,7 +533,12 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli max_val_size++; valName = HeapAlloc(GetProcessHeap(), 0, max_val_name_len * sizeof(WCHAR)); + if (!valName) + goto done; valBuf = HeapAlloc(GetProcessHeap(), 0, max_val_size); + if (!valBuf) + goto done; + if (RegQueryValueExW(hKey, NULL, NULL, &valType, valBuf, &valSize) == ERROR_FILE_NOT_FOUND) { AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0, !highlightValue); } @@ -545,7 +550,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli errCode = RegEnumValueW(hKey, index, valName, &valNameLen, NULL, &valType, valBuf, &valSize); if (errCode != ERROR_SUCCESS) goto done; valBuf[valSize] = 0; - if (valName && highlightValue && !lstrcmpW(valName, highlightValue)) + if (highlightValue && !lstrcmpW(valName, highlightValue)) bSelected = TRUE; AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize, bSelected); }

1 0

Juan Lang : rsaenh: Load/store key permissions along with key pair value.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 2edda7208fed36f8c46531dec1937208b18b0515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2edda7208fed36f8c46531dec… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 28 22:02:25 2009 -0800 rsaenh: Load/store key permissions along with key pair value. --- dlls/rsaenh/rsaenh.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 105 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index d1f6157..aad4adb 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -970,6 +970,62 @@ static void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec, DWOR } /****************************************************************************** + * map_key_spec_to_permissions_name [Internal] + * + * Returns the name of the registry value associated with the permissions for + * a key spec. + * + * PARAMS + * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE + * + * RETURNS + * Success: Name of registry value. + * Failure: NULL + */ +static LPCSTR map_key_spec_to_permissions_name(DWORD dwKeySpec) +{ + LPCSTR szValueName; + + switch (dwKeySpec) + { + case AT_KEYEXCHANGE: + szValueName = "KeyExchangePermissions"; + break; + case AT_SIGNATURE: + szValueName = "SignaturePermissions"; + break; + default: + WARN("invalid key spec %d\n", dwKeySpec); + szValueName = NULL; + } + return szValueName; +} + +/****************************************************************************** + * store_key_permissions [Internal] + * + * Stores a key's permissions to the registry + * + * PARAMS + * hCryptKey [I] Handle to the key whose permissions are to be stored + * hKey [I] Registry key where the key permissions are to be stored + * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE + */ +static void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec) +{ + LPCSTR szValueName; + CRYPTKEY *pKey; + + if (!(szValueName = map_key_spec_to_permissions_name(dwKeySpec))) + return; + if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY, + (OBJECTHDR**)&pKey)) + RegSetValueExA(hKey, szValueName, 0, REG_DWORD, + (BYTE *)&pKey->dwPermissions, + sizeof(pKey->dwPermissions)); +} + +/****************************************************************************** * create_container_key [Internal] * * Creates the registry key for a key container's persistent storage. @@ -1093,6 +1149,39 @@ static void store_key_container_keys(KEYCONTAINER *pKeyContainer) } /****************************************************************************** + * store_key_container_permissions [Internal] + * + * Stores key container's key permissions in a persistent location. + * + * PARAMS + * pKeyContainer [I] Pointer to the key container whose key permissions are to + * be saved + */ +static void store_key_container_permissions(KEYCONTAINER *pKeyContainer) +{ + HKEY hKey; + DWORD dwFlags; + + /* On WinXP, persistent keys are stored in a file located at: + * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string + */ + + if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) + dwFlags = CRYPTPROTECT_LOCAL_MACHINE; + else + dwFlags = 0; + + if (create_container_key(pKeyContainer, KEY_WRITE, &hKey)) + { + store_key_permissions(pKeyContainer->hKeyExchangeKeyPair, hKey, + AT_KEYEXCHANGE); + store_key_permissions(pKeyContainer->hSignatureKeyPair, hKey, + AT_SIGNATURE); + RegCloseKey(hKey); + } +} + +/****************************************************************************** * release_key_container_keys [Internal] * * Releases key container's keys. @@ -1123,6 +1212,7 @@ static void destroy_key_container(OBJECTHDR *pObjectHdr) if (!(pKeyContainer->dwFlags & CRYPT_VERIFYCONTEXT)) { store_key_container_keys(pKeyContainer); + store_key_container_permissions(pKeyContainer); release_key_container_keys(pKeyContainer); } HeapFree( GetProcessHeap(), 0, pKeyContainer ); @@ -1229,6 +1319,21 @@ static BOOL read_key_value(HCRYPTPROV hKeyContainer, HKEY hKey, DWORD dwKeySpec, HeapFree(GetProcessHeap(), 0, pbKey); } } + if (ret) + { + CRYPTKEY *pKey; + + if (lookup_handle(&handle_table, *phCryptKey, RSAENH_MAGIC_KEY, + (OBJECTHDR**)&pKey)) + { + if ((szValueName = map_key_spec_to_permissions_name(dwKeySpec))) + { + dwLen = sizeof(pKey->dwPermissions); + RegQueryValueExA(hKey, szValueName, 0, NULL, + (BYTE *)&pKey->dwPermissions, &dwLen); + } + } + } return ret; }

1 0

Juan Lang : rsaenh: Use key spec rather than char * to identify a key pair.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: bd41f77d3d0e53aaa5e6c7db05b3b4eb292d0c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd41f77d3d0e53aaa5e6c7db0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 28 22:01:11 2009 -0800 rsaenh: Use key spec rather than char * to identify a key pair. --- dlls/rsaenh/rsaenh.c | 53 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 843bb28..d1f6157 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -890,6 +890,37 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK } /****************************************************************************** + * map_key_spec_to_key_pair_name [Internal] + * + * Returns the name of the registry value associated with a key spec. + * + * PARAMS + * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE + * + * RETURNS + * Success: Name of registry value. + * Failure: NULL + */ +static LPCSTR map_key_spec_to_key_pair_name(DWORD dwKeySpec) +{ + LPCSTR szValueName; + + switch (dwKeySpec) + { + case AT_KEYEXCHANGE: + szValueName = "KeyExchangeKeyPair"; + break; + case AT_SIGNATURE: + szValueName = "SignatureKeyPair"; + break; + default: + WARN("invalid key spec %d\n", dwKeySpec); + szValueName = NULL; + } + return szValueName; +} + +/****************************************************************************** * store_key_pair [Internal] * * Stores a key pair to the registry @@ -897,16 +928,19 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK * PARAMS * hCryptKey [I] Handle to the key to be stored * hKey [I] Registry key where the key pair is to be stored - * szValueName [I] Registry value where key pair's value is to be stored + * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE * dwFlags [I] Flags for protecting the key */ -static void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, LPCSTR szValueName, DWORD dwFlags) +static void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpec, DWORD dwFlags) { + LPCSTR szValueName; DATA_BLOB blobIn, blobOut; CRYPTKEY *pKey; DWORD dwLen; BYTE *pbKey; + if (!(szValueName = map_key_spec_to_key_pair_name(dwKeySpec))) + return; if (lookup_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pKey)) { @@ -1051,9 +1085,9 @@ static void store_key_container_keys(KEYCONTAINER *pKeyContainer) if (create_container_key(pKeyContainer, KEY_WRITE, &hKey)) { store_key_pair(pKeyContainer->hKeyExchangeKeyPair, hKey, - "KeyExchangeKeyPair", dwFlags); + AT_KEYEXCHANGE, dwFlags); store_key_pair(pKeyContainer->hSignatureKeyPair, hKey, - "SignatureKeyPair", dwFlags); + AT_SIGNATURE, dwFlags); RegCloseKey(hKey); } } @@ -1158,17 +1192,20 @@ static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, const * PARAMS * hKeyContainer [I] Crypt provider to use to import the key * hKey [I] Registry key from which to read the key pair - * szValueName [I] Registry value from which to read the key pair's value + * dwKeySpec [I] AT_KEYEXCHANGE or AT_SIGNATURE * dwFlags [I] Flags for unprotecting the key * phCryptKey [O] Returned key */ -static BOOL read_key_value(HCRYPTPROV hKeyContainer, HKEY hKey, LPCSTR szValueName, DWORD dwFlags, HCRYPTKEY *phCryptKey) +static BOOL read_key_value(HCRYPTPROV hKeyContainer, HKEY hKey, DWORD dwKeySpec, DWORD dwFlags, HCRYPTKEY *phCryptKey) { + LPCSTR szValueName; DWORD dwValueType, dwLen; BYTE *pbKey; DATA_BLOB blobIn, blobOut; BOOL ret = FALSE; + if (!(szValueName = map_key_spec_to_key_pair_name(dwKeySpec))) + return FALSE; if (RegQueryValueExA(hKey, szValueName, 0, &dwValueType, NULL, &dwLen) == ERROR_SUCCESS) { @@ -1232,10 +1269,10 @@ static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, cons (OBJECTHDR**)&pKeyContainer)) return (HCRYPTPROV)INVALID_HANDLE_VALUE; - if (read_key_value(hKeyContainer, hKey, "KeyExchangeKeyPair", + if (read_key_value(hKeyContainer, hKey, AT_KEYEXCHANGE, dwProtectFlags, &hCryptKey)) pKeyContainer->hKeyExchangeKeyPair = hCryptKey; - if (read_key_value(hKeyContainer, hKey, "SignatureKeyPair", + if (read_key_value(hKeyContainer, hKey, AT_SIGNATURE, dwProtectFlags, &hCryptKey)) pKeyContainer->hSignatureKeyPair = hCryptKey; }

1 0

Juan Lang : rsaenh: Don't store a key to the registry when it' s being read from the registry.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: fbc26f3855ad3b9235b22d0a9b5a0a25cc150f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc26f3855ad3b9235b22d0a9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 28 21:49:31 2009 -0800 rsaenh: Don't store a key to the registry when it's being read from the registry. --- dlls/rsaenh/rsaenh.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index c94603a..843bb28 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -321,13 +321,13 @@ static BOOL crypt_export_key( DWORD *pdwDataLen ); -BOOL WINAPI -RSAENH_CPImportKey( +static BOOL import_key( HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, + BOOL fStoreKey, HCRYPTKEY *phKey ); @@ -1184,8 +1184,8 @@ static BOOL read_key_value(HCRYPTPROV hKeyContainer, HKEY hKey, LPCSTR szValueNa if (CryptUnprotectData(&blobIn, NULL, NULL, NULL, NULL, dwFlags, &blobOut)) { - ret = RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, - phCryptKey); + ret = import_key(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, + FALSE, phCryptKey); LocalFree(blobOut.pbData); } }

1 0

Juan Lang : rsaenh: Split CPImportKey into a helper function for each type of key supported.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 17da3004ef5b4c859dc540db916e22aa8ed7b4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17da3004ef5b4c859dc540db9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 28 21:47:53 2009 -0800 rsaenh: Split CPImportKey into a helper function for each type of key supported. --- dlls/rsaenh/rsaenh.c | 328 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 219 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17da3004ef5b4c859dc54…

1 0

Juan Lang : rsaenh: Store a key' s value to the registry when a key is imported.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 4eb1ee42776de6f76454f16095ce97e24828ba1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb1ee42776de6f76454f1609… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 28 21:48:45 2009 -0800 rsaenh: Store a key's value to the registry when a key is imported. --- dlls/rsaenh/rsaenh.c | 77 +++++++++++++++++++++++++++++++++++-------- dlls/rsaenh/tests/rsaenh.c | 1 - 2 files changed, 62 insertions(+), 16 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 5da95bd..c94603a 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2451,12 +2451,21 @@ BOOL WINAPI RSAENH_CPExportKey(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTKEY hPubK * hProv [I] Key container into which the key is to be imported. * src [I] Key which will replace *dest * dest [I] Points to key to be released and replaced with src + * fStoreKey [I] If TRUE, the newly installed key is stored to the registry. */ static void release_and_install_key(HCRYPTPROV hProv, HCRYPTKEY src, - HCRYPTKEY *dest) + HCRYPTKEY *dest, DWORD fStoreKey) { RSAENH_CPDestroyKey(hProv, *dest); copy_handle(&handle_table, src, RSAENH_MAGIC_KEY, dest); + if (fStoreKey) + { + KEYCONTAINER *pKeyContainer; + + if (lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, + (OBJECTHDR**)&pKeyContainer)) + store_key_container_keys(pKeyContainer); + } } /****************************************************************************** @@ -2470,6 +2479,7 @@ static void release_and_install_key(HCRYPTPROV hProv, HCRYPTKEY src, * dwDataLen [I] Length of data in buffer at pbData. * dwFlags [I] One of: * CRYPT_EXPORTABLE: the imported key is marked exportable + * fStoreKey [I] If TRUE, the imported key is stored to the registry. * phKey [O] Handle to the imported key. * * @@ -2482,7 +2492,7 @@ static void release_and_install_key(HCRYPTPROV hProv, HCRYPTKEY src, * Failure: FALSE. */ static BOOL import_private_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, - DWORD dwFlags, HCRYPTKEY *phKey) + DWORD dwFlags, BOOL fStoreKey, HCRYPTKEY *phKey) { KEYCONTAINER *pKeyContainer; CRYPTKEY *pCryptKey; @@ -2519,12 +2529,14 @@ static BOOL import_private_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat case AT_SIGNATURE: case CALG_RSA_SIGN: TRACE("installing signing key\n"); - release_and_install_key(hProv, *phKey, &pKeyContainer->hSignatureKeyPair); + release_and_install_key(hProv, *phKey, &pKeyContainer->hSignatureKeyPair, + fStoreKey); break; case AT_KEYEXCHANGE: case CALG_RSA_KEYX: TRACE("installing key exchange key\n"); - release_and_install_key(hProv, *phKey, &pKeyContainer->hKeyExchangeKeyPair); + release_and_install_key(hProv, *phKey, &pKeyContainer->hKeyExchangeKeyPair, + fStoreKey); break; } } @@ -2542,6 +2554,7 @@ static BOOL import_private_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat * dwDataLen [I] Length of data in buffer at pbData. * dwFlags [I] One of: * CRYPT_EXPORTABLE: the imported key is marked exportable + * fStoreKey [I] If TRUE, the imported key is stored to the registry. * phKey [O] Handle to the imported key. * * @@ -2554,7 +2567,7 @@ static BOOL import_private_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat * Failure: FALSE. */ static BOOL import_public_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, - DWORD dwFlags, HCRYPTKEY *phKey) + DWORD dwFlags, BOOL fStoreKey, HCRYPTKEY *phKey) { KEYCONTAINER *pKeyContainer; CRYPTKEY *pCryptKey; @@ -2595,7 +2608,8 @@ static BOOL import_public_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwData case AT_KEYEXCHANGE: case CALG_RSA_KEYX: TRACE("installing public key\n"); - release_and_install_key(hProv, *phKey, &pKeyContainer->hKeyExchangeKeyPair); + release_and_install_key(hProv, *phKey, &pKeyContainer->hKeyExchangeKeyPair, + fStoreKey); break; } } @@ -2675,9 +2689,10 @@ static BOOL import_symmetric_key(HCRYPTPROV hProv, CONST BYTE *pbData, } /****************************************************************************** - * CPImportKey (RSAENH.@) + * import_key [Internal] * - * Import a BLOB'ed key into a key container. + * Import a BLOB'ed key into a key container, optionally storing the key's + * value to the registry. * * PARAMS * hProv [I] Key container into which the key is to be imported. @@ -2686,21 +2701,20 @@ static BOOL import_symmetric_key(HCRYPTPROV hProv, CONST BYTE *pbData, * hPubKey [I] Key used to decrypt sensitive BLOB data. * dwFlags [I] One of: * CRYPT_EXPORTABLE: the imported key is marked exportable + * fStoreKey [I] If TRUE, the imported key is stored to the registry. * phKey [O] Handle to the imported key. * * RETURNS * Success: TRUE. * Failure: FALSE. */ -BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, - HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey) +static BOOL import_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, + HCRYPTKEY hPubKey, DWORD dwFlags, BOOL fStoreKey, + HCRYPTKEY *phKey) { KEYCONTAINER *pKeyContainer; CONST BLOBHEADER *pBlobHeader = (CONST BLOBHEADER*)pbData; - TRACE("(hProv=%08lx, pbData=%p, dwDataLen=%d, hPubKey=%08lx, dwFlags=%08x, phKey=%p)\n", - hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); - if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR**)&pKeyContainer)) { @@ -2716,13 +2730,19 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat return FALSE; } + /* If this is a verify-only context, the key is not persisted regardless of + * fStoreKey's original value. + */ + fStoreKey = fStoreKey && !(dwFlags & CRYPT_VERIFYCONTEXT); switch (pBlobHeader->bType) { case PRIVATEKEYBLOB: - return import_private_key(hProv, pbData, dwDataLen, dwFlags, phKey); + return import_private_key(hProv, pbData, dwDataLen, dwFlags, + fStoreKey, phKey); case PUBLICKEYBLOB: - return import_public_key(hProv, pbData, dwDataLen, dwFlags, phKey); + return import_public_key(hProv, pbData, dwDataLen, dwFlags, + fStoreKey, phKey); case SIMPLEBLOB: return import_symmetric_key(hProv, pbData, dwDataLen, hPubKey, @@ -2735,6 +2755,33 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat } /****************************************************************************** + * CPImportKey (RSAENH.@) + * + * Import a BLOB'ed key into a key container. + * + * PARAMS + * hProv [I] Key container into which the key is to be imported. + * pbData [I] Pointer to a buffer which holds the BLOB. + * dwDataLen [I] Length of data in buffer at pbData. + * hPubKey [I] Key used to decrypt sensitive BLOB data. + * dwFlags [I] One of: + * CRYPT_EXPORTABLE: the imported key is marked exportable + * phKey [O] Handle to the imported key. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. + */ +BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, + HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey) +{ + TRACE("(hProv=%08lx, pbData=%p, dwDataLen=%d, hPubKey=%08lx, dwFlags=%08x, phKey=%p)\n", + hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); + + return import_key(hProv, pbData, dwDataLen, hPubKey, dwFlags, TRUE, phKey); +} + +/****************************************************************************** * CPGenKey (RSAENH.@) * * Generate a key in the key container diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 4f1899e..5d58222 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2233,7 +2233,6 @@ static void test_key_initialization(void) result = CryptAcquireContext(&prov2, szContainer, szProvider, PROV_RSA_FULL, 0); ok(result, "%08x\n", GetLastError()); result = CryptGetUserKey(prov2, AT_KEYEXCHANGE, &hKey); - todo_wine ok(result, "%08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); CryptReleaseContext(prov2, 0);

1 0

Juan Lang : rsaenh: Separate storing a key container' s keys from releasing them.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 8f4a491489e0280d5bdab36bc4c14012bc4bfebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f4a491489e0280d5bdab36bc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 28 21:44:11 2009 -0800 rsaenh: Separate storing a key container's keys from releasing them. --- dlls/rsaenh/rsaenh.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 059dad2..4dc8aa6 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -932,7 +932,6 @@ static void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, LPCSTR szValueName, D HeapFree(GetProcessHeap(), 0, pbKey); } } - release_handle(&handle_table, hCryptKey, RSAENH_MAGIC_KEY); } } @@ -1060,6 +1059,22 @@ static void store_key_container_keys(KEYCONTAINER *pKeyContainer) } /****************************************************************************** + * release_key_container_keys [Internal] + * + * Releases key container's keys. + * + * PARAMS + * pKeyContainer [I] Pointer to the key container whose keys are to be released. + */ +static void release_key_container_keys(KEYCONTAINER *pKeyContainer) +{ + release_handle(&handle_table, pKeyContainer->hKeyExchangeKeyPair, + RSAENH_MAGIC_KEY); + release_handle(&handle_table, pKeyContainer->hSignatureKeyPair, + RSAENH_MAGIC_KEY); +} + +/****************************************************************************** * destroy_key_container [Internal] * * Destructor for key containers. @@ -1072,7 +1087,10 @@ static void destroy_key_container(OBJECTHDR *pObjectHdr) KEYCONTAINER *pKeyContainer = (KEYCONTAINER*)pObjectHdr; if (!(pKeyContainer->dwFlags & CRYPT_VERIFYCONTEXT)) + { store_key_container_keys(pKeyContainer); + release_key_container_keys(pKeyContainer); + } HeapFree( GetProcessHeap(), 0, pKeyContainer ); }

1 0

Juan Lang : rsaenh: Use helper function to install keys.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 30764edd12716a425621862e39c4b061e0dd6bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=30764edd12716a425621862e3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 28 21:45:12 2009 -0800 rsaenh: Use helper function to install keys. --- dlls/rsaenh/rsaenh.c | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 4dc8aa6..c775082 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2443,6 +2443,23 @@ BOOL WINAPI RSAENH_CPExportKey(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTKEY hPubK } /****************************************************************************** + * release_and_install_key [Internal] + * + * Release an existing key, if present, and replaces it with a new one. + * + * PARAMS + * hProv [I] Key container into which the key is to be imported. + * src [I] Key which will replace *dest + * dest [I] Points to key to be released and replaced with src + */ +static void release_and_install_key(HCRYPTPROV hProv, HCRYPTKEY src, + HCRYPTKEY *dest) +{ + RSAENH_CPDestroyKey(hProv, *dest); + copy_handle(&handle_table, src, RSAENH_MAGIC_KEY, dest); +} + +/****************************************************************************** * CPImportKey (RSAENH.@) * * Import a BLOB'ed key into a key container. @@ -2517,16 +2534,14 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat case AT_SIGNATURE: case CALG_RSA_SIGN: TRACE("installing signing key\n"); - RSAENH_CPDestroyKey(hProv, pKeyContainer->hSignatureKeyPair); - copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, - &pKeyContainer->hSignatureKeyPair); + release_and_install_key(hProv, *phKey, + &pKeyContainer->hSignatureKeyPair); break; case AT_KEYEXCHANGE: case CALG_RSA_KEYX: TRACE("installing key exchange key\n"); - RSAENH_CPDestroyKey(hProv, pKeyContainer->hKeyExchangeKeyPair); - copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, - &pKeyContainer->hKeyExchangeKeyPair); + release_and_install_key(hProv, *phKey, + &pKeyContainer->hKeyExchangeKeyPair); break; } } @@ -2558,9 +2573,8 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat case AT_KEYEXCHANGE: case CALG_RSA_KEYX: TRACE("installing public key\n"); - RSAENH_CPDestroyKey(hProv, pKeyContainer->hKeyExchangeKeyPair); - copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, - &pKeyContainer->hKeyExchangeKeyPair); + release_and_install_key(hProv, *phKey, + &pKeyContainer->hKeyExchangeKeyPair); break; } }

1 0

Juan Lang : rsaenh: Add a test for importing a key into a container and acquiring a container with the same name before the original container is released .
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 21a3ae0b7c94ae565a17e8aa4a884f47a247796e URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a3ae0b7c94ae565a17e8aa4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 28 21:41:53 2009 -0800 rsaenh: Add a test for importing a key into a container and acquiring a container with the same name before the original container is released. --- dlls/rsaenh/tests/rsaenh.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 57ca35f..4f1899e 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2184,6 +2184,67 @@ static void test_key_permissions(void) clean_up_base_environment(); } +static void test_key_initialization(void) +{ + DWORD dwLen; + HCRYPTPROV prov1, prov2; + HCRYPTKEY hKeyExchangeKey, hSessionKey, hKey; + BOOL result; + static BYTE abSessionKey[148] = { + 0x01, 0x02, 0x00, 0x00, 0x01, 0x68, 0x00, 0x00, + 0x00, 0xa4, 0x00, 0x00, 0xb8, 0xa4, 0xdf, 0x5e, + 0x9e, 0xb1, 0xbf, 0x85, 0x3d, 0x24, 0x2d, 0x1e, + 0x69, 0xb7, 0x67, 0x13, 0x8e, 0x78, 0xf2, 0xdf, + 0xc6, 0x69, 0xce, 0x46, 0x7e, 0xf2, 0xf2, 0x33, + 0x20, 0x6f, 0xa1, 0xa5, 0x59, 0x83, 0x25, 0xcb, + 0x3a, 0xb1, 0x8a, 0x12, 0x63, 0x02, 0x3c, 0xfb, + 0x4a, 0xfa, 0xef, 0x8e, 0xf7, 0x29, 0x57, 0xb1, + 0x9e, 0xa7, 0xf3, 0x02, 0xfd, 0xca, 0xdf, 0x5a, + 0x1f, 0x71, 0xb6, 0x26, 0x09, 0x24, 0x39, 0xda, + 0xc0, 0xde, 0x2a, 0x0e, 0xcd, 0x1f, 0xe5, 0xb6, + 0x4f, 0x82, 0xa0, 0xa9, 0x90, 0xd3, 0xd9, 0x6a, + 0x43, 0x14, 0x2a, 0xf7, 0xac, 0xd5, 0xa0, 0x54, + 0x93, 0xc4, 0xb9, 0xe7, 0x24, 0x84, 0x4d, 0x69, + 0x5e, 0xcc, 0x2a, 0x32, 0xb5, 0xfb, 0xe4, 0xb4, + 0x08, 0xd5, 0x36, 0x58, 0x59, 0x40, 0xfb, 0x29, + 0x7f, 0xa7, 0x17, 0x25, 0xc4, 0x0d, 0x78, 0x37, + 0x04, 0x8c, 0x49, 0x92 + }; + + /* Like init_base_environment, but doesn't generate new keys, as they'll + * be imported instead. + */ + if (!CryptAcquireContext(&prov1, szContainer, szProvider, PROV_RSA_FULL, 0)) + { + result = CryptAcquireContext(&prov1, szContainer, szProvider, PROV_RSA_FULL, + CRYPT_NEWKEYSET); + ok(result, "%08x\n", GetLastError()); + } + dwLen = (DWORD)sizeof(abPlainPrivateKey); + result = CryptImportKey(prov1, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey); + + dwLen = (DWORD)sizeof(abSessionKey); + result = CryptImportKey(prov1, abSessionKey, dwLen, hKeyExchangeKey, 0, &hSessionKey); + ok(result, "%08x\n", GetLastError()); + + /* Once the key has been imported, subsequently acquiring a context with + * the same name will allow retrieving the key. + */ + result = CryptAcquireContext(&prov2, szContainer, szProvider, PROV_RSA_FULL, 0); + ok(result, "%08x\n", GetLastError()); + result = CryptGetUserKey(prov2, AT_KEYEXCHANGE, &hKey); + todo_wine + ok(result, "%08x\n", GetLastError()); + if (result) CryptDestroyKey(hKey); + CryptReleaseContext(prov2, 0); + + CryptDestroyKey(hSessionKey); + CryptDestroyKey(hKeyExchangeKey); + CryptReleaseContext(prov1, 0); + CryptAcquireContext(&prov1, szContainer, NULL, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); +} + START_TEST(rsaenh) { if (!init_base_environment(0)) @@ -2206,6 +2267,7 @@ START_TEST(rsaenh) test_enum_container(); clean_up_base_environment(); test_key_permissions(); + test_key_initialization(); test_schannel_provider(); test_null_provider(); if (!init_aes_environment())

1 0

Juan Lang : rsaenh: Split CPExportKey into helper functions for each export type.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 8265569e997ae78835afc4725d015d132587e2b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8265569e997ae78835afc4725… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 28 20:52:22 2009 -0800 rsaenh: Split CPExportKey into helper functions for each export type. --- dlls/rsaenh/rsaenh.c | 203 ++++++++++++++++++++++++++++---------------------- 1 files changed, 114 insertions(+), 89 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index bbccac7..cccbcf3 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2207,6 +2207,117 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, return TRUE; } +static BOOL crypt_export_simple(CRYPTKEY *pCryptKey, CRYPTKEY *pPubKey, + DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen) +{ + BLOBHEADER *pBlobHeader = (BLOBHEADER*)pbData; + ALG_ID *pAlgid = (ALG_ID*)(pBlobHeader+1); + DWORD dwDataLen; + + if (!(GET_ALG_CLASS(pCryptKey->aiAlgid)&(ALG_CLASS_DATA_ENCRYPT|ALG_CLASS_MSG_ENCRYPT))) { + SetLastError(NTE_BAD_KEY); /* FIXME: error code? */ + return FALSE; + } + + dwDataLen = sizeof(BLOBHEADER) + sizeof(ALG_ID) + pPubKey->dwBlockLen; + if (pbData) { + if (*pdwDataLen < dwDataLen) { + SetLastError(ERROR_MORE_DATA); + *pdwDataLen = dwDataLen; + return FALSE; + } + + pBlobHeader->bType = SIMPLEBLOB; + pBlobHeader->bVersion = CUR_BLOB_VERSION; + pBlobHeader->reserved = 0; + pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; + + *pAlgid = pPubKey->aiAlgid; + + if (!pad_data(pCryptKey->abKeyValue, pCryptKey->dwKeyLen, (BYTE*)(pAlgid+1), + pPubKey->dwBlockLen, dwFlags)) + { + return FALSE; + } + + encrypt_block_impl(pPubKey->aiAlgid, PK_PUBLIC, &pPubKey->context, (BYTE*)(pAlgid+1), + (BYTE*)(pAlgid+1), RSAENH_ENCRYPT); + } + *pdwDataLen = dwDataLen; + return TRUE; +} + +static BOOL crypt_export_public_key(CRYPTKEY *pCryptKey, BYTE *pbData, + DWORD *pdwDataLen) +{ + BLOBHEADER *pBlobHeader = (BLOBHEADER*)pbData; + RSAPUBKEY *pRSAPubKey = (RSAPUBKEY*)(pBlobHeader+1); + DWORD dwDataLen; + + if ((pCryptKey->aiAlgid != CALG_RSA_KEYX) && (pCryptKey->aiAlgid != CALG_RSA_SIGN)) { + SetLastError(NTE_BAD_KEY); + return FALSE; + } + + dwDataLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + pCryptKey->dwKeyLen; + if (pbData) { + if (*pdwDataLen < dwDataLen) { + SetLastError(ERROR_MORE_DATA); + *pdwDataLen = dwDataLen; + return FALSE; + } + + pBlobHeader->bType = PUBLICKEYBLOB; + pBlobHeader->bVersion = CUR_BLOB_VERSION; + pBlobHeader->reserved = 0; + pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; + + pRSAPubKey->magic = RSAENH_MAGIC_RSA1; + pRSAPubKey->bitlen = pCryptKey->dwKeyLen << 3; + + export_public_key_impl((BYTE*)(pRSAPubKey+1), &pCryptKey->context, + pCryptKey->dwKeyLen, &pRSAPubKey->pubexp); + } + *pdwDataLen = dwDataLen; + return TRUE; +} + +static BOOL crypt_export_private_key(CRYPTKEY *pCryptKey, BYTE *pbData, + DWORD *pdwDataLen) +{ + BLOBHEADER *pBlobHeader = (BLOBHEADER*)pbData; + RSAPUBKEY *pRSAPubKey = (RSAPUBKEY*)(pBlobHeader+1); + DWORD dwDataLen; + + if ((pCryptKey->aiAlgid != CALG_RSA_KEYX) && (pCryptKey->aiAlgid != CALG_RSA_SIGN)) { + SetLastError(NTE_BAD_KEY); + return FALSE; + } + + dwDataLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + 2 * pCryptKey->dwKeyLen + 5 * ((pCryptKey->dwKeyLen + 1) >> 1); + if (pbData) { + if (*pdwDataLen < dwDataLen) { + SetLastError(ERROR_MORE_DATA); + *pdwDataLen = dwDataLen; + return FALSE; + } + + pBlobHeader->bType = PRIVATEKEYBLOB; + pBlobHeader->bVersion = CUR_BLOB_VERSION; + pBlobHeader->reserved = 0; + pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; + + pRSAPubKey->magic = RSAENH_MAGIC_RSA2; + pRSAPubKey->bitlen = pCryptKey->dwKeyLen << 3; + + export_private_key_impl((BYTE*)(pRSAPubKey+1), &pCryptKey->context, + pCryptKey->dwKeyLen, &pRSAPubKey->pubexp); + } + *pdwDataLen = dwDataLen; + return TRUE; +} + /****************************************************************************** * CPExportKey (RSAENH.@) * @@ -2229,10 +2340,6 @@ BOOL WINAPI RSAENH_CPExportKey(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTKEY hPubK DWORD dwBlobType, DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen) { CRYPTKEY *pCryptKey, *pPubKey; - BLOBHEADER *pBlobHeader = (BLOBHEADER*)pbData; - RSAPUBKEY *pRSAPubKey = (RSAPUBKEY*)(pBlobHeader+1); - ALG_ID *pAlgid = (ALG_ID*)(pBlobHeader+1); - DWORD dwDataLen; TRACE("(hProv=%08lx, hKey=%08lx, hPubKey=%08lx, dwBlobType=%08x, dwFlags=%08x, pbData=%p," "pdwDataLen=%p)\n", hProv, hKey, hPubKey, dwBlobType, dwFlags, pbData, pdwDataLen); @@ -2263,38 +2370,7 @@ BOOL WINAPI RSAENH_CPExportKey(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTKEY hPubK SetLastError(NTE_BAD_PUBLIC_KEY); /* FIXME: error_code? */ return FALSE; } - - if (!(GET_ALG_CLASS(pCryptKey->aiAlgid)&(ALG_CLASS_DATA_ENCRYPT|ALG_CLASS_MSG_ENCRYPT))) { - SetLastError(NTE_BAD_KEY); /* FIXME: error code? */ - return FALSE; - } - - dwDataLen = sizeof(BLOBHEADER) + sizeof(ALG_ID) + pPubKey->dwBlockLen; - if (pbData) { - if (*pdwDataLen < dwDataLen) { - SetLastError(ERROR_MORE_DATA); - *pdwDataLen = dwDataLen; - return FALSE; - } - - pBlobHeader->bType = SIMPLEBLOB; - pBlobHeader->bVersion = CUR_BLOB_VERSION; - pBlobHeader->reserved = 0; - pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; - - *pAlgid = pPubKey->aiAlgid; - - if (!pad_data(pCryptKey->abKeyValue, pCryptKey->dwKeyLen, (BYTE*)(pAlgid+1), - pPubKey->dwBlockLen, dwFlags)) - { - return FALSE; - } - - encrypt_block_impl(pPubKey->aiAlgid, PK_PUBLIC, &pPubKey->context, (BYTE*)(pAlgid+1), - (BYTE*)(pAlgid+1), RSAENH_ENCRYPT); - } - *pdwDataLen = dwDataLen; - return TRUE; + return crypt_export_simple(pCryptKey, pPubKey, dwFlags, pbData, pdwDataLen); case PUBLICKEYBLOB: if (is_valid_handle(&handle_table, hPubKey, RSAENH_MAGIC_KEY)) { @@ -2302,61 +2378,10 @@ BOOL WINAPI RSAENH_CPExportKey(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTKEY hPubK return FALSE; } - if ((pCryptKey->aiAlgid != CALG_RSA_KEYX) && (pCryptKey->aiAlgid != CALG_RSA_SIGN)) { - SetLastError(NTE_BAD_KEY); - return FALSE; - } - - dwDataLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + pCryptKey->dwKeyLen; - if (pbData) { - if (*pdwDataLen < dwDataLen) { - SetLastError(ERROR_MORE_DATA); - *pdwDataLen = dwDataLen; - return FALSE; - } - - pBlobHeader->bType = PUBLICKEYBLOB; - pBlobHeader->bVersion = CUR_BLOB_VERSION; - pBlobHeader->reserved = 0; - pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; - - pRSAPubKey->magic = RSAENH_MAGIC_RSA1; - pRSAPubKey->bitlen = pCryptKey->dwKeyLen << 3; - - export_public_key_impl((BYTE*)(pRSAPubKey+1), &pCryptKey->context, - pCryptKey->dwKeyLen, &pRSAPubKey->pubexp); - } - *pdwDataLen = dwDataLen; - return TRUE; + return crypt_export_public_key(pCryptKey, pbData, pdwDataLen); case PRIVATEKEYBLOB: - if ((pCryptKey->aiAlgid != CALG_RSA_KEYX) && (pCryptKey->aiAlgid != CALG_RSA_SIGN)) { - SetLastError(NTE_BAD_KEY); - return FALSE; - } - - dwDataLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + - 2 * pCryptKey->dwKeyLen + 5 * ((pCryptKey->dwKeyLen + 1) >> 1); - if (pbData) { - if (*pdwDataLen < dwDataLen) { - SetLastError(ERROR_MORE_DATA); - *pdwDataLen = dwDataLen; - return FALSE; - } - - pBlobHeader->bType = PRIVATEKEYBLOB; - pBlobHeader->bVersion = CUR_BLOB_VERSION; - pBlobHeader->reserved = 0; - pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; - - pRSAPubKey->magic = RSAENH_MAGIC_RSA2; - pRSAPubKey->bitlen = pCryptKey->dwKeyLen << 3; - - export_private_key_impl((BYTE*)(pRSAPubKey+1), &pCryptKey->context, - pCryptKey->dwKeyLen, &pRSAPubKey->pubexp); - } - *pdwDataLen = dwDataLen; - return TRUE; + return crypt_export_private_key(pCryptKey, pbData, pdwDataLen); default: SetLastError(NTE_BAD_TYPE); /* FIXME: error code? */

1 0