ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added support for machine keysets.

This commit is contained in:
Michael Jung 2005-01-04 11:49:55 +00:00 committed by Alexandre Julliard
parent dee74a6ec9
commit 2032284035
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/rsaenh/rsaenh.c
View File

@ -691,7 +691,7 @@ static void destroy_key_container(OBJECTHDR *pObjectHdr)
KEYCONTAINER *pKeyContainer = (KEYCONTAINER*)pObjectHdr; KEYCONTAINER *pKeyContainer = (KEYCONTAINER*)pObjectHdr;
CRYPTKEY *pKey; CRYPTKEY *pKey;
CHAR szRSABase[MAX_PATH]; CHAR szRSABase[MAX_PATH];
HKEY hKey; HKEY hKey, hRootKey;
DWORD dwLen; DWORD dwLen;
BYTE *pbKey; BYTE *pbKey;
@ -701,7 +701,13 @@ static void destroy_key_container(OBJECTHDR *pObjectHdr)
*/ */
sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName); sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName);
if (RegCreateKeyExA(HKEY_CURRENT_USER, szRSABase, 0, NULL, REG_OPTION_NON_VOLATILE, if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) {
hRootKey = HKEY_LOCAL_MACHINE;
} else {
hRootKey = HKEY_CURRENT_USER;
}
if (RegCreateKeyExA(hRootKey, szRSABase, 0, NULL, REG_OPTION_NON_VOLATILE,
KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS)
{ {
if (lookup_handle(&handle_table, pKeyContainer->hKeyExchangeKeyPair, RSAENH_MAGIC_KEY, if (lookup_handle(&handle_table, pKeyContainer->hKeyExchangeKeyPair, RSAENH_MAGIC_KEY,
@ -816,14 +822,20 @@ static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, PVTa
{ {
CHAR szRSABase[MAX_PATH]; CHAR szRSABase[MAX_PATH];
BYTE *pbKey; BYTE *pbKey;
HKEY hKey; HKEY hKey, hRootKey;
DWORD dwValueType, dwLen; DWORD dwValueType, dwLen;
KEYCONTAINER *pKeyContainer; KEYCONTAINER *pKeyContainer;
HCRYPTPROV hKeyContainer; HCRYPTPROV hKeyContainer;
sprintf(szRSABase, RSAENH_REGKEY, pszContainerName); sprintf(szRSABase, RSAENH_REGKEY, pszContainerName);
if (RegOpenKeyExA(HKEY_CURRENT_USER, szRSABase, 0, KEY_READ, &hKey) != ERROR_SUCCESS) if (dwFlags & CRYPT_MACHINE_KEYSET) {
hRootKey = HKEY_LOCAL_MACHINE;
} else {
hRootKey = HKEY_CURRENT_USER;
}
if (RegOpenKeyExA(hRootKey, szRSABase, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
{ {
SetLastError(NTE_BAD_KEYSET); SetLastError(NTE_BAD_KEYSET);
return (HCRYPTPROV)INVALID_HANDLE_VALUE; return (HCRYPTPROV)INVALID_HANDLE_VALUE;