aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-02-02 15:08:01 -05:00
Code

Merge pull request #604 from dequis/solaris

Browse Source 
Add OPENSSL_NO_EC for solaris 11.3, see issue #598
This commit is contained in:
ailin-nemui 2017-01-06 16:37:09 +01:00 committed by GitHub
commit a40d4492d2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/network-openssl.c
View File

@ -646,7 +646,11 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
#ifdef SSL_get_server_tmp_key #ifdef SSL_get_server_tmp_key
// Show ephemeral key information. // Show ephemeral key information.
EVP_PKEY *ephemeral_key = NULL; EVP_PKEY *ephemeral_key = NULL;
// OPENSSL_NO_EC is for solaris 11.3 (2016), github ticket #598
#ifndef OPENSSL_NO_EC
EC_KEY *ec_key = NULL; EC_KEY *ec_key = NULL;
#endif
char *ephemeral_key_algorithm = NULL; char *ephemeral_key_algorithm = NULL;
char *cname = NULL; char *cname = NULL;
int nid; int nid;
@ -658,6 +662,7 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key)); tls_rec_set_ephemeral_key_size(tls, EVP_PKEY_bits(ephemeral_key));
break; break;
#ifndef OPENSSL_NO_EC
case EVP_PKEY_EC: case EVP_PKEY_EC:
ec_key = EVP_PKEY_get1_EC_KEY(ephemeral_key); ec_key = EVP_PKEY_get1_EC_KEY(ephemeral_key);
nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec_key)); nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec_key));
@ -670,6 +675,7 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl)
g_free_and_null(ephemeral_key_algorithm); g_free_and_null(ephemeral_key_algorithm);
break; break;
#endif
default: default:
tls_rec_set_ephemeral_key_algorithm(tls, "Unknown"); tls_rec_set_ephemeral_key_algorithm(tls, "Unknown");