Crypto, crypto everywhere...
[new] crypto::providers and crypto::certificates now list provider types [internal] Removed kull_m_crypto_crc32 routine from crypto module, relies now on cryptdll using CALG_CRC32 with kull_m_crypto_hash [internal] Removed incorrect usage of BOOL instead of NTSTATUS in kuhl_m_pac_validationInfo_to_PAC
This commit is contained in:
Benjamin DELPY
parent
34d1d0f573
commit
111b47a67b
|
|
@ -17,8 +17,7 @@ BOOL kuhl_m_pac_validationInfo_to_PAC(PKERB_VALIDATION_INFO validationInfo, DWOR
|
|||
DWORD modulo, offsetData = sizeof(PACTYPE) + 3 * sizeof(PAC_INFO_BUFFER);
|
||||
PKERB_CHECKSUM pCheckSum;
|
||||
|
||||
status = CDLocateCheckSum(SignatureType, &pCheckSum);
|
||||
if(NT_SUCCESS(status))
|
||||
if(NT_SUCCESS(CDLocateCheckSum(SignatureType, &pCheckSum)))
|
||||
{
|
||||
if(kuhl_m_pac_validationInfo_to_LOGON_INFO(validationInfo, &pLogonInfo, &szLogonInfo))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -100,6 +100,7 @@ NTSTATUS kuhl_m_crypto_l_providers(int argc, wchar_t * argv[])
|
|||
{
|
||||
DWORD provType,tailleRequise, index = 0;
|
||||
wchar_t * monProvider;
|
||||
PCWCHAR name;
|
||||
PCRYPT_PROVIDERS pBuffer = NULL;
|
||||
|
||||
kprintf(L"\nCryptoAPI providers :\n");
|
||||
|
|
@ -108,7 +109,10 @@ NTSTATUS kuhl_m_crypto_l_providers(int argc, wchar_t * argv[])
|
|||
if(monProvider = (wchar_t *) LocalAlloc(LPTR, tailleRequise))
|
||||
{
|
||||
if(CryptEnumProviders(index, NULL, 0, &provType, monProvider, &tailleRequise))
|
||||
kprintf(L"%2u. %s\n", index, monProvider);
|
||||
{
|
||||
name = kull_m_crypto_provider_type_to_name(provType);
|
||||
kprintf(L"%2u. %-13s (%2u) - %s\n", index, name ? name : L"?", provType, monProvider);
|
||||
}
|
||||
LocalFree(monProvider);
|
||||
}
|
||||
index++;
|
||||
|
|
@ -116,6 +120,24 @@ NTSTATUS kuhl_m_crypto_l_providers(int argc, wchar_t * argv[])
|
|||
if(GetLastError() != ERROR_NO_MORE_ITEMS)
|
||||
PRINT_ERROR_AUTO(L"CryptEnumProviders");
|
||||
|
||||
index = 0;
|
||||
kprintf(L"\nCryptoAPI provider types:\n");
|
||||
while(CryptEnumProviderTypes(index, NULL, 0, &provType, NULL, &tailleRequise))
|
||||
{
|
||||
if(monProvider = (wchar_t *) LocalAlloc(LPTR, tailleRequise))
|
||||
{
|
||||
if(CryptEnumProviderTypes(index, NULL, 0, &provType, monProvider, &tailleRequise))
|
||||
{
|
||||
name = kull_m_crypto_provider_type_to_name(provType);
|
||||
kprintf(L"%2u. %-13s (%2u) - %s\n", index, name ? name : L"?", provType, monProvider);
|
||||
}
|
||||
LocalFree(monProvider);
|
||||
}
|
||||
index++;
|
||||
}
|
||||
if(GetLastError() != ERROR_NO_MORE_ITEMS)
|
||||
PRINT_ERROR_AUTO(L"CryptEnumProviderTypes");
|
||||
|
||||
if(kuhl_m_crypto_hNCrypt)
|
||||
{
|
||||
kprintf(L"\nCNG providers :\n");
|
||||
|
|
@ -162,7 +184,7 @@ NTSTATUS kuhl_m_crypto_l_certificates(int argc, wchar_t * argv[])
|
|||
HCRYPTKEY maCle;
|
||||
BOOL keyToFree;
|
||||
|
||||
PCWCHAR szSystemStore, szStore;
|
||||
PCWCHAR szSystemStore, szStore, name;
|
||||
DWORD dwSystemStore = 0;
|
||||
|
||||
BOOL export = kull_m_string_args_byName(argc, argv, L"export", NULL, NULL);
|
||||
|
|
@ -198,11 +220,14 @@ NTSTATUS kuhl_m_crypto_l_certificates(int argc, wchar_t * argv[])
|
|||
{
|
||||
if(CertGetCertificateContextProperty(pCertContext, CERT_KEY_PROV_INFO_PROP_ID, pBuffer, &dwSizeNeeded))
|
||||
{
|
||||
name = kull_m_crypto_provider_type_to_name(pBuffer->dwProvType);
|
||||
kprintf(
|
||||
L"\tKey Container : %s\n"
|
||||
L"\tProvider : %s\n",
|
||||
L"\tProvider : %s\n"
|
||||
L"\tProvider type : %s (%u)\n",
|
||||
(pBuffer->pwszContainerName ? pBuffer->pwszContainerName : L"(null)"),
|
||||
(pBuffer->pwszProvName ? pBuffer->pwszProvName : L"(null)"));
|
||||
(pBuffer->pwszProvName ? pBuffer->pwszProvName : L"(null)"),
|
||||
name ? name : L"?", pBuffer->dwProvType);
|
||||
|
||||
if(CryptAcquireCertificatePrivateKey(pCertContext, CRYPT_ACQUIRE_ALLOW_NCRYPT_KEY_FLAG /* CRYPT_ACQUIRE_SILENT_FLAG NULL */, NULL, &monProv, &keySpec, &keyToFree))
|
||||
{
|
||||
|
|
@ -737,7 +762,6 @@ NTSTATUS kuhl_m_crypto_system(int argc, wchar_t * argv[])
|
|||
case CERT_OCSP_CACHE_PREFIX_PROP_ID:
|
||||
kprintf(L"%.*s", prop->size / sizeof(wchar_t), prop->data);
|
||||
break;
|
||||
|
||||
case CERT_cert_file_element:
|
||||
case CERT_crl_file_element:
|
||||
case CERT_ctl_file_element:
|
||||
|
|
|
|||
|
|
@ -12,8 +12,22 @@ BOOL kull_m_crypto_hash(ALG_ID algid, LPCVOID data, DWORD dataLen, LPVOID hash,
|
|||
HCRYPTHASH hHash;
|
||||
DWORD hashLen;
|
||||
PBYTE buffer;
|
||||
PKERB_CHECKSUM pCheckSum;
|
||||
PVOID Context;
|
||||
|
||||
if(CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
|
||||
if((algid == CALG_CRC32) && (hashWanted == sizeof(DWORD)))
|
||||
{
|
||||
if(NT_SUCCESS(CDLocateCheckSum(KERB_CHECKSUM_REAL_CRC32, &pCheckSum)))
|
||||
{
|
||||
if(NT_SUCCESS(pCheckSum->InitializeEx(NULL, 0, 0, &Context)))
|
||||
{
|
||||
pCheckSum->Sum(Context, dataLen, data);
|
||||
status = NT_SUCCESS(pCheckSum->Finalize(Context, hash));
|
||||
pCheckSum->Finish(&Context);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))
|
||||
{
|
||||
if(CryptCreateHash(hProv, algid, 0, 0, &hHash))
|
||||
{
|
||||
|
|
@ -467,52 +481,6 @@ NTSTATUS kull_m_crypto_get_dcc(PBYTE dcc, PBYTE ntlm, PUNICODE_STRING Username,
|
|||
return status;
|
||||
}
|
||||
|
||||
|
||||
const DWORD kull_m_crypto_crc32_tab[] = {
|
||||
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
|
||||
0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
|
||||
0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
|
||||
0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
|
||||
0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
|
||||
0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
|
||||
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
|
||||
0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
|
||||
0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
|
||||
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
|
||||
0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
|
||||
0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
|
||||
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
|
||||
0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
|
||||
0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
|
||||
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
|
||||
0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
|
||||
0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
|
||||
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
|
||||
0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
|
||||
0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
|
||||
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
|
||||
0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
|
||||
0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
|
||||
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
|
||||
0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
|
||||
0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
|
||||
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
|
||||
0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
|
||||
0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
|
||||
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
|
||||
0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
|
||||
};
|
||||
|
||||
DWORD kull_m_crypto_crc32(DWORD startCrc, LPCVOID data, DWORD size)
|
||||
{
|
||||
LPCBYTE ptr;
|
||||
ptr = (LPCBYTE) data;
|
||||
startCrc = startCrc ^ ~0u;
|
||||
while (size--)
|
||||
startCrc = kull_m_crypto_crc32_tab[(startCrc ^ *ptr++) & 0xff] ^ (startCrc >> 8);
|
||||
return startCrc ^ ~0u;
|
||||
}
|
||||
|
||||
const KULL_M_CRYPTO_DUAL_STRING_DWORD kull_m_crypto_system_stores[] = {
|
||||
{L"CERT_SYSTEM_STORE_CURRENT_USER", CERT_SYSTEM_STORE_CURRENT_USER},
|
||||
{L"CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY", CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY},
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@
|
|||
#include "kull_m_string.h"
|
||||
#include "kull_m_crypto_system.h"
|
||||
|
||||
#define CALG_CRC32 (ALG_CLASS_HASH | ALG_TYPE_ANY | 0)
|
||||
|
||||
#define AES_256_KEY_SIZE (256/8)
|
||||
#define AES_128_KEY_SIZE (128/8)
|
||||
#define AES_BLOCK_SIZE 16
|
||||
|
|
@ -64,7 +66,6 @@ DWORD kull_m_crypto_hash_len(ALG_ID hashId);
|
|||
DWORD kull_m_crypto_cipher_blocklen(ALG_ID hashId);
|
||||
DWORD kull_m_crypto_cipher_keylen(ALG_ID hashId);
|
||||
NTSTATUS kull_m_crypto_get_dcc(PBYTE dcc, PBYTE ntlm, PUNICODE_STRING Username, DWORD realIterations);
|
||||
DWORD kull_m_crypto_crc32(DWORD startCrc, LPCVOID data, DWORD size);
|
||||
|
||||
typedef struct _KULL_M_CRYPTO_DUAL_STRING_DWORD {
|
||||
PCWSTR name;
|
||||
|
|
|
|||
|
|
@ -302,19 +302,22 @@ BOOL kull_m_rpc_drsr_ProcessGetNCChangesReply_decrypt(ATTRVAL *val)
|
|||
if(NT_SUCCESS(RtlEncryptDecryptRC4(&cryptoData, &cryptoKey)))
|
||||
{
|
||||
realLen = val->valLen - FIELD_OFFSET(ENCRYPTED_PAYLOAD, EncryptedData);
|
||||
calcChecksum = kull_m_crypto_crc32(0, encrypted->EncryptedData, realLen);
|
||||
if(calcChecksum == encrypted->CheckSum)
|
||||
if(kull_m_crypto_hash(CALG_CRC32, encrypted->EncryptedData, realLen, &calcChecksum, sizeof(calcChecksum)))
|
||||
{
|
||||
toFree = val->pVal;
|
||||
if(val->pVal = (UCHAR *) MIDL_user_allocate(realLen))
|
||||
if(calcChecksum == encrypted->CheckSum)
|
||||
{
|
||||
RtlCopyMemory(val->pVal, encrypted->EncryptedData, realLen);
|
||||
val->valLen = realLen;
|
||||
status = TRUE;
|
||||
MIDL_user_free(toFree);
|
||||
toFree = val->pVal;
|
||||
if(val->pVal = (UCHAR *) MIDL_user_allocate(realLen))
|
||||
{
|
||||
RtlCopyMemory(val->pVal, encrypted->EncryptedData, realLen);
|
||||
val->valLen = realLen;
|
||||
status = TRUE;
|
||||
MIDL_user_free(toFree);
|
||||
}
|
||||
}
|
||||
else PRINT_ERROR(L"Checksums don\'t match (C:0x%08x - R:0x%08x)\n", calcChecksum, encrypted->CheckSum);
|
||||
}
|
||||
else PRINT_ERROR(L"Checksums don\'t match (C:0x%08x - R:0x%08x)\n", calcChecksum, encrypted->CheckSum);
|
||||
else PRINT_ERROR(L"Unable to calculate CRC32\n");
|
||||
}
|
||||
else PRINT_ERROR(L"RtlEncryptDecryptRC4\n");
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue