Juan Lang : rsaenh: Honor the CRYPT_EXPORTABLE flag to CryptAcquireContext and CryptGenKey.
Alexandre Julliard
julliard at winehq.org
Thu Jan 29 09:14:55 CST 2009
Module: wine
Branch: master
Commit: 1cc58867712c06226b55784ffaeec5b4ab4391e3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc58867712c06226b55784ffaeec5b4ab4391e3
Author: Juan Lang <juan.lang at gmail.com>
Date: Wed Jan 28 20:21:20 2009 -0800
rsaenh: Honor the CRYPT_EXPORTABLE flag to CryptAcquireContext and CryptGenKey.
---
dlls/rsaenh/rsaenh.c | 5 ++++-
dlls/rsaenh/tests/rsaenh.c | 1 -
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index 25e21d5..28603c6 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -755,7 +755,8 @@ static inline void setup_key(CRYPTKEY *pCryptKey) {
* hProv [I] Handle to the provider to which the created key will belong.
* aiAlgid [I] The new key shall use the crypto algorithm idenfied by aiAlgid.
* dwFlags [I] Upper 16 bits give the key length.
- * Lower 16 bits: CRYPT_CREATE_SALT, CRYPT_NO_SALT
+ * Lower 16 bits: CRYPT_EXPORTABLE, CRYPT_CREATE_SALT,
+ * CRYPT_NO_SALT
* ppCryptKey [O] Pointer to the created key
*
* RETURNS
@@ -836,6 +837,8 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK
pCryptKey->dwModeBits = 0;
pCryptKey->dwPermissions = CRYPT_ENCRYPT | CRYPT_DECRYPT | CRYPT_READ | CRYPT_WRITE |
CRYPT_MAC;
+ if (dwFlags & CRYPT_EXPORTABLE)
+ pCryptKey->dwPermissions |= CRYPT_EXPORT;
pCryptKey->dwKeyLen = dwKeyLen >> 3;
pCryptKey->dwEffectiveKeyLen = 0;
if ((dwFlags & CRYPT_CREATE_SALT) || (dwKeyLen == 40 && !(dwFlags & CRYPT_NO_SALT)))
diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c
index 43d35a3..83aad70 100644
--- a/dlls/rsaenh/tests/rsaenh.c
+++ b/dlls/rsaenh/tests/rsaenh.c
@@ -2137,7 +2137,6 @@ static void test_key_permissions(void)
dwLen = sizeof(DWORD);
result = CryptGetKeyParam(hKey1, KP_PERMISSIONS, (BYTE*)&dwVal, &dwLen, 0);
ok(result, "%08x\n", GetLastError());
- todo_wine
ok(dwVal ==
(CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT),
"expected CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT,"
More information about the wine-cvs
mailing list