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

Merge pull request #472 from proski/ssl

Browse Source 
Use static inline functions for OpenSSL 1.0 backport
This commit is contained in:
Itamar Reis Peixoto 2016-11-01 16:51:36 -02:00 committed by GitHub
commit 0d1cf12677
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
common/ssl_calls.c
View File

@ -40,6 +40,32 @@
#define OLD_RSA_GEN1 #define OLD_RSA_GEN1
#endif #endif
#if OPENSSL_VERSION_NUMBER < 0x10100000L
static inline HMAC_CTX *
HMAC_CTX_new()
{
HMAC_CTX *hmac_ctx = g_new(HMAC_CTX, 1);
HMAC_CTX_init(hmac_ctx);
return hmac_ctx;
}
static inline void
HMAC_CTX_free(HMAC_CTX *hmac_ctx)
{
HMAC_CTX_cleanup(hmac_ctx);
g_free(hmac_ctx);
}
static inline void
RSA_get0_key(const RSA *key, const BIGNUM **n, const BIGNUM **e,
const BIGNUM **d)
{
*n = key->n;
*d = key->d;
}
#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
/*****************************************************************************/ /*****************************************************************************/
int int
ssl_init(void) ssl_init(void)
@ -247,12 +273,7 @@ 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;
} }
@ -265,12 +286,7 @@ 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
} }
} }
@ -501,12 +517,7 @@ 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)
{ {