jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Only do checks for SSL_get_server_tmp_key in network-openssl.c.

Browse Source
This commit is contained in:
Alexander Færøy 2016-10-21 17:58:28 +02:00
parent 0a6e66f8b7
commit 322625b548
No known key found for this signature in database
GPG Key ID: E15081D5D3C3DB53
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/tls.c
View File

@ -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->certificate_fingerprint_algorithm);
g_free_and_null(tls_rec->not_after); g_free_and_null(tls_rec->not_after);
g_free_and_null(tls_rec->not_before); g_free_and_null(tls_rec->not_before);
#ifdef SSL_get_server_tmp_key
g_free_and_null(tls_rec->ephemeral_key_algorithm); g_free_and_null(tls_rec->ephemeral_key_algorithm);
#endif
if (tls_rec->certs != NULL) { if (tls_rec->certs != NULL) {
g_slist_foreach(tls_rec->certs, (GFunc)tls_cert_rec_free, 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); 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) void tls_rec_set_ephemeral_key_algorithm(TLS_REC *tls_rec, const char *algorithm)
{ {
g_return_if_fail(tls_rec != NULL); 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); g_return_if_fail(tls_rec != NULL);
tls_rec->ephemeral_key_size = size; tls_rec->ephemeral_key_size = size;
} }
#endif
void tls_rec_append_cert(TLS_REC *tls_rec, TLS_CERT_REC *tls_cert_rec) void tls_rec_append_cert(TLS_REC *tls_rec, TLS_CERT_REC *tls_cert_rec)
{ {

5
src/core/tls.h
View File

@ -43,10 +43,8 @@ struct _TLS_REC {
char *not_after; char *not_after;
char *not_before; char *not_before;
#ifdef SSL_get_server_tmp_key
char *ephemeral_key_algorithm; char *ephemeral_key_algorithm;
size_t ephemeral_key_size; size_t ephemeral_key_size;
#endif
GSList *certs; 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_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_after(TLS_REC *tls_rec, const char *not_after);
void tls_rec_set_not_before(TLS_REC *tls_rec, const char *not_before); 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_algorithm(TLS_REC *tls_rec, const char *algorithm);
void tls_rec_set_ephemeral_key_size(TLS_REC *tls_rec, size_t size); 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); void tls_rec_append_cert(TLS_REC *tls_rec, TLS_CERT_REC *tls_cert_rec);

2
src/fe-common/core/fe-tls.c
View File

@ -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); 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) if (tls->ephemeral_key_algorithm != NULL)
printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_EPHEMERAL_KEY, tls->ephemeral_key_size, tls->ephemeral_key_algorithm); printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_EPHEMERAL_KEY, tls->ephemeral_key_size, tls->ephemeral_key_algorithm);
else else
printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_EPHEMERAL_KEY_UNAVAILBLE); 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, 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); printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_TLS_PUBKEY_FINGERPRINT, tls->public_key_fingerprint, tls->public_key_fingerprint_algorithm);