|
|
@ -247,7 +247,12 @@ ssl_hmac_info_create(void)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
HMAC_CTX *hmac_ctx;
|
|
|
|
HMAC_CTX *hmac_ctx;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
|
|
|
hmac_ctx = HMAC_CTX_new();
|
|
|
|
hmac_ctx = HMAC_CTX_new();
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
hmac_ctx = (HMAC_CTX *) g_malloc(sizeof(HMAC_CTX), 1);
|
|
|
|
|
|
|
|
HMAC_CTX_init(hmac_ctx);
|
|
|
|
|
|
|
|
#endif
|
|
|
|
return hmac_ctx;
|
|
|
|
return hmac_ctx;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -260,7 +265,12 @@ ssl_hmac_info_delete(void *hmac)
|
|
|
|
hmac_ctx = (HMAC_CTX *) hmac;
|
|
|
|
hmac_ctx = (HMAC_CTX *) hmac;
|
|
|
|
if (hmac_ctx != 0)
|
|
|
|
if (hmac_ctx != 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
|
|
|
HMAC_CTX_free(hmac_ctx);
|
|
|
|
HMAC_CTX_free(hmac_ctx);
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
HMAC_CTX_cleanup(hmac_ctx);
|
|
|
|
|
|
|
|
g_free(hmac_ctx);
|
|
|
|
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -491,7 +501,12 @@ ssl_gen_key_xrdp1(int key_size_in_bits, char *exp, int exp_len,
|
|
|
|
|
|
|
|
|
|
|
|
const BIGNUM *n;
|
|
|
|
const BIGNUM *n;
|
|
|
|
const BIGNUM *d;
|
|
|
|
const BIGNUM *d;
|
|
|
|
|
|
|
|
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
|
|
|
RSA_get0_key(my_key, &n, NULL, &d);
|
|
|
|
RSA_get0_key(my_key, &n, NULL, &d);
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
n = my_key->n;
|
|
|
|
|
|
|
|
d = my_key->d;
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
if (error == 0)
|
|
|
|
if (error == 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|