- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Update NEWS and ChangeLog for next release
by alex＠arthur.barton.de 12 Aug '09

12 Aug '09

Module: ngircd.git Branch: master Commit: a7eef6666bf534c6cb3c395db429fb80bb8bee19 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a7eef666… Author: Alexander Barton <alex(a)barton.de> Date: Wed Aug 12 14:48:33 2009 +0200 Update NEWS and ChangeLog for next release --- ChangeLog | 12 ++++++++++++ NEWS | 6 ++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index adba5f6..2300d1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,18 @@ -- ChangeLog -- +ngIRCd Release 14.2 + + - Updated doc/Platforms.txt and include new script contrib/platformtest.sh + to ease generating platform reports. + - Fix connection information for already registered connections. + - Enforce upper limit on maximum number of handled commands. This implements + a throttling scheme: an IRC client can send up to 3 commands or 256 bytes + per second before a one second pause is enforced. + - Fix connection counter. + - Fix a few error handling glitches for SSL/TLS connections. + - Minor fixes to manual pages and documentation. + ngIRCd Release 14.1 (2009-05-05) - Security: fix remotely triggerable crash in SSL/TLS code. diff --git a/NEWS b/NEWS index 25494c2..d386de2 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,12 @@ -- NEWS -- +ngIRCd Release 14.2 + + - Enforce upper limit on maximum number of handled commands. This implements + a throttling scheme: an IRC client can send up to 3 commands or 256 bytes + per second before a one second pause is enforced. + ngIRCd Release 14.1 (2009-05-05) - Security: fix remotely triggerable crash in SSL/TLS code.

1 0

Alexander Barton : Updated doc/Platforms.txt
by alex＠arthur.barton.de 04 Aug '09

04 Aug '09

Module: ngircd.git Branch: master Commit: 56a8abc253d0565a75fb9066ec933dc7db96b93a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=56a8abc2… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 4 22:53:38 2009 +0200 Updated doc/Platforms.txt --- doc/Platforms.txt | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 32eefdb..8a1282e 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2008 Alexander Barton + (c)2001-2009 Alexander Barton alex(a)barton.de, http://www.barton.de/ ngIRCd is free software and published under the @@ -31,26 +31,28 @@ hppa/unknown/openbsd3.5 gcc 2.95.3 CVSHEAD 04-05-25 alex Y Y Y Y hppa1.1/unknown/linux-gnu gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y hppa2.0/unknown/linux-gnu gcc 3.3.5 13~rc1 08-12-02 alex Y Y Y Y hppa2.0w-hp-hpux11.11 gcc 4.2.3 14.1 09-07-22 goetz Y Y Y Y -i386/apple/darwin9.5.1 gcc 4.0.1 13~rc1 08-12-02 alex Y Y Y Y (3) +i386/apple/darwin9.7.0 gcc 4.0.1 14.1 09-08-04 alex Y Y Y Y (3) +i386/apple/darwin10.0.0b2 gcc 4.2.1 14.1 09-07-27 alex Y Y Y Y (3) i386/pc/solaris2.9 gcc 3.2.2 CVSHEAD 04-02-24 alex Y Y Y Y -i386/pc/solaris2.11 gcc 3.4.3 13~rc1 08-12-03 alex Y Y Y Y (4) +i386/pc/solaris2.11 gcc 3.4.3 14.1 09-08-03 alex Y Y Y Y (4) i386/unknown/freebsd5.2.1 gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y i386/unknown/freebsd6.0 gcc 3.4.4 0.10.0-p1 06-08-04 alex Y Y Y Y (3) i386/unknown/freebsd6.1 gcc 3.4.4 CVSHEAD 06-05-07 fw Y Y Y Y (3) -i386/unknown/freebsd6.2 gcc 3.4.6 13~rc1 08-12-04 alex Y Y Y Y (3) -i386/unknown/freebsd7.0 gcc 4.2.1 13~rc1 08-12-04 alex Y Y Y Y (3) +i386/unknown/freebsd6.2 gcc 3.4.6 14.1 09-07-27 alex Y Y Y Y (3) +i386/unknown/freebsd7.0 gcc 4.2.1 14.1 09-07-28 alex Y Y Y Y (3) +i386/unknown/freebsd7.2 gcc 4.2.1 14.1 09-08-03 alex Y Y Y Y (3) i386/unknown/gnu0.3 gcc 3.3.3 0.8.0 04-05-30 alex Y Y n Y -i686/unknown/gnu0.3 gcc 4.3.1 13~rc1 08-12-05 alex Y Y Y Y +i686/unknown/gnu0.3 gcc 4.3.1 14.1 09-07-28 alex Y Y Y Y i386/unknown/netbsdelf1.6.1 gcc 2.95.3 CVSHEAD 04-02-24 alex Y Y Y Y i386/unknown/netbsdelf3.0.1 gcc 3.3.3 0.10.0-p1 06-08-30 alex Y Y Y Y (3) -i386/unknown/netbsdelf4.0 gcc 4.1.2 13~rc1 08-12-05 alex Y Y Y Y (3) +i386/unknown/netbsdelf4.0 gcc 4.1.2 14.1 09-07-28 alex Y Y Y Y (3) i386/unknown/openbsd3.9 gcc 3.3.5 0.10.0-p1 06-08-30 alex Y Y Y Y (3) -i386/unknown/openbsd4.1 gcc 3.3.5 13~rc1 08-12-05 alex Y Y Y Y (3) +i386/unknown/openbsd4.1 gcc 3.3.5 14.1 09-07-28 alex Y Y Y Y (3) i686/pc/cygwin gcc 3.3.1 0.8.0 04-05-30 alex Y Y n Y i686/pc/linux-gnu gcc 2.95.4 0.8.0 04-05-30 alex Y Y Y Y (1) -i686/pc/linux-gnu gcc 3.3.5 13~rc1 08-12-05 alex Y Y Y Y (1) +i686/pc/linux-gnu gcc 3.3.5 14.1 09-08-04 alex Y Y Y Y (1) i386/pc/linux-gnu gcc 4.1.2 13~rc1 08-12-05 alex Y Y Y Y (1) -i386/pc/linux-gnu gcc 4.3.2 13~rc1 08-12-05 alex Y Y Y Y (1) +i686/pc/linux-gnu gcc 4.3.2 14.1 09-08-04 alex Y Y Y Y (1) m68k/apple/aux3.1.1 Orig. A/UX 0.7.x-CVS 03-04-22 alex Y Y Y Y (2) m68k/hp/hp-ux9.10 Orig. HPUX 0.7.x-CVS 03-04-30 goetz Y Y Y Y m88k/dg/dgux5.4R3.10 gcc 2.5.8 CVSHEAD 04-03-15 alex Y Y ? ? @@ -63,13 +65,13 @@ powerpc/unknown/openbsd3.6 gcc 2.95.3 0.10.0 06-10-08 alex Y Y n Y sparc/sun/solaris2.6 gcc 2.95.3 0.7.x-CVS 03-04-22 alex Y Y Y Y sparc/sun/solaris2.7 gcc 3.3 0.8.0 04-05-30 alex Y Y Y Y sparc/unkn./netbsdelf1.6.1 gcc 2.95.3 0.8.0 04-05-30 alex Y Y Y Y -x86_64/unknown/linux-gnu 4.3.2 13~rc1 08-12-05 alex Y Y Y Y (5) +x86_64/unknown/linux-gnu gcc 4.3.2 14.1 09-08-04 alex Y Y Y Y (1) Notes ~~~~~ -(1) i686/pc/linux-gnu: +(1) i686/pc/linux-gnu & x86_64/unknown/linux-gnu: ngIRCd has been tested with various Linux distributions, such as SuSE, RedHat, Debian, and Gentoo using Kernels 2.2.x, 2.4.x and 2.6.x with various versions of the GNU C compiler (starting with 2.95.x and up to

1 0

Alexander Barton : New script contrib/platformtest.sh
by alex＠arthur.barton.de 04 Aug '09

04 Aug '09

Module: ngircd.git Branch: master Commit: 21bb2bd65808dbeacc5959a9ac3bc4fd9b3087c7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=21bb2bd6… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 4 22:30:59 2009 +0200 New script contrib/platformtest.sh This script analyzes the build process of ngIRCd and generates output suitable for inclusion in doc/Platforms.txt. --- contrib/README | 3 + contrib/platformtest.sh | 143 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 0 deletions(-) diff --git a/contrib/README b/contrib/README index 353e2bb..6593fdd 100644 --- a/contrib/README +++ b/contrib/README @@ -28,5 +28,8 @@ ngircd-redhat.init ngircd.spec - RPM "spec" file. +platformtest.sh + - Build ngIRCd and output a "result line" suitable for doc/Platforms.txt. + systrace.policy - Systrace policy file for OpenBSD (and probably NetBSD). diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh new file mode 100755 index 0000000..aee7f29 --- /dev/null +++ b/contrib/platformtest.sh @@ -0,0 +1,143 @@ +#!/bin/sh +# +# ngIRCd -- The Next Generation IRC Daemon +# Copyright (c)2001-2009 Alexander Barton <alex(a)barton.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. +# + +# This script analyzes the build process of ngIRCd and generates output +# suitable for inclusion in doc/Platforms.txt -- please send reports +# to the ngIRCd mailing list: <ngircd-ml(a)ngircd.barton.de>. + +NAME=`basename "$0"` +VERBOSE= + +PLATFORM= +COMPILER="unknown" +VERSION="unknown" +DATE=`date "+%y-%m-%d"` + +CONFIGURE= +MAKE= +CHECK= +RUN= +COMMENT= + +while [ $# -gt 0 ]; do + case "$1" in + "-v") + VERBOSE=1 + ;; + *) + echo "Usage: $NAME [-v]" + exit 2 + esac + shift +done + +echo "$NAME: Checking ngIRCd base source directory ..." +grep "ngIRCd" ./ChangeLog >/dev/null 2>&1 +if [ $? -ne 0 ]; then + grep "ngIRCd" ../ChangeLog >/dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "$NAME: ngIRCd base source directory not found!?" + exit 1 + fi + cd .. +fi + +echo "$NAME: Checking for ./configure script ..." +if [ ! -e ./configure ]; then + echo "$NAME: Not found. Running ./autogen.sh ..." + [ -n "$VERBOSE" ] && ./autogen.sh || ./autogen.sh >/dev/null +fi + +if [ -e ./configure ]; then + echo "$NAME: Running \"./configure\" script ..." + [ -n "$VERBOSE" ] && ./configure || ./configure >/dev/null + if [ $? -eq 0 -a -e ./Makefile ]; then + CONFIGURE=1 + echo "$NAME: Running \"make\" ..." + [ -n "$VERBOSE" ] && make || make >/dev/null + if [ $? -eq 0 -a -x src/ngircd/ngircd ]; then + MAKE=1 + echo "$NAME: Running \"make check\" ..." + [ -n "$VERBOSE" ] && make check || make check >/dev/null + if [ $? -eq 0 ]; then + CHECK=1 + RUN=$CHECK + else + ./src/ngircd/ngircd --help 2>/dev/null \ + | grep "^ngircd" >/dev/null + [ $? -eq 0 ] && RUN=1 + fi + fi + fi +fi + +# Get target platform information +if [ -r "src/config.h" ]; then + CPU=`grep "TARGET_CPU" "src/config.h" | cut -d'"' -f2` + OS=`grep "TARGET_OS" "src/config.h" | cut -d'"' -f2` + VENDOR=`grep "TARGET_VENDOR" "src/config.h" | cut -d'"' -f2` + PLATFORM="$CPU/$VENDOR/$OS" +fi +if [ -z "$PLATFORM" ]; then + PLATFORM="`uname 2>/dev/null` `uname -r 2>/dev/null`, `uname -m 2>/dev/null`" +fi + +# Get compiler information +if [ -r "Makefile" ]; then + eval $(grep "^CC = " Makefile | sed -e 's/ //g') + $CC --version 2>&1 | grep -i "GCC" >/dev/null + if [ $? -eq 0 ]; then + COMPILER=$($CC --version | head -n 1 | awk "{ print \$3 }" \ + | cut -d'-' -f1) + COMPILER="gcc $COMPILER" + fi +fi + +# Get ngIRCd version information +if [ -d ".git" ]; then + VERSION=`git log --abbrev-commit --pretty=oneline HEAD~1.. \ + | cut -d' ' -f1 | tr -d '.'` +elif [ -r "Makefile" ]; then + eval $(grep "^VERSION = " Makefile | sed -e 's/ //g') +fi +[ -n "$VERSION" ] || VERSION="unknown" + +# Get IO interface information +if [ "$OS" = "linux-gnu" ]; then + COMMENT="(1)" +else + grep "^#define HAVE_SYS_DEVPOLL_H 1" src/config.h >/dev/null 2>&1 + [ $? -eq 0 ] && COMMENT="(4)" + grep "^#define HAVE_EPOLL_CREATE 1" src/config.h >/dev/null 2>&1 + [ $? -eq 0 ] && COMMENT="(5)" + grep "^#define HAVE_KQUEUE 1" src/config.h >/dev/null 2>&1 + [ $? -eq 0 ] && COMMENT="(3)" +fi + +[ -n "$CONFIGURE" ] && C="Y" || C="N" +[ -n "$MAKE" ] && M="Y" || M="N" +[ -n "$CHECK" ] && T="Y" || T="N" +[ -n "$RUN" ] && R="Y" || R="N" +[ -n "$COMMENT" ] && COMMENT=" $COMMENT" + +echo +echo " the executable works (\"runs\") as expected --+" +echo " tests run successfully (\"make check\") --+ |" +echo " ngIRCd compiles (\"make\") --+ | |" +echo " ./configure works --+ | | |" +echo " | | | |" +echo "Platform Compiler ngIRCd Date Tester C M T R See" +echo "--------------------------- ------------ ---------- -------- ------ - - - - ---" +printf "%-27s %-12s %-10s %s %-6s %s %s %s %s%s" \ + "$PLATFORM" "$COMPILER" "$VERSION" "$DATE" "$USER" \ + "$C" "$M" "$T" "$R" "$COMMENT" +echo; echo

1 0

Florian Westphal : doc/Platforms.txt: ngircd builds on hppa2.0w-hp-hpux11. 11 target
by fw＠arthur.barton.de 23 Jul '09

23 Jul '09

Module: ngircd.git Branch: master Commit: bddfd67550d65402eb93e5ce152438bd513acf40 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bddfd675… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Jul 22 22:06:36 2009 +0200 doc/Platforms.txt: ngircd builds on hppa2.0w-hp-hpux11.11 target Goetz Hoffart reports successful compile on HPUX/HPPA (on ngircd mailing list): Target: hppa2.0w-hp-hpux11.11 Compiler: gcc Compiler flags: -g -O2 -pipe -W -Wall -Wpointer-arith -Wstrict-prototypes -fstack-protector -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR='"$(sysconfdir)"' Libraries: -lz -lnsl Syslog support: yes Enable debug code: no zlib compression: yes IRC sniffer: no Use TCP Wrappers: no Strict RFC mode: no Zeroconf support: no IRC+ protocol: yes IDENT support: no I/O backend: "poll()" IPv6 protocol: no SSL support: no --- doc/Platforms.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index a77cc88..32eefdb 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -30,6 +30,7 @@ alpha/unknown/netbsd3.0 gcc 3.3.3 CVSHEAD 06-05-07 fw Y Y Y Y (3) hppa/unknown/openbsd3.5 gcc 2.95.3 CVSHEAD 04-05-25 alex Y Y Y Y hppa1.1/unknown/linux-gnu gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y hppa2.0/unknown/linux-gnu gcc 3.3.5 13~rc1 08-12-02 alex Y Y Y Y +hppa2.0w-hp-hpux11.11 gcc 4.2.3 14.1 09-07-22 goetz Y Y Y Y i386/apple/darwin9.5.1 gcc 4.0.1 13~rc1 08-12-02 alex Y Y Y Y (3) i386/pc/solaris2.9 gcc 3.2.2 CVSHEAD 04-02-24 alex Y Y Y Y i386/pc/solaris2.11 gcc 3.4.3 13~rc1 08-12-03 alex Y Y Y Y (4) @@ -74,7 +75,7 @@ Notes various versions of the GNU C compiler (starting with 2.95.x and up to version 4.3.x). The eldest glibc used was glibc-2.0.7. ngIRCd compiled and run on all these systems without problems. - Actual Linux kernels (2.6.x) and glic's support the epoll() IO interface. + Actual Linux kernels (2.6.x) and glibc's support the epoll() IO interface. (2) This compiler is an pre-ANSI C compiler, therefore the source code is automatically converted using the included ansi2knr tool while building.

1 0

[SCM] ngIRCd - Next Generation IRC Server branch, master, updated. rel-14-1-12-g805bf03
by alex＠arthur.barton.de 17 Jul '09

17 Jul '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "ngIRCd - Next Generation IRC Server". The branch, master has been updated via 805bf0349064a1a1f6412c19a3a3bcb7fb7ccbe1 (commit) from 63cbc6cd4262971d0ef795d2404bc545413e159a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 805bf0349064a1a1f6412c19a3a3bcb7fb7ccbe1 Author: Alexander Barton <alex(a)barton.de> Date: Fri Jul 17 16:16:04 2009 +0200 Client_CheckID(): fix connection information This patch fixes the following silly log messages: 'ID "XXX" already registered (on connection -1)!' If the ID is already registered on a local connection, the local connection ID is printed; and if the ID is connected via a remote server, "via network" is displayed. ----------------------------------------------------------------------- Summary of changes: src/ngircd/client.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- ngIRCd - Next Generation IRC Server

1 0

Florian Westphal : conn.c: fix NumConnections imbalance
by fw＠arthur.barton.de 17 Mai '09

17 Mai '09

Module: ngircd.git Branch: master Commit: 9b1c47220fafeacda1e83b4732e1c8574062aac6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9b1c4722… Author: Florian Westphal <fw(a)strlen.de> Date: Sun May 17 21:32:53 2009 +0200 conn.c: fix NumConnections imbalance New_Server() can call Conn_Close() in its error paths, but that function decrements the number of current active connections. Thus we need to increment it earlier. --- src/ngircd/conn.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 4c03877..77a2bc1 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1696,6 +1696,8 @@ New_Server( int Server , ng_ipaddr_t *dest) return; } + /* Conn_Close() decrements this counter again */ + NumConnections++; Client_SetIntroducer( c, c ); Client_SetToken( c, TOKEN_OUTBOUND ); @@ -1725,7 +1727,6 @@ New_Server( int Server , ng_ipaddr_t *dest) return; } #endif - NumConnections++; LogDebug("Registered new connection %d on socket %d (%ld in total).", new_sock, My_Connections[new_sock].sock, NumConnections); Conn_OPTION_ADD( &My_Connections[new_sock], CONN_ISCONNECTING );

1 0

Florian Westphal : SSL/TLS: fix error handling when ssl ctx init for outgoing server link fails
by fw＠arthur.barton.de 17 Mai '09

17 Mai '09

Module: ngircd.git Branch: master Commit: 8e2c5816eec58a5de63399a54773dda6a5729c36 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8e2c5816… Author: Florian Westphal <fw(a)strlen.de> Date: Sun May 17 21:27:27 2009 +0200 SSL/TLS: fix error handling when ssl ctx init for outgoing server link fails --- src/ngircd/conn.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index c6095a3..4c03877 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1722,6 +1722,7 @@ New_Server( int Server , ng_ipaddr_t *dest) Conn_Close( new_sock, "Could not initialize SSL for outgoing connection", NULL, false ); Init_Conn_Struct( new_sock ); Conf_Server[Server].conn_id = NONE; + return; } #endif NumConnections++;

1 0

Florian Westphal : SSL/TLS: fix error path in gnutls ssl ctx allocation
by fw＠arthur.barton.de 17 Mai '09

17 Mai '09

Module: ngircd.git Branch: master Commit: f31c3a3aa283bd6a34386e3c2fcdcad9ab36e5c4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f31c3a3a… Author: Florian Westphal <fw(a)strlen.de> Date: Sun May 17 21:18:04 2009 +0200 SSL/TLS: fix error path in gnutls ssl ctx allocation --- src/ngircd/conn-ssl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index fbf796c..ae1646c 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -406,6 +406,7 @@ ConnSSL_Init_SSL(CONNECTION *c) if (ret < 0) { Log(LOG_ERR, "gnutls_set_default_priority: %s", gnutls_strerror(ret)); ConnSSL_Free(c); + return false; } /* * The intermediate (long) cast is here to avoid a warning like: @@ -418,6 +419,7 @@ ConnSSL_Init_SSL(CONNECTION *c) if (ret < 0) { Log(LOG_ERR, "gnutls_credentials_set: %s", gnutls_strerror(ret)); ConnSSL_Free(c); + return false; } gnutls_dh_set_prime_bits(c->ssl_state.gnutls_session, DH_BITS); #endif

1 0

Florian Westphal : manpage: move SSLConnect option to the right section
by fw＠arthur.barton.de 17 Mai '09

17 Mai '09

Module: ngircd.git Branch: master Commit: b0931f322b527f24215419e9c73eda7d7f22de6a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b0931f32… Author: Florian Westphal <fw(a)strlen.de> Date: Sun May 17 01:22:18 2009 +0200 manpage: move SSLConnect option to the right section --- man/ngircd.conf.5.tmpl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index df15b77..8e5b254 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -221,9 +221,6 @@ Default: 10. Maximum length of an user nick name (Default: 9, as in RFC 2812). Please note that all servers in an IRC network MUST use the same maximum nick name length! -.TP -\fBSSLConnect\fR -Connect to the remote server using TLS/SSL. Default: false. .SH [OPERATOR] .I [Operator] sections are used to define IRC Operators. There may be more than one @@ -287,6 +284,9 @@ Group of this server (optional). Disable automatic connection even if port value is specified. Default: false. You can use the IRC Operator command CONNECT later on to create the link. .TP +\fBSSLConnect\fR +Connect to the remote server using TLS/SSL. Default: false. +.TP \fBServiceMask\fR Define a (case insensitive) mask matching nick names that should be treated as IRC services when introduced via this remote server. REGULAR SERVERS DON'T NEED

1 0

Florian Westphal : SSL/TLS: remove redundant asserts/ifdefs
by fw＠arthur.barton.de 16 Mai '09

16 Mai '09

Module: ngircd.git Branch: master Commit: 5196e9bcb17111c43a71df2d11634b0705600b9f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5196e9bc… Author: Florian Westphal <fw(a)strlen.de> Date: Fri May 15 23:28:59 2009 +0200 SSL/TLS: remove redundant asserts/ifdefs --- src/ngircd/conn-ssl.c | 29 ++++++----------------------- 1 files changed, 6 insertions(+), 23 deletions(-) diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index 46f1c9d..fbf796c 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -383,7 +383,6 @@ ConnSSL_Init_SSL(CONNECTION *c) int ret; assert(c != NULL); #ifdef HAVE_LIBSSL - assert(ssl_ctx); if (!ssl_ctx) /* NULL when library initialization failed */ return false; @@ -433,10 +432,7 @@ ConnSSL_PrepareConnect(CONNECTION *c, UNUSED CONF_SERVER *s) bool ret; #ifdef HAVE_LIBGNUTLS int err; -#endif - assert(c != NULL); - assert(s != NULL); -#ifdef HAVE_LIBGNUTLS + err = gnutls_init(&c->ssl_state.gnutls_session, GNUTLS_CLIENT); if (err) { Log(LOG_ERR, "gnutls_init: %s", gnutls_strerror(err)); @@ -471,8 +467,6 @@ ConnSSL_HandleError( CONNECTION *c, const int code, const char *fname ) unsigned long sslerr; int real_errno = errno; - assert( fname ); - ret = SSL_get_error(c->ssl_state.ssl, code); switch (ret) { case SSL_ERROR_WANT_READ: @@ -545,8 +539,7 @@ ConnSSL_LogCertInfo( CONNECTION *c ) #ifdef HAVE_LIBSSL SSL *ssl = c->ssl_state.ssl; - assert( c ); - assert( ssl ); + assert(ssl); Log(LOG_INFO, "New %s connection using cipher %s on socket %d.", SSL_get_version(ssl), SSL_get_cipher(ssl), c->sock); @@ -574,11 +567,8 @@ int ConnSSL_Accept( CONNECTION *c ) { assert(c != NULL); -#ifdef HAVE_LIBSSL - if (!c->ssl_state.ssl) { -#endif -#ifdef HAVE_LIBGNUTLS if (!Conn_OPTION_ISSET(c, CONN_SSL)) { +#ifdef HAVE_LIBGNUTLS int err = gnutls_init(&c->ssl_state.gnutls_session, GNUTLS_SERVER); if (err) { Log(LOG_ERR, "gnutls_init: %s", gnutls_strerror(err)); @@ -600,9 +590,7 @@ ConnSSL_Connect( CONNECTION *c ) #ifdef HAVE_LIBSSL assert(c->ssl_state.ssl); #endif -#ifdef HAVE_LIBGNUTLS assert(Conn_OPTION_ISSET(c, CONN_SSL)); -#endif return ConnectAccept(c, true); } @@ -622,7 +610,6 @@ ConnectAccept( CONNECTION *c, bool connect) #endif #ifdef HAVE_LIBGNUTLS (void) connect; - assert(Conn_OPTION_ISSET(c, CONN_SSL)); ret = gnutls_handshake(c->ssl_state.gnutls_session); if (ret) return ConnSSL_HandleError(c, ret, "gnutls_handshake"); @@ -647,7 +634,8 @@ ConnSSL_Write(CONNECTION *c, const void *buf, size_t count) #ifdef HAVE_LIBGNUTLS bw = gnutls_write(c->ssl_state.gnutls_session, buf, count); #endif - if ( bw > 0 ) return bw; + if (bw > 0) + return bw; if (ConnSSL_HandleError( c, bw, "ConnSSL_Write") == 0) errno = EAGAIN; /* try again */ return -1; @@ -684,11 +672,8 @@ ConnSSL_GetCipherInfo(CONNECTION *c, char *buf, size_t len) { #ifdef HAVE_LIBSSL char *nl; + SSL *ssl = c->ssl_state.ssl; - SSL *ssl; - assert(c != NULL); - assert(len >= 128); - ssl = c->ssl_state.ssl; if (!ssl) return false; *buf = 0; @@ -699,8 +684,6 @@ ConnSSL_GetCipherInfo(CONNECTION *c, char *buf, size_t len) return true; #endif #ifdef HAVE_LIBGNUTLS - assert(c != NULL); - assert(len >= 128); if (Conn_OPTION_ISSET(c, CONN_SSL)) { const char *name_cipher, *name_mac, *name_proto, *name_keyexchange; unsigned keysize;

1 0