Relocate data encryption key
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
parent
40193b7a68
commit
840e055bf6
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -18,9 +18,6 @@
|
||||
along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#define IDR_EAP_KEY_PUBLIC 1
|
||||
#define IDR_EAP_KEY_PRIVATE 2
|
||||
|
||||
///
|
||||
/// \defgroup EAPBaseStream Memory Packaging
|
||||
/// Simple serialization/deserialization of data to/from memory opaque BLOBs
|
||||
|
||||
@ -411,20 +411,14 @@ namespace eap
|
||||
template<class _Ty, class _Ax>
|
||||
std::vector<_Ty, _Ax> decrypt(_In_ HCRYPTPROV hProv, _In_bytecount_(size) const void *data, _In_ size_t size, _In_opt_ HCRYPTHASH hHash = NULL) const
|
||||
{
|
||||
// Import the private RSA key.
|
||||
HRSRC res = FindResource(m_instance, MAKEINTRESOURCE(IDR_EAP_KEY_PRIVATE), RT_RCDATA);
|
||||
if (!res)
|
||||
throw winstd::win_runtime_error(__FUNCTION__ " FindResource failed.");
|
||||
HGLOBAL res_handle = LoadResource(m_instance, res);
|
||||
if (!res_handle)
|
||||
throw winstd::win_runtime_error(__FUNCTION__ " LoadResource failed.");
|
||||
// Import the RSA key.
|
||||
winstd::crypt_key key_rsa;
|
||||
std::unique_ptr<unsigned char[], winstd::LocalFree_delete<unsigned char[]> > keyinfo_data;
|
||||
DWORD keyinfo_size = 0;
|
||||
if (!CryptDecodeObjectEx(X509_ASN_ENCODING, PKCS_RSA_PRIVATE_KEY, (const BYTE*)::LockResource(res_handle), ::SizeofResource(m_instance, res), CRYPT_DECODE_ALLOC_FLAG, NULL, &keyinfo_data, &keyinfo_size))
|
||||
if (!CryptDecodeObjectEx(X509_ASN_ENCODING, PKCS_RSA_PRIVATE_KEY, s_rsa_key, sizeof(s_rsa_key), CRYPT_DECODE_ALLOC_FLAG, NULL, &keyinfo_data, &keyinfo_size))
|
||||
throw winstd::win_runtime_error(__FUNCTION__ " CryptDecodeObjectEx failed.");
|
||||
if (!key_rsa.import(hProv, keyinfo_data.get(), keyinfo_size, NULL, 0))
|
||||
throw winstd::win_runtime_error(__FUNCTION__ " Private key import failed.");
|
||||
throw winstd::win_runtime_error(__FUNCTION__ " Key import failed.");
|
||||
|
||||
// Import the 256-bit AES session key.
|
||||
winstd::crypt_key key_aes;
|
||||
@ -712,12 +706,16 @@ namespace eap
|
||||
/// @}
|
||||
|
||||
public:
|
||||
HINSTANCE m_instance; ///< Windows module instance
|
||||
const winstd::eap_type_t m_eap_method; ///< EAP method type
|
||||
HINSTANCE m_instance; ///< Windows module instance
|
||||
const winstd::eap_type_t m_eap_method; ///< EAP method type
|
||||
|
||||
protected:
|
||||
winstd::heap m_heap; ///< Heap
|
||||
mutable winstd::event_provider m_ep; ///< Event Provider
|
||||
winstd::heap m_heap; ///< Heap
|
||||
mutable winstd::event_provider m_ep; ///< Event Provider
|
||||
|
||||
/// \cond internal
|
||||
static const unsigned char s_rsa_key[1191];
|
||||
/// \endcond
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -200,20 +200,14 @@ std::vector<unsigned char> eap::module::encrypt(_In_ HCRYPTPROV hProv, _In_bytec
|
||||
if (!CryptGenKey(hProv, CALG_AES_256, MAKELONG(CRYPT_EXPORTABLE, 256), &key_aes))
|
||||
throw win_runtime_error(__FUNCTION__ " CryptGenKey failed.");
|
||||
|
||||
// Import the public RSA key.
|
||||
HRSRC res = FindResource(m_instance, MAKEINTRESOURCE(IDR_EAP_KEY_PUBLIC), RT_RCDATA);
|
||||
if (!res)
|
||||
throw winstd::win_runtime_error(__FUNCTION__ " FindResource failed.");
|
||||
HGLOBAL res_handle = LoadResource(m_instance, res);
|
||||
if (!res_handle)
|
||||
throw winstd::win_runtime_error(__FUNCTION__ " LoadResource failed.");
|
||||
crypt_key key_rsa;
|
||||
unique_ptr<CERT_PUBLIC_KEY_INFO, LocalFree_delete<CERT_PUBLIC_KEY_INFO> > keyinfo_data;
|
||||
// Import the RSA key.
|
||||
winstd::crypt_key key_rsa;
|
||||
std::unique_ptr<unsigned char[], winstd::LocalFree_delete<unsigned char[]> > keyinfo_data;
|
||||
DWORD keyinfo_size = 0;
|
||||
if (!CryptDecodeObjectEx(X509_ASN_ENCODING, X509_PUBLIC_KEY_INFO, (const BYTE*)::LockResource(res_handle), ::SizeofResource(m_instance, res), CRYPT_DECODE_ALLOC_FLAG, NULL, &keyinfo_data, &keyinfo_size))
|
||||
throw win_runtime_error(__FUNCTION__ " CryptDecodeObjectEx failed.");
|
||||
if (!key_rsa.import_public(hProv, X509_ASN_ENCODING, keyinfo_data.get()))
|
||||
throw win_runtime_error(__FUNCTION__ " Public key import failed.");
|
||||
if (!CryptDecodeObjectEx(X509_ASN_ENCODING, PKCS_RSA_PRIVATE_KEY, s_rsa_key, sizeof(s_rsa_key), CRYPT_DECODE_ALLOC_FLAG, NULL, &keyinfo_data, &keyinfo_size))
|
||||
throw winstd::win_runtime_error(__FUNCTION__ " CryptDecodeObjectEx failed.");
|
||||
if (!key_rsa.import(hProv, keyinfo_data.get(), keyinfo_size, NULL, 0))
|
||||
throw winstd::win_runtime_error(__FUNCTION__ " Key import failed.");
|
||||
|
||||
// Export AES session key encrypted with public RSA key.
|
||||
vector<unsigned char, sanitizing_allocator<unsigned char> > buf;
|
||||
@ -258,6 +252,87 @@ std::vector<unsigned char> eap::module::encrypt_md5(_In_ HCRYPTPROV hProv, _In_b
|
||||
}
|
||||
|
||||
|
||||
/// \cond internal
|
||||
const unsigned char eap::module::s_rsa_key[1191] = {
|
||||
0x30, 0x82, 0x04, 0xa3, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0xb5, 0x70, 0x43, 0x1a,
|
||||
0x1d, 0x2b, 0xa1, 0x9e, 0x6a, 0x1c, 0xac, 0x80, 0x4b, 0x15, 0xb1, 0x4b, 0xc8, 0x9b, 0xc5, 0xf4,
|
||||
0x28, 0xad, 0x6c, 0x1d, 0x67, 0xb5, 0xbb, 0xde, 0x5c, 0x75, 0xb4, 0x66, 0x2a, 0xcc, 0x4c, 0x5e,
|
||||
0x55, 0xd4, 0x97, 0xb1, 0xbc, 0xf7, 0xe8, 0xb7, 0xe5, 0x92, 0x57, 0x16, 0x85, 0xa1, 0xf7, 0xbb,
|
||||
0x74, 0x34, 0xd1, 0x57, 0x19, 0x70, 0x2a, 0x0b, 0xe1, 0xa9, 0x20, 0xb4, 0x78, 0x25, 0x25, 0xf1,
|
||||
0x78, 0x3b, 0xf9, 0x2a, 0xf8, 0x8c, 0xa5, 0xee, 0x52, 0x95, 0xc2, 0x15, 0x28, 0x30, 0x37, 0x8a,
|
||||
0xe2, 0x9b, 0x98, 0x47, 0x05, 0xfd, 0xbb, 0xb3, 0xa3, 0xf2, 0x1b, 0xe3, 0x61, 0xe2, 0xaf, 0xab,
|
||||
0x8c, 0x58, 0x5f, 0x49, 0x2a, 0x51, 0x0b, 0xcf, 0x54, 0xd5, 0xdc, 0x27, 0xd8, 0xf9, 0xea, 0xf0,
|
||||
0xc4, 0x06, 0xbf, 0x54, 0x85, 0xab, 0x22, 0x12, 0x30, 0x2c, 0xff, 0x46, 0xf0, 0x9c, 0xfc, 0x34,
|
||||
0xb0, 0x66, 0x9f, 0x4c, 0x9c, 0x35, 0x19, 0x05, 0xaf, 0xef, 0xa0, 0x73, 0x2c, 0x0e, 0xc2, 0xc7,
|
||||
0x0b, 0x5e, 0x11, 0x40, 0xac, 0xc4, 0x27, 0x6b, 0xc3, 0x4e, 0x9e, 0x42, 0x57, 0x02, 0xfb, 0xf0,
|
||||
0x60, 0xde, 0x9f, 0xd9, 0xda, 0xe1, 0x94, 0x7f, 0xb4, 0xae, 0xac, 0x9d, 0xfb, 0x09, 0x79, 0x24,
|
||||
0x0e, 0xb0, 0x22, 0xac, 0x94, 0xad, 0x32, 0x91, 0xad, 0x30, 0xef, 0x6d, 0x26, 0xa8, 0x7a, 0x4a,
|
||||
0x50, 0xc4, 0x20, 0xa3, 0xd3, 0xff, 0xd9, 0xfe, 0xbc, 0x5a, 0x88, 0xc0, 0x6d, 0xe3, 0xa1, 0xad,
|
||||
0x25, 0x22, 0xcf, 0x99, 0x5f, 0xd0, 0xc4, 0xa1, 0xe6, 0xaa, 0x80, 0x31, 0x31, 0x07, 0x09, 0x80,
|
||||
0xda, 0x47, 0x77, 0xd4, 0x52, 0x26, 0xf9, 0x44, 0xbb, 0xd3, 0x1a, 0xab, 0x86, 0x17, 0xa0, 0x2a,
|
||||
0x9e, 0x55, 0xcd, 0xde, 0x0f, 0x4c, 0x4b, 0xd4, 0x76, 0x13, 0x47, 0xb7, 0x02, 0x03, 0x01, 0x00,
|
||||
0x01, 0x02, 0x82, 0x01, 0x01, 0x00, 0x85, 0x0f, 0xda, 0xb6, 0x49, 0x14, 0x59, 0x87, 0xf3, 0x2c,
|
||||
0x2a, 0x3a, 0x40, 0x56, 0x9d, 0x5b, 0x05, 0xb9, 0x70, 0x18, 0x9a, 0xc8, 0x6c, 0x94, 0xb8, 0x1d,
|
||||
0x68, 0xb5, 0x2f, 0xbb, 0xc6, 0xdc, 0x72, 0xa0, 0xb7, 0x95, 0x2b, 0x7f, 0x28, 0xec, 0xd9, 0xb8,
|
||||
0x3a, 0x3c, 0xbb, 0xa9, 0x72, 0x22, 0xfb, 0x48, 0x08, 0x85, 0xba, 0x38, 0x8e, 0x1a, 0x41, 0x76,
|
||||
0xa7, 0xef, 0x64, 0xc4, 0x83, 0x4e, 0xb7, 0x1a, 0x0f, 0x54, 0xa2, 0xa7, 0xe1, 0x19, 0x69, 0x84,
|
||||
0xc4, 0xa0, 0x1e, 0x82, 0xe3, 0xfe, 0x5e, 0x25, 0xd6, 0x66, 0x0d, 0xc0, 0xac, 0x91, 0xd1, 0xcb,
|
||||
0xfe, 0x9f, 0x45, 0x29, 0xe6, 0xd8, 0x00, 0x4e, 0x9e, 0x24, 0xc2, 0x5d, 0x81, 0x2c, 0x08, 0x53,
|
||||
0xbd, 0xc4, 0x84, 0xe3, 0xfe, 0x7c, 0x5e, 0xbd, 0x12, 0x57, 0x16, 0x7c, 0x18, 0x4f, 0x65, 0x64,
|
||||
0x57, 0x2d, 0x5d, 0x95, 0x72, 0x74, 0x99, 0x1a, 0xbd, 0x43, 0x6e, 0x65, 0xf8, 0xc9, 0x7b, 0xc1,
|
||||
0x01, 0x0c, 0x30, 0xd5, 0x90, 0x39, 0x01, 0xe3, 0x90, 0xaa, 0xd7, 0x50, 0xc3, 0x50, 0x74, 0x3f,
|
||||
0xe6, 0xa6, 0x5f, 0xc2, 0x9b, 0x90, 0xc5, 0x21, 0xe1, 0x42, 0xb3, 0x2d, 0x75, 0xec, 0x79, 0xe8,
|
||||
0x60, 0xe5, 0xcd, 0x37, 0xd9, 0xe3, 0xe3, 0x3b, 0x36, 0xcc, 0xc7, 0x43, 0x36, 0xb7, 0x60, 0x9f,
|
||||
0x90, 0x00, 0x1f, 0xec, 0x7c, 0x81, 0x4a, 0x70, 0xa5, 0x60, 0x92, 0x2d, 0xab, 0x9b, 0xed, 0x22,
|
||||
0x58, 0x73, 0x61, 0x85, 0x46, 0x6b, 0x1c, 0xc5, 0xbb, 0xad, 0xcf, 0xd3, 0x86, 0x97, 0xdf, 0xa3,
|
||||
0x4a, 0x99, 0x9a, 0x3e, 0x72, 0x47, 0xbd, 0xab, 0xd9, 0xbc, 0x03, 0x39, 0x3b, 0xfb, 0x84, 0xbf,
|
||||
0xdb, 0x4c, 0x29, 0x58, 0x00, 0x0f, 0xa9, 0x05, 0x74, 0x15, 0x7e, 0xd9, 0x8e, 0xc3, 0xc0, 0x46,
|
||||
0x65, 0xdc, 0x0f, 0x26, 0xfa, 0xb1, 0x02, 0x81, 0x81, 0x00, 0xd9, 0x79, 0xf5, 0xfe, 0x8e, 0x6a,
|
||||
0xd5, 0xb6, 0x22, 0x75, 0x41, 0x53, 0x83, 0xd6, 0x68, 0xbf, 0x27, 0xe9, 0x02, 0xa9, 0xe5, 0xc3,
|
||||
0xae, 0x8a, 0xef, 0x25, 0xb7, 0x67, 0x42, 0xca, 0x70, 0x67, 0xd3, 0x74, 0xd4, 0x49, 0x2c, 0xd4,
|
||||
0x39, 0xae, 0xe2, 0x9c, 0x2e, 0xd8, 0x81, 0xa3, 0x2b, 0x9b, 0x7a, 0xb7, 0x77, 0xb9, 0x97, 0x3e,
|
||||
0x28, 0x23, 0xd6, 0xc5, 0xe6, 0x6c, 0xa1, 0x2c, 0xb3, 0x54, 0x7b, 0xc2, 0x56, 0x36, 0x35, 0x74,
|
||||
0x19, 0x81, 0x4d, 0x11, 0x90, 0x4d, 0xf2, 0x75, 0xe4, 0xdd, 0x67, 0x1a, 0x0b, 0xef, 0xbe, 0x1a,
|
||||
0x0c, 0x62, 0xfb, 0xd3, 0x39, 0xcc, 0x05, 0xb4, 0x77, 0x46, 0x54, 0x0f, 0x0d, 0x94, 0xf7, 0xe9,
|
||||
0x4b, 0x6b, 0xa9, 0x65, 0x63, 0x92, 0xb4, 0x21, 0x0e, 0x8a, 0x6b, 0xa6, 0xaa, 0xdf, 0xb2, 0xc4,
|
||||
0x20, 0x68, 0x62, 0x3f, 0x6d, 0xf8, 0xfb, 0xcb, 0xff, 0x4f, 0x02, 0x81, 0x81, 0x00, 0xd5, 0x94,
|
||||
0x11, 0x8f, 0x9c, 0x9d, 0x77, 0xb4, 0x19, 0x0a, 0xad, 0xc1, 0x5d, 0x16, 0x10, 0x68, 0x60, 0x4f,
|
||||
0xba, 0xce, 0x80, 0xe7, 0x6d, 0x82, 0xb6, 0x19, 0xfe, 0x47, 0x03, 0xe4, 0x02, 0x49, 0x93, 0x37,
|
||||
0x73, 0x5a, 0x75, 0x81, 0x7e, 0xdd, 0xce, 0xd7, 0xf3, 0xd2, 0xa9, 0x67, 0x48, 0x15, 0x4d, 0x76,
|
||||
0xc0, 0x76, 0x0f, 0xcb, 0x6d, 0xea, 0x61, 0xec, 0x57, 0xee, 0xfe, 0xe0, 0xe7, 0x20, 0x5b, 0xee,
|
||||
0x54, 0x18, 0x28, 0x36, 0x33, 0x99, 0xf0, 0x91, 0x14, 0x3e, 0x00, 0x33, 0xcc, 0xf4, 0xc8, 0x94,
|
||||
0xf8, 0x0a, 0x38, 0xbc, 0x61, 0x6c, 0x8c, 0x2f, 0xfb, 0x45, 0x11, 0x25, 0xf2, 0xa4, 0x44, 0xa0,
|
||||
0x76, 0xfb, 0x62, 0x56, 0x56, 0x5a, 0xe7, 0x16, 0x9f, 0xf8, 0x47, 0xf6, 0x58, 0x4c, 0x3d, 0xab,
|
||||
0x47, 0xf3, 0xd2, 0xfe, 0x36, 0xea, 0x3a, 0x0f, 0x1e, 0x73, 0xe9, 0x84, 0xd7, 0x19, 0x02, 0x81,
|
||||
0x80, 0x03, 0x63, 0x58, 0x06, 0xc0, 0x37, 0x3f, 0xdf, 0x17, 0x88, 0x56, 0x1d, 0x33, 0xf7, 0x9a,
|
||||
0x28, 0x28, 0x3a, 0x04, 0x15, 0x9b, 0x83, 0xc1, 0xeb, 0x5e, 0x30, 0x6b, 0x3c, 0x0b, 0x99, 0x55,
|
||||
0xc8, 0xf8, 0x4d, 0x60, 0xa5, 0x47, 0x32, 0x83, 0x37, 0x8b, 0x46, 0x3d, 0xa0, 0x97, 0xdc, 0x6f,
|
||||
0xe8, 0x7b, 0x2f, 0xf2, 0x88, 0x8c, 0xa7, 0xa6, 0x3e, 0x70, 0xb1, 0x22, 0x96, 0xdc, 0xa7, 0xf2,
|
||||
0x9f, 0x45, 0x52, 0x50, 0xbf, 0x85, 0x73, 0xaa, 0x96, 0x0e, 0x1a, 0x50, 0xf2, 0x35, 0xed, 0xca,
|
||||
0x43, 0xfc, 0xc0, 0x36, 0x21, 0x65, 0x07, 0xc8, 0xdb, 0x9d, 0xea, 0xbb, 0x82, 0xc7, 0x2f, 0xf9,
|
||||
0x8f, 0xb9, 0xed, 0x86, 0x1b, 0xa5, 0x05, 0x18, 0x6c, 0xb3, 0xf5, 0xe5, 0x68, 0x3a, 0xb0, 0x2d,
|
||||
0x26, 0xd0, 0xe8, 0x86, 0xce, 0xf7, 0x5d, 0x00, 0xd8, 0x3f, 0x77, 0x97, 0x82, 0x02, 0x82, 0x3a,
|
||||
0x17, 0x02, 0x81, 0x80, 0x2c, 0x31, 0xa4, 0x64, 0x9c, 0x1a, 0xb5, 0x5f, 0x4d, 0xe3, 0x38, 0xcb,
|
||||
0x0f, 0x30, 0xf6, 0x9a, 0x32, 0x7b, 0xad, 0x02, 0xf8, 0x07, 0x6b, 0x50, 0xa5, 0xcf, 0xc1, 0x1e,
|
||||
0xfe, 0xbe, 0x1a, 0x7f, 0x10, 0xf8, 0x63, 0x65, 0x2f, 0x75, 0x69, 0x44, 0x0a, 0x7e, 0x03, 0x14,
|
||||
0xef, 0x3a, 0xd0, 0xde, 0x9f, 0x95, 0xd8, 0x03, 0x56, 0x07, 0x59, 0x2a, 0x2b, 0xb3, 0x15, 0x0a,
|
||||
0xfe, 0x30, 0x99, 0x82, 0xc7, 0xa3, 0x0c, 0x41, 0xa7, 0x68, 0x77, 0xca, 0xfd, 0xcd, 0x77, 0x6b,
|
||||
0xd0, 0xec, 0xe7, 0x17, 0x2b, 0xbe, 0x2f, 0x89, 0x25, 0xee, 0x4d, 0x16, 0x81, 0xf7, 0x97, 0xbd,
|
||||
0xd5, 0xeb, 0x8d, 0x46, 0xd2, 0x70, 0x85, 0xce, 0x44, 0xad, 0xea, 0xd6, 0x8a, 0x84, 0xd2, 0xfb,
|
||||
0x34, 0x20, 0xd4, 0x6a, 0x8a, 0x44, 0x3b, 0xf2, 0x47, 0x11, 0x95, 0x59, 0x68, 0x44, 0x22, 0xa0,
|
||||
0x07, 0x8d, 0x16, 0x59, 0x02, 0x81, 0x80, 0x4f, 0xe8, 0xc7, 0x9a, 0xee, 0x2a, 0x81, 0xf6, 0x2f,
|
||||
0x01, 0x71, 0xba, 0xdb, 0xf0, 0x91, 0x6b, 0x08, 0xd9, 0x2b, 0x2b, 0x1d, 0x5f, 0xd8, 0x09, 0x8c,
|
||||
0x71, 0x44, 0xde, 0xaf, 0xae, 0x25, 0xac, 0xd2, 0xa1, 0xc5, 0x6f, 0xd8, 0xf6, 0x9a, 0xc7, 0x47,
|
||||
0x6b, 0xd5, 0xa0, 0x11, 0x64, 0xf1, 0xbb, 0x25, 0x3b, 0x03, 0x6b, 0x6f, 0xd7, 0x77, 0xfd, 0x91,
|
||||
0x71, 0xe0, 0xe9, 0xcf, 0x79, 0x0b, 0x0e, 0x57, 0x98, 0xd7, 0x42, 0x8f, 0x53, 0x51, 0x77, 0xd9,
|
||||
0x29, 0x9e, 0xed, 0x49, 0x2c, 0x37, 0xd5, 0xca, 0x5b, 0xc6, 0xb6, 0xd0, 0x6a, 0x1f, 0x4f, 0x2f,
|
||||
0x06, 0xf7, 0xf3, 0x4f, 0x73, 0x36, 0xff, 0x2f, 0x1b, 0x4e, 0x6a, 0x7e, 0xa7, 0x68, 0xa3, 0xae,
|
||||
0x0a, 0x8b, 0xeb, 0xbc, 0xb6, 0x96, 0x75, 0xe9, 0x1c, 0xae, 0x65, 0xff, 0xa1, 0x75, 0xa2, 0x1c,
|
||||
0xee, 0xdd, 0xf3, 0xc9, 0x62, 0x6b, 0x0a
|
||||
};
|
||||
/// \endcond
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// eap::peer
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user