SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix building against openssl 1.1.0 

Fixes #1759
This commit is contained in:
Patrick Griffis 2016-06-26 14:37:25 -04:00
parent 7281da8b2c
commit 439ff094ce
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -373,7 +373,7 @@ dnl *********************************************************************
AS_IF([test "$openssl" != no], [ AS_IF([test "$openssl" != no], [
PKG_CHECK_MODULES(OPENSSL, [openssl], [ PKG_CHECK_MODULES(OPENSSL, [openssl >= 0.9.8], [
AC_DEFINE(USE_OPENSSL) AC_DEFINE(USE_OPENSSL)
openssl=yes openssl=yes
COMMON_LIBS="$COMMON_LIBS $OPENSSL_LIBS" COMMON_LIBS="$COMMON_LIBS $OPENSSL_LIBS"

16
src/common/server.c
View File

@ -466,19 +466,22 @@ ssl_cb_verify (int ok, X509_STORE_CTX * ctx)
char subject[256]; char subject[256];
char issuer[256]; char issuer[256];
char buf[512]; char buf[512];
X509 *current_cert = X509_STORE_CTX_get_current_cert (ctx);
if (!current_cert)
return TRUE;
X509_NAME_oneline (X509_get_subject_name (ctx->current_cert), subject, X509_NAME_oneline (X509_get_subject_name (current_cert),
sizeof (subject)); subject, sizeof (subject));
X509_NAME_oneline (X509_get_issuer_name (ctx->current_cert), issuer, X509_NAME_oneline (X509_get_issuer_name (current_cert),
sizeof (issuer)); issuer, sizeof (issuer));
g_snprintf (buf, sizeof (buf), "* Subject: %s", subject); g_snprintf (buf, sizeof (buf), "* Subject: %s", subject);
EMIT_SIGNAL (XP_TE_SSLMESSAGE, g_sess, buf, NULL, NULL, NULL, 0); EMIT_SIGNAL (XP_TE_SSLMESSAGE, g_sess, buf, NULL, NULL, NULL, 0);
g_snprintf (buf, sizeof (buf), "* Issuer: %s", issuer); g_snprintf (buf, sizeof (buf), "* Issuer: %s", issuer);
EMIT_SIGNAL (XP_TE_SSLMESSAGE, g_sess, buf, NULL, NULL, NULL, 0); EMIT_SIGNAL (XP_TE_SSLMESSAGE, g_sess, buf, NULL, NULL, NULL, 0);
return (TRUE); /* always ok */ return TRUE;
} }
static int static int
@ -638,7 +641,8 @@ conn_fail:
return (0); /* remove it (0) */ return (0); /* remove it (0) */
} else } else
{ {
if (serv->ssl->session && serv->ssl->session->time + SSLTMOUT < time (NULL)) SSL_SESSION *session = SSL_get_session (serv->ssl);
if (session && SSL_SESSION_get_time (session) + SSLTMOUT < time (NULL))
{ {
g_snprintf (buf, sizeof (buf), "SSL handshake timed out"); g_snprintf (buf, sizeof (buf), "SSL handshake timed out");
EMIT_SIGNAL (XP_TE_CONNFAIL, serv->server_session, buf, NULL, EMIT_SIGNAL (XP_TE_CONNFAIL, serv->server_session, buf, NULL,