diff options
| author | Alexander Færøy <ahf@0x90.dk> | 2016-10-21 17:58:28 +0200 |
|---|---|---|
| committer | Alexander Færøy <ahf@0x90.dk> | 2016-10-22 22:04:33 +0200 |
| commit | 322625b5487527420cae0a6a1c0da8ecdc87fd4b (patch) | |
| tree | 78594a30667f9f17331047ff6493e6a4b96ecc8a | |
| parent | 0a6e66f8b794de76bd48bda199977b977a377e2e (diff) | |
| download | irssi-322625b5487527420cae0a6a1c0da8ecdc87fd4b.zip | |
Only do checks for SSL_get_server_tmp_key in network-openssl.c.
| -rw-r--r-- | src/core/tls.c | 5 | ||||
| -rw-r--r-- | src/core/tls.h | 5 | ||||
| -rw-r--r-- | src/fe-common/core/fe-tls.c | 2 |
3 files changed, 0 insertions, 12 deletions
diff --git a/src/core/tls.c b/src/core/tls.c index 8aad0c89..3bddd773 100644 --- a/src/core/tls.c +++ b/src/core/tls.c @@ -42,10 +42,7 @@ void tls_rec_free(TLS_REC *tls_rec) g_free_and_null(tls_rec->certificate_fingerprint_algorithm); g_free_and_null(tls_rec->not_after); g_free_and_null(tls_rec->not_before); - -#ifdef SSL_get_server_tmp_key g_free_and_null(tls_rec->ephemeral_key_algorithm); -#endif if (tls_rec->certs != NULL) { g_slist_foreach(tls_rec->certs, (GFunc)tls_cert_rec_free, NULL); @@ -130,7 +127,6 @@ void tls_rec_set_not_before(TLS_REC *tls_rec, const char *not_before) tls_rec->not_before = g_strdup(not_before); } -#ifdef SSL_get_server_tmp_key void tls_rec_set_ephemeral_key_algorithm(TLS_REC *tls_rec, const char *algorithm) { g_return_if_fail(tls_rec != NULL); @@ -142,7 +138,6 @@ void tls_rec_set_ephemeral_key_size(TLS_REC *tls_rec, size_t size) g_return_if_fail(tls_rec != NULL); tls_rec->ephemeral_key_size = size; } -#endif void tls_rec_append_cert(TLS_REC *tls_rec, TLS_CERT_REC *tls_cert_rec) { diff --git a/src/core/tls.h b/src/core/tls.h index 4991f7ed..9ba4ac47 100644 --- a/src/core/tls.h +++ b/src/core/tls.h @@ -43,10 +43,8 @@ struct _TLS_REC { char *not_after; char *not_before; -#ifdef SSL_get_server_tmp_key char *ephemeral_key_algorithm; size_t ephemeral_key_size; -#endif GSList *certs; }; @@ -75,11 +73,8 @@ void tls_rec_set_certificate_fingerprint(TLS_REC *tls_rec, const char *fingerpri void tls_rec_set_certificate_fingerprint_algorithm(TLS_REC *tls_rec, const char *algorithm); void tls_rec_set_not_after(TLS_REC *tls_rec, const char *not_after); void tls_rec_set_not_before(TLS_REC *tls_rec, const char *not_before); - -#ifdef SSL_get_server_tmp_key void tls_rec_set_ephemeral_key_algorithm(TLS_REC *tls_rec, const char *algorithm); void tls_rec_set_ephemeral_key_size(TLS_REC *tls_rec, size_t size); -#endif void tls_rec_append_cert(TLS_REC *tls_rec, TLS_CERT_REC *tls_cert_rec); diff --git a/src/fe-common/core/fe-tls.c b/src/fe-common/core/fe-tls.c index 7a7c537a..608666f0 100644 --- a/src/fe-common/core/fe-tls.c +++ b/src/fe-common/core/fe-tls.c @@ -59,12 +59,10 @@ static void tls_handshake_finished(SERVER_REC *server, TLS_REC *tls) printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_PROTOCOL_VERSION, tls->protocol_version, tls->cipher_size, tls->cipher); -#ifdef SSL_get_server_tmp_key if (tls->ephemeral_key_algorithm != NULL) printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_EPHEMERAL_KEY, tls->ephemeral_key_size, tls->ephemeral_key_algorithm); else printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_EPHEMERAL_KEY_UNAVAILBLE); -#endif printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_PUBKEY, tls->public_key_size, tls->public_key_algorithm, tls->not_before, tls->not_after); printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_PUBKEY_FINGERPRINT, tls->public_key_fingerprint, tls->public_key_fingerprint_algorithm); |