diff options
| author | dequis <dx@dxzone.com.ar> | 2017-01-06 11:47:24 -0300 |
|---|---|---|
| committer | dequis <dx@dxzone.com.ar> | 2017-01-06 11:47:24 -0300 |
| commit | 752f484c6ce4c2aa7284b617a59a8906b269281c (patch) | |
| tree | bff87af37a446abba172ab46afbb353cf9374c36 /src | |
| parent | 1d621d4643c20e9619de3add9747d25537cd8e31 (diff) | |
| download | irssi-752f484c6ce4c2aa7284b617a59a8906b269281c.zip | |
Add OPENSSL_NO_EC for solaris 11.3, see issue #598
Original patch by 'Slarky'
According to that ticket, the next major version of solaris won't need
this. Consider reverting this when solaris 11.3 stops being relevant.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/network-openssl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c index 7a1d6e34..1eb85341 100644 --- a/src/core/network-openssl.c +++ b/src/core/network-openssl.c @@ -646,7 +646,11 @@ static void set_server_temporary_key_info(TLS_REC *tls, SSL *ssl) #ifdef SSL_get_server_tmp_key // Show ephemeral key information. 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; +#endif char *ephemeral_key_algorithm = NULL; char *cname = NULL; 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)); break; +#ifndef OPENSSL_NO_EC case EVP_PKEY_EC: ec_key = EVP_PKEY_get1_EC_KEY(ephemeral_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); break; +#endif default: tls_rec_set_ephemeral_key_algorithm(tls, "Unknown"); |