add patch from upstream repo; clientlib: close connection after failed rekey.

From Brad.
This commit is contained in:
sthen 2009-10-12 17:28:11 +00:00
parent de918bd5ec
commit d1906220bb
4 changed files with 30 additions and 3 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.26 2009/08/11 21:17:21 sthen Exp $
# $OpenBSD: Makefile,v 1.27 2009/10/12 17:29:34 sthen Exp $
COMMENT= toolkit for the development of SILC applications
DISTNAME= silc-toolkit-1.1.10
PKGNAME= ${DISTNAME}p0
CATEGORIES= devel
MASTER_SITES= http://www.silcnet.org/download/toolkit/sources/

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-lib_silcclient_client_connect_c,v 1.1 2009/10/12 17:29:34 sthen Exp $
--- lib/silcclient/client_connect.c.orig Mon Oct 5 20:17:10 2009
+++ lib/silcclient/client_connect.c Mon Oct 5 20:18:36 2009
@@ -262,6 +262,9 @@ static void silc_client_rekey_completion(SilcSKE ske,
silc_ske_free(conn->internal->ske);
conn->internal->ske = NULL;
silc_fsm_finish(fsm);
+
+ /* Close connection */
+ silc_client_close_connection(client, conn);
return;
}

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.53 2009/08/11 21:20:02 sthen Exp $
# $OpenBSD: Makefile,v 1.54 2009/10/12 17:28:11 sthen Exp $
COMMENT= Secure Internet Live Conferencing (SILC) client
DISTNAME= silc-client-1.1.8
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= net
HOMEPAGE= http://www.silcnet.org/

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-lib_silcclient_client_connect_c,v 1.1 2009/10/12 17:28:11 sthen Exp $
--- lib/silcclient/client_connect.c.orig Mon Oct 12 13:06:36 2009
+++ lib/silcclient/client_connect.c Mon Oct 12 13:11:08 2009
@@ -262,6 +262,9 @@ static void silc_client_rekey_completion(SilcSKE ske,
silc_ske_free(conn->internal->ske);
conn->internal->ske = NULL;
silc_fsm_finish(fsm);
+
+ /* Close connection */
+ silc_client_close_connection(client, conn);
return;
}