mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-core: fix licensing key length

Browse Source
This commit is contained in:
Marc-André Moreau 2013-02-05 09:30:53 -05:00
parent 4cd720416a
commit d2873081ea
2 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
libfreerdp/core/license.c
View File

@ -383,21 +383,12 @@ void license_generate_hwid(rdpLicense* license)
void license_encrypt_premaster_secret(rdpLicense* license) void license_encrypt_premaster_secret(rdpLicense* license)
{ {
BYTE* EncryptedPremasterSecret; BYTE* Exponent;
BYTE* Modulus;
#ifdef LICENSE_NULL_RANDOM int ModulusLength;
EncryptedPremasterSecret = (BYTE*) malloc(MODULUS_MAX_SIZE);
ZeroMemory(EncryptedPremasterSecret, MODULUS_MAX_SIZE);
license->EncryptedPremasterSecret->type = BB_RANDOM_BLOB;
license->EncryptedPremasterSecret->length = PREMASTER_SECRET_LENGTH;
license->EncryptedPremasterSecret->data = EncryptedPremasterSecret;
#else
BYTE* modulus;
BYTE* exponent;
int key_length;
rdpSettings* settings; rdpSettings* settings;
rdpCertificate *certificate; rdpCertificate* certificate;
BYTE* EncryptedPremasterSecret;
if (license->ServerCertificate->length) if (license->ServerCertificate->length)
{ {
@ -410,25 +401,39 @@ void license_encrypt_premaster_secret(rdpLicense* license)
certificate_read_server_certificate(certificate, settings->ServerCertificate, settings->ServerCertificateLength); certificate_read_server_certificate(certificate, settings->ServerCertificate, settings->ServerCertificateLength);
} }
exponent = certificate->cert_info.exponent; Exponent = certificate->cert_info.exponent;
modulus = certificate->cert_info.Modulus; Modulus = certificate->cert_info.Modulus;
key_length = certificate->cert_info.ModulusLength; ModulusLength = certificate->cert_info.ModulusLength;
CopyMemory(license->Exponent, Exponent, 4);
license->ModulusLength = ModulusLength;
license->Modulus = (BYTE*) malloc(ModulusLength);
ZeroMemory(license->Modulus, ModulusLength);
#ifdef WITH_DEBUG_LICENSE #ifdef WITH_DEBUG_LICENSE
printf("Modulus (%d bits):\n", key_length * 8); printf("Modulus (%d bits):\n", ModulusLength * 8);
winpr_HexDump(modulus, key_length); winpr_HexDump(Modulus, ModulusLength);
printf("\n"); printf("\n");
printf("Exponent:\n"); printf("Exponent:\n");
winpr_HexDump(exponent, 4); winpr_HexDump(Exponent, 4);
printf("\n"); printf("\n");
#endif #endif
#ifdef LICENSE_NULL_RANDOM
EncryptedPremasterSecret = (BYTE*) malloc(MODULUS_MAX_SIZE);
ZeroMemory(EncryptedPremasterSecret, MODULUS_MAX_SIZE);
license->EncryptedPremasterSecret->type = BB_RANDOM_BLOB;
license->EncryptedPremasterSecret->length = PREMASTER_SECRET_LENGTH;
license->EncryptedPremasterSecret->data = EncryptedPremasterSecret;
#else
EncryptedPremasterSecret = (BYTE*) malloc(MODULUS_MAX_SIZE); EncryptedPremasterSecret = (BYTE*) malloc(MODULUS_MAX_SIZE);
ZeroMemory(EncryptedPremasterSecret, MODULUS_MAX_SIZE); ZeroMemory(EncryptedPremasterSecret, MODULUS_MAX_SIZE);
crypto_rsa_public_encrypt(license->PremasterSecret, PREMASTER_SECRET_LENGTH, crypto_rsa_public_encrypt(license->PremasterSecret, PREMASTER_SECRET_LENGTH,
key_length, modulus, exponent, EncryptedPremasterSecret); ModulusLength, Modulus, Exponent, EncryptedPremasterSecret);
license->EncryptedPremasterSecret->type = BB_RANDOM_BLOB; license->EncryptedPremasterSecret->type = BB_RANDOM_BLOB;
license->EncryptedPremasterSecret->length = PREMASTER_SECRET_LENGTH; license->EncryptedPremasterSecret->length = PREMASTER_SECRET_LENGTH;
@ -582,18 +587,25 @@ void license_write_binary_blob(STREAM* s, LICENSE_BLOB* blob)
stream_write(s, blob->data, blob->length); /* blobData */ stream_write(s, blob->data, blob->length); /* blobData */
} }
void license_write_padded_binary_blob(STREAM* s, LICENSE_BLOB* blob) void license_write_encrypted_premaster_secret_blob(STREAM* s, LICENSE_BLOB* blob, UINT32 ModulusLength)
{ {
UINT16 pad_len; UINT32 length;
length = ModulusLength + 8;
if (blob->length > ModulusLength)
{
printf("license_write_encrypted_premaster_secret_blob: invalid blob\n");
return;
}
pad_len = 72 % blob->length;
stream_write_UINT16(s, blob->type); /* wBlobType (2 bytes) */ stream_write_UINT16(s, blob->type); /* wBlobType (2 bytes) */
stream_write_UINT16(s, blob->length + pad_len); /* wBlobLen (2 bytes) */ stream_write_UINT16(s, length); /* wBlobLen (2 bytes) */
if (blob->length > 0) if (blob->length > 0)
stream_write(s, blob->data, blob->length); /* blobData */ stream_write(s, blob->data, blob->length); /* blobData */
stream_write_zero(s, pad_len); stream_write_zero(s, length - blob->length);
} }
/** /**
@ -908,7 +920,7 @@ void license_write_new_license_request_packet(rdpLicense* license, STREAM* s)
stream_write_UINT32(s, PreferredKeyExchangeAlg); /* PreferredKeyExchangeAlg (4 bytes) */ stream_write_UINT32(s, PreferredKeyExchangeAlg); /* PreferredKeyExchangeAlg (4 bytes) */
stream_write_UINT32(s, PlatformId); /* PlatformId (4 bytes) */ stream_write_UINT32(s, PlatformId); /* PlatformId (4 bytes) */
stream_write(s, license->ClientRandom, 32); /* ClientRandom (32 bytes) */ stream_write(s, license->ClientRandom, 32); /* ClientRandom (32 bytes) */
license_write_padded_binary_blob(s, license->EncryptedPremasterSecret); /* EncryptedPremasterSecret */ license_write_encrypted_premaster_secret_blob(s, license->EncryptedPremasterSecret, license->ModulusLength); /* EncryptedPremasterSecret */
license_write_binary_blob(s, license->ClientUserName); /* ClientUserName */ license_write_binary_blob(s, license->ClientUserName); /* ClientUserName */
license_write_binary_blob(s, license->ClientMachineName); /* ClientMachineName */ license_write_binary_blob(s, license->ClientMachineName); /* ClientMachineName */
@ -1106,6 +1118,7 @@ void license_free(rdpLicense* license)
{ {
if (license) if (license)
{ {
free(license->Modulus);
certificate_free(license->certificate); certificate_free(license->certificate);
license_free_product_info(license->ProductInfo); license_free_product_info(license->ProductInfo);
license_free_binary_blob(license->ErrorInfo); license_free_binary_blob(license->ErrorInfo);

5
libfreerdp/core/license.h
View File

@ -174,9 +174,10 @@ struct rdp_license
LICENSE_STATE state; LICENSE_STATE state;
struct rdp_rdp* rdp; struct rdp_rdp* rdp;
struct rdp_certificate* certificate; struct rdp_certificate* certificate;
BYTE* Modulus;
UINT32 ModulusLength;
BYTE Exponent[4];
BYTE HardwareId[HWID_LENGTH]; BYTE HardwareId[HWID_LENGTH];
BYTE Modulus[MODULUS_MAX_SIZE];
BYTE Exponent[EXPONENT_MAX_SIZE];
BYTE ClientRandom[CLIENT_RANDOM_LENGTH]; BYTE ClientRandom[CLIENT_RANDOM_LENGTH];
BYTE ServerRandom[SERVER_RANDOM_LENGTH]; BYTE ServerRandom[SERVER_RANDOM_LENGTH];
BYTE MasterSecret[MASTER_SECRET_LENGTH]; BYTE MasterSecret[MASTER_SECRET_LENGTH];