9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

misc solaris fixes

Browse source
This commit is contained in:
Elizabeth Myers 2016-03-23 12:04:02 -05:00
parent a52c7a8e69
commit 757bab823c
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
librb/src/openssl.c
View file

@ -359,9 +359,10 @@ rb_init_ssl(void)
SSL_CTX_set_session_cache_mode(ssl_server_ctx, SSL_SESS_CACHE_OFF); SSL_CTX_set_session_cache_mode(ssl_server_ctx, SSL_SESS_CACHE_OFF);
SSL_CTX_set_cipher_list(ssl_server_ctx, librb_ciphers); SSL_CTX_set_cipher_list(ssl_server_ctx, librb_ciphers);
/* Set ECDHE on OpenSSL 1.00+, but make sure it's actually available because redhat are dicks /* Set ECDHE on OpenSSL 1.00+, but make sure it's actually available
and bastardise their OpenSSL for stupid reasons... */ * (it's not by default on Solaris or Red Hat... fuck Red Hat and Oracle)
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) && defined(NID_secp384r1) */
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) && !defined(OPENSSL_NO_ECDH)
EC_KEY *key = EC_KEY_new_by_curve_name(NID_secp384r1); EC_KEY *key = EC_KEY_new_by_curve_name(NID_secp384r1);
if (key) { if (key) {
SSL_CTX_set_tmp_ecdh(ssl_server_ctx, key); SSL_CTX_set_tmp_ecdh(ssl_server_ctx, key);

2
librb/src/ports.c
View file

@ -123,7 +123,7 @@ rb_setselect_ports(rb_fde_t *F, unsigned int type, PF * handler, void *client_da
int int
rb_select_ports(long delay) rb_select_ports(long delay)
{ {
int i, fd; int i;
unsigned int nget = 1; unsigned int nget = 1;
struct timespec poll_time; struct timespec poll_time;
struct timespec *p = NULL; struct timespec *p = NULL;