jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add backwards compatibility to OpenSSL < 1.1.0.

Browse Source
This commit is contained in:
Dominik George 2016-10-27 22:40:48 +02:00
parent 1b5fb8f1c8
commit e5cf45d1ac
No known key found for this signature in database
GPG Key ID: B79A3C16A0C4F296
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/ssl_calls.c
View File

@ -247,7 +247,12 @@ ssl_hmac_info_create(void)
{
HMAC_CTX *hmac_ctx;
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
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;
}
@ -260,7 +265,12 @@ ssl_hmac_info_delete(void *hmac)
hmac_ctx = (HMAC_CTX *) hmac;
if (hmac_ctx != 0)
{
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
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 *d;
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
RSA_get0_key(my_key, &n, NULL, &d);
#else
n = my_key->n;
d = my_key->d;
#endif
if (error == 0)
{