[ros-diffs] [akhaldi] 74843: [RSAENH] Sync with Wine Staging 2.9. CORE-13362 e705dfc rsaenh: Don't import a public key to a key container.

Author: akhaldi
Date: Sat Jun  3 22:38:03 2017
New Revision: 74843

URL: http://svn.reactos.org/svn/reactos?rev=74843&view=rev
Log:
[RSAENH] Sync with Wine Staging 2.9. CORE-13362

e705dfc rsaenh: Don't import a public key to a key container.

Modified:
    trunk/reactos/dll/win32/rsaenh/rsaenh.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.c?…
==============================================================================
--- trunk/reactos/dll/win32/rsaenh/rsaenh.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rsaenh/rsaenh.c	[iso-8859-1] Sat Jun  3 22:38:03 2017
@@ -2826,15 +2826,14 @@
 /******************************************************************************
  * import_public_key [Internal]
  *
- * Import a BLOB'ed public key into a key container.
- *
- * PARAMS
- *  hProv     [I] Key container into which the public key is to be imported.
+ * Import a BLOB'ed public key.
+ *
+ * PARAMS
+ *  hProv     [I] A CSP.
  *  pbData    [I] Pointer to a buffer which holds the public key BLOB.
  *  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.
  *
  *
@@ -2847,9 +2846,8 @@
  *  Failure: FALSE.
  */
 static BOOL import_public_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen,
-                              DWORD dwFlags, BOOL fStoreKey, HCRYPTKEY *phKey)
-{
-    KEYCONTAINER *pKeyContainer;
+                              DWORD dwFlags, HCRYPTKEY *phKey)
+{
     CRYPTKEY *pCryptKey;
     const BLOBHEADER *pBlobHeader = (const BLOBHEADER*)pbData;
     const RSAPUBKEY *pRSAPubKey = (const RSAPUBKEY*)(pBlobHeader+1);
@@ -2862,8 +2860,6 @@
         SetLastError(NTE_BAD_FLAGS);
         return FALSE;
     }
-    if (!(pKeyContainer = get_key_container(hProv)))
-        return FALSE;
 
     if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY)) ||
         (pRSAPubKey->magic != RSAENH_MAGIC_RSA1) ||
@@ -2885,15 +2881,6 @@
     if (ret) {
         if (dwFlags & CRYPT_EXPORTABLE)
             pCryptKey->dwPermissions |= CRYPT_EXPORT;
-        switch (pBlobHeader->aiKeyAlg)
-        {
-        case AT_KEYEXCHANGE:
-        case CALG_RSA_KEYX:
-            TRACE("installing public key\n");
-            release_and_install_key(hProv, *phKey,
&pKeyContainer->hKeyExchangeKeyPair,
-                                    fStoreKey);
-            break;
-        }
     }
     return ret;
 }
@@ -3107,7 +3094,7 @@
                 
         case PUBLICKEYBLOB:
             return import_public_key(hProv, pbData, dwDataLen, dwFlags,
-                                     fStoreKey, phKey);
+                                     phKey);
                 
         case SIMPLEBLOB:
             return import_symmetric_key(hProv, pbData, dwDataLen, hPubKey,

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Jun  3 22:38:03 2017
@@ -162,7 +162,7 @@
 reactos/dll/win32/riched32            # Synced to WineStaging-1.9.11
 reactos/dll/win32/rpcrt4              # Synced to WineStaging-2.2
 reactos/dll/win32/rsabase             # Synced to WineStaging-1.9.11
-reactos/dll/win32/rsaenh              # Synced to WineStaging-1.9.11
+reactos/dll/win32/rsaenh              # Synced to WineStaging-2.9
 reactos/dll/win32/sccbase             # Synced to WineStaging-1.9.11
 reactos/dll/win32/schannel            # Synced to WineStaging-1.9.11
 reactos/dll/win32/scrrun              # Synced to WineStaging-2.2