Skip to content

W
wine-winehq
Commit 51f24d41 authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard
Browse files
Options

rsaenh: Correct signature checking.

- pass desired key to encrypt_block_impl - don't change the alg id of imported keys - add a few traces
parent c5ae39a3
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 31 deletions
dlls/rsaenh/implglue.c
View file @ 51f24d41
......@@ -242,12 +242,11 @@ static inline void reverse_bytes(BYTE *pbData, DWORD dwLen) {
}
}
BOOL encrypt_block_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, CONST BYTE *in, BYTE *out,
BOOL encrypt_block_impl(ALG_ID aiAlgid, DWORD dwKeySpec, KEY_CONTEXT *pKeyContext, CONST BYTE *in, BYTE *out,
DWORD enc)
{
unsigned long inlen, outlen;
BYTE *in_reversed = NULL;
int key;
switch (aiAlgid) {
case CALG_RC2:
......@@ -279,22 +278,12 @@ BOOL encrypt_block_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, CONST BYTE *in
case CALG_RSA_SIGN:
outlen = inlen = (mp_count_bits(&pKeyContext->rsa.N)+7)/8;
if (enc) {
if (aiAlgid == CALG_RSA_SIGN) {
key = PK_PRIVATE;
} else {
key = PK_PUBLIC;
}
if (rsa_exptmod(in, inlen, out, &outlen, key, &pKeyContext->rsa) != CRYPT_OK) {
if (rsa_exptmod(in, inlen, out, &outlen, dwKeySpec, &pKeyContext->rsa) != CRYPT_OK) {
SetLastError(NTE_FAIL);
return FALSE;
}
reverse_bytes(out, outlen);
} else {
if (aiAlgid == CALG_RSA_SIGN) {
key = PK_PUBLIC;
} else {
key = PK_PRIVATE;
}
in_reversed = HeapAlloc(GetProcessHeap(), 0, inlen);
if (!in_reversed) {
SetLastError(NTE_NO_MEMORY);
......@@ -302,7 +291,7 @@ BOOL encrypt_block_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, CONST BYTE *in
}
memcpy(in_reversed, in, inlen);
reverse_bytes(in_reversed, inlen);
if (rsa_exptmod(in_reversed, inlen, out, &outlen, key, &pKeyContext->rsa) != CRYPT_OK) {
if (rsa_exptmod(in_reversed, inlen, out, &outlen, dwKeySpec, &pKeyContext->rsa) != CRYPT_OK) {
HeapFree(GetProcessHeap(), 0, in_reversed);
SetLastError(NTE_FAIL);
return FALSE;
......
dlls/rsaenh/implglue.h
View file @ 51f24d41
......@@ -81,7 +81,8 @@ BOOL setup_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, DW
BOOL duplicate_key_impl(ALG_ID aiAlgid, CONST KEY_CONTEXT *pSrcKeyContext,
KEY_CONTEXT *pDestKeyContext);
BOOL encrypt_block_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, CONST BYTE *pbIn, BYTE *pbOut,
/* dwKeySpec is optional for symmetric key algorithms */
BOOL encrypt_block_impl(ALG_ID aiAlgid, DWORD dwKeySpec, KEY_CONTEXT *pKeyContext, CONST BYTE *pbIn, BYTE *pbOut,
DWORD enc);
BOOL encrypt_stream_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, BYTE *pbInOut, DWORD dwLen);
......
dlls/rsaenh/rsaenh.c
View file @ 51f24d41
......@@ -1488,6 +1488,7 @@ BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer,
if (*phProv != (HCRYPTPROV)INVALID_HANDLE_VALUE)
{
release_handle(&handle_table, (unsigned int)*phProv, RSAENH_MAGIC_CONTAINER);
TRACE("Can't create new keyset, already exists\n");
SetLastError(NTE_EXISTS);
return FALSE;
}
......@@ -1496,6 +1497,7 @@ BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer,
case CRYPT_VERIFYCONTEXT:
if (pszContainer) {
TRACE("pszContainer should be NULL\n");
SetLastError(NTE_BAD_FLAGS);
return FALSE;
}
......@@ -1911,20 +1913,20 @@ BOOL WINAPI RSAENH_CPEncrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash,
for (i=0, in=pbData; i<*pdwDataLen; i+=pCryptKey->dwBlockLen, in+=pCryptKey->dwBlockLen) {
switch (pCryptKey->dwMode) {
case CRYPT_MODE_ECB:
encrypt_block_impl(pCryptKey->aiAlgid, &pCryptKey->context, in, out,
encrypt_block_impl(pCryptKey->aiAlgid, 0, &pCryptKey->context, in, out,
RSAENH_ENCRYPT);
break;
case CRYPT_MODE_CBC:
for (j=0; j<pCryptKey->dwBlockLen; j++) in[j] ^= pCryptKey->abChainVector[j];
encrypt_block_impl(pCryptKey->aiAlgid, &pCryptKey->context, in, out,
encrypt_block_impl(pCryptKey->aiAlgid, 0, &pCryptKey->context, in, out,
RSAENH_ENCRYPT);
memcpy(pCryptKey->abChainVector, out, pCryptKey->dwBlockLen);
break;
case CRYPT_MODE_CFB:
for (j=0; j<pCryptKey->dwBlockLen; j++) {
encrypt_block_impl(pCryptKey->aiAlgid, &pCryptKey->context,
encrypt_block_impl(pCryptKey->aiAlgid, 0, &pCryptKey->context,
pCryptKey->abChainVector, o, RSAENH_ENCRYPT);
out[j] = in[j] ^ o[0];
for (k=0; k<pCryptKey->dwBlockLen-1; k++)
......@@ -1959,7 +1961,7 @@ BOOL WINAPI RSAENH_CPEncrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash,
return FALSE;
}
if (!pad_data(pbData, *pdwDataLen, pbData, pCryptKey->dwBlockLen, dwFlags)) return FALSE;
encrypt_block_impl(pCryptKey->aiAlgid, &pCryptKey->context, pbData, pbData, RSAENH_ENCRYPT);
encrypt_block_impl(pCryptKey->aiAlgid, PK_PUBLIC, &pCryptKey->context, pbData, pbData, RSAENH_ENCRYPT);
*pdwDataLen = pCryptKey->dwBlockLen;
Final = TRUE;
} else {
......@@ -2040,12 +2042,12 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash,
for (i=0, in=pbData; i<*pdwDataLen; i+=pCryptKey->dwBlockLen, in+=pCryptKey->dwBlockLen) {
switch (pCryptKey->dwMode) {
case CRYPT_MODE_ECB:
encrypt_block_impl(pCryptKey->aiAlgid, &pCryptKey->context, in, out,
encrypt_block_impl(pCryptKey->aiAlgid, 0, &pCryptKey->context, in, out,
RSAENH_DECRYPT);
break;
case CRYPT_MODE_CBC:
encrypt_block_impl(pCryptKey->aiAlgid, &pCryptKey->context, in, out,
encrypt_block_impl(pCryptKey->aiAlgid, 0, &pCryptKey->context, in, out,
RSAENH_DECRYPT);
for (j=0; j<pCryptKey->dwBlockLen; j++) out[j] ^= pCryptKey->abChainVector[j];
memcpy(pCryptKey->abChainVector, in, pCryptKey->dwBlockLen);
......@@ -2053,7 +2055,7 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash,
case CRYPT_MODE_CFB:
for (j=0; j<pCryptKey->dwBlockLen; j++) {
encrypt_block_impl(pCryptKey->aiAlgid, &pCryptKey->context,
encrypt_block_impl(pCryptKey->aiAlgid, 0, &pCryptKey->context,
pCryptKey->abChainVector, o, RSAENH_ENCRYPT);
out[j] = in[j] ^ o[0];
for (k=0; k<pCryptKey->dwBlockLen-1; k++)
......@@ -2077,7 +2079,7 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash,
SetLastError(NTE_BAD_KEY);
return FALSE;
}
encrypt_block_impl(pCryptKey->aiAlgid, &pCryptKey->context, pbData, pbData, RSAENH_DECRYPT);
encrypt_block_impl(pCryptKey->aiAlgid, PK_PRIVATE, &pCryptKey->context, pbData, pbData, RSAENH_DECRYPT);
if (!unpad_data(pbData, pCryptKey->dwBlockLen, pbData, pdwDataLen, dwFlags)) return FALSE;
Final = TRUE;
} else {
......@@ -2178,7 +2180,7 @@ BOOL WINAPI RSAENH_CPExportKey(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTKEY hPubK
return FALSE;
}
encrypt_block_impl(pPubKey->aiAlgid, &pPubKey->context, (BYTE*)(pAlgid+1),
encrypt_block_impl(pPubKey->aiAlgid, PK_PUBLIC, &pPubKey->context, (BYTE*)(pAlgid+1),
(BYTE*)(pAlgid+1), RSAENH_ENCRYPT);
}
*pdwDataLen = dwDataLen;
......@@ -2207,8 +2209,6 @@ BOOL WINAPI RSAENH_CPExportKey(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTKEY hPubK
pBlobHeader->bVersion = CUR_BLOB_VERSION;
pBlobHeader->reserved = 0;
pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid;
if (pBlobHeader->aiKeyAlg == CALG_RSA_SIGN)
pBlobHeader->aiKeyAlg = CALG_RSA_KEYX;
pRSAPubKey->magic = RSAENH_MAGIC_RSA1;
pRSAPubKey->bitlen = pCryptKey->dwKeyLen << 3;
......@@ -2325,12 +2325,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,
(unsigned int*)&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,
(unsigned int*)&pKeyContainer->hKeyExchangeKeyPair);
......@@ -2352,8 +2354,6 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat
* available, so only signature verification is possible.
*/
algID = pBlobHeader->aiKeyAlg;
if (algID == CALG_RSA_KEYX)
algID = CALG_RSA_SIGN;
*phKey = new_key(hProv, algID, MAKELONG(0,pRSAPubKey->bitlen), &pCryptKey);
if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) return FALSE;
setup_key(pCryptKey);
......@@ -2364,6 +2364,7 @@ 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,
(unsigned int*)&pKeyContainer->hKeyExchangeKeyPair);
......@@ -2388,7 +2389,7 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat
pbDecrypted = HeapAlloc(GetProcessHeap(), 0, pPubKey->dwBlockLen);
if (!pbDecrypted) return FALSE;
encrypt_block_impl(pPubKey->aiAlgid, &pPubKey->context, pbKeyStream, pbDecrypted,
encrypt_block_impl(pPubKey->aiAlgid, PK_PRIVATE, &pPubKey->context, pbKeyStream, pbDecrypted,
RSAENH_DECRYPT);
dwKeyLen = RSAENH_MAX_KEY_SIZE;
......@@ -3531,7 +3532,7 @@ BOOL WINAPI RSAENH_CPSignHash(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwKeySpe
return FALSE;
}
return encrypt_block_impl(pCryptKey->aiAlgid, &pCryptKey->context, pbSignature, pbSignature, RSAENH_ENCRYPT);
return encrypt_block_impl(pCryptKey->aiAlgid, PK_PRIVATE, &pCryptKey->context, pbSignature, pbSignature, RSAENH_ENCRYPT);
}
/******************************************************************************
......@@ -3611,7 +3612,7 @@ BOOL WINAPI RSAENH_CPVerifySignature(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST B
goto cleanup;
}
if (!encrypt_block_impl(pCryptKey->aiAlgid, &pCryptKey->context, pbSignature, pbDecrypted,
if (!encrypt_block_impl(pCryptKey->aiAlgid, PK_PUBLIC, &pCryptKey->context, pbSignature, pbDecrypted,
RSAENH_DECRYPT))
{
goto cleanup;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment