Hello community, here is the log from the commit of package librelp for openSUSE:Factory checked in at 2018-10-11 11:39:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librelp (Old) and /work/SRC/openSUSE:Factory/.librelp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librelp" Thu Oct 11 11:39:16 2018 rev:34 rq:639653 version:1.2.18 Changes: -------- --- /work/SRC/openSUSE:Factory/librelp/librelp.changes 2018-09-05 13:48:07.178213766 +0200 +++ /work/SRC/openSUSE:Factory/.librelp.new/librelp.changes 2018-10-11 11:39:31.035240089 +0200 @@ -1,0 +2,6 @@ +Tue Oct 2 20:30:21 UTC 2018 - [email protected] + +- librelp 1.2.18: + * added non-standard "certvalid" auth mode to TLS authentication + +------------------------------------------------------------------- Old: ---- librelp-1.2.17.tar.gz New: ---- librelp-1.2.18.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librelp.spec ++++++ --- /var/tmp/diff_new_pack.dyXL6m/_old 2018-10-11 11:39:35.263234705 +0200 +++ /var/tmp/diff_new_pack.dyXL6m/_new 2018-10-11 11:39:35.267234700 +0200 @@ -19,7 +19,7 @@ %define library_name librelp0 %bcond_with librelp_openssl Name: librelp -Version: 1.2.17 +Version: 1.2.18 Release: 0 Summary: A reliable logging library License: GPL-3.0-or-later ++++++ librelp-1.2.17.tar.gz -> librelp-1.2.18.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/ChangeLog new/librelp-1.2.18/ChangeLog --- old/librelp-1.2.17/ChangeLog 2018-08-02 10:15:31.000000000 +0200 +++ new/librelp-1.2.18/ChangeLog 2018-09-17 12:39:59.000000000 +0200 @@ -1,4 +1,8 @@ ---------------------------------------------------------------------- +Version 1.2.18 - 2018-09-18 +- added non-standard "certvalid" auth mode to TLS authentication +- bugfix CI: make distcheck did not work +---------------------------------------------------------------------- Version 1.2.17 - 2018-08-02 - added support for openssl now, at configure time, openssl (--enable-tls-openssl) or gnutls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/Makefile.in new/librelp-1.2.18/Makefile.in --- old/librelp-1.2.17/Makefile.in 2018-08-02 10:18:18.000000000 +0200 +++ new/librelp-1.2.18/Makefile.in 2018-09-17 12:40:24.000000000 +0200 @@ -192,8 +192,8 @@ DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/relp.pc.in AUTHORS COPYING ChangeLog INSTALL NEWS \ - README compile config.guess config.sub install-sh ltmain.sh \ - missing + README compile config.guess config.sub depcomp install-sh \ + ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/configure new/librelp-1.2.18/configure --- old/librelp-1.2.17/configure 2018-08-02 10:18:17.000000000 +0200 +++ new/librelp-1.2.18/configure 2018-09-17 12:40:24.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for librelp 1.2.17. +# Generated by GNU Autoconf 2.69 for librelp 1.2.18. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='librelp' PACKAGE_TARNAME='librelp' -PACKAGE_VERSION='1.2.17' -PACKAGE_STRING='librelp 1.2.17' +PACKAGE_VERSION='1.2.18' +PACKAGE_STRING='librelp 1.2.18' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1364,7 +1364,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures librelp 1.2.17 to adapt to many kinds of systems. +\`configure' configures librelp 1.2.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1435,7 +1435,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of librelp 1.2.17:";; + short | recursive ) echo "Configuration of librelp 1.2.18:";; esac cat <<\_ACEOF @@ -1564,7 +1564,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -librelp configure 1.2.17 +librelp configure 1.2.18 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2090,7 +2090,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by librelp $as_me 1.2.17, which was +It was created by librelp $as_me 1.2.18, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2953,7 +2953,7 @@ # Define the identity of the package. PACKAGE='librelp' - VERSION='1.2.17' + VERSION='1.2.18' cat >>confdefs.h <<_ACEOF @@ -3068,7 +3068,7 @@ # Define the identity of the package. PACKAGE='librelp' - VERSION='1.2.17' + VERSION='1.2.18' cat >>confdefs.h <<_ACEOF @@ -15420,7 +15420,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by librelp $as_me 1.2.17, which was +This file was extended by librelp $as_me 1.2.18, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15486,7 +15486,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -librelp config.status 1.2.17 +librelp config.status 1.2.18 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/configure.ac new/librelp-1.2.18/configure.ac --- old/librelp-1.2.17/configure.ac 2018-08-02 10:17:26.000000000 +0200 +++ new/librelp-1.2.18/configure.ac 2018-09-17 12:39:59.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([librelp], [1.2.17], [[email protected]]) +AC_INIT([librelp], [1.2.18], [[email protected]]) AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/src/librelp.h new/librelp-1.2.18/src/librelp.h --- old/librelp-1.2.17/src/librelp.h 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/src/librelp.h 2018-09-17 12:39:59.000000000 +0200 @@ -72,7 +72,8 @@ typedef enum relpAuthMode_e { eRelpAuthMode_None = 0, eRelpAuthMode_Fingerprint = 1, - eRelpAuthMode_Name = 2 + eRelpAuthMode_Name = 2, + eRelpAuthMode_CertValid = 3 } relpAuthMode_t; enum relpCmdEnaState_e { /* command enabled state - what are we permitted to do/request? */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/src/relpclt.c new/librelp-1.2.18/src/relpclt.c --- old/librelp-1.2.17/src/relpclt.c 2018-05-04 12:10:44.000000000 +0200 +++ new/librelp-1.2.18/src/relpclt.c 2018-09-17 12:39:59.000000000 +0200 @@ -265,6 +265,8 @@ pThis->authmode = eRelpAuthMode_Fingerprint; else if(!strcasecmp(mode, "name")) pThis->authmode = eRelpAuthMode_Name; + else if(!strcasecmp(mode, "certvalid")) + pThis->authmode = eRelpAuthMode_CertValid; else ABORT_FINALIZE(RELP_RET_INVLD_AUTH_MD); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/src/relpsrv.c new/librelp-1.2.18/src/relpsrv.c --- old/librelp-1.2.17/src/relpsrv.c 2018-08-02 09:25:58.000000000 +0200 +++ new/librelp-1.2.18/src/relpsrv.c 2018-09-17 12:39:59.000000000 +0200 @@ -245,6 +245,8 @@ pThis->authmode = eRelpAuthMode_Fingerprint; else if(!strcasecmp(mode, "name")) pThis->authmode = eRelpAuthMode_Name; + else if(!strcasecmp(mode, "certvalid")) + pThis->authmode = eRelpAuthMode_CertValid; else ABORT_FINALIZE(RELP_RET_INVLD_AUTH_MD); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/src/tcp.c new/librelp-1.2.18/src/tcp.c --- old/librelp-1.2.17/src/tcp.c 2018-08-02 10:14:51.000000000 +0200 +++ new/librelp-1.2.18/src/tcp.c 2018-09-17 12:39:59.000000000 +0200 @@ -1319,7 +1319,9 @@ } /* Now check for auth modes */ - if(pThis->authmode == eRelpAuthMode_Name ) { + if(pThis->authmode == eRelpAuthMode_CertValid ) { + pThis->pEngine->dbgprint("relpTcpChkPeerAuth: certvalid mode - success\n"); + } else if(pThis->authmode == eRelpAuthMode_Name ) { CHKRet(relpTcpChkPeerName(pThis, certpeer)); pThis->pEngine->dbgprint("relpTcpChkPeerAuth: name mode - success\n"); } else if(pThis->authmode == eRelpAuthMode_Fingerprint) { @@ -2314,9 +2316,10 @@ gnutls_x509_crt_import(cert, &cert_list[0], GNUTLS_X509_FMT_DER); if(pThis->authmode == eRelpAuthMode_Fingerprint) { r = relpTcpChkPeerFingerprint(pThis, cert); - } else { + } else if(pThis->authmode == eRelpAuthMode_Name){ r = relpTcpChkPeerName(pThis, cert); } + if(r != 0) goto done; /* notify gnutls to continue handshake normally */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/Makefile.am new/librelp-1.2.18/tests/Makefile.am --- old/librelp-1.2.17/tests/Makefile.am 2018-08-02 09:25:58.000000000 +0200 +++ new/librelp-1.2.18/tests/Makefile.am 2018-09-17 12:39:59.000000000 +0200 @@ -15,19 +15,25 @@ duplicate-receiver-vg.sh TESTS= basic.sh \ - tls-basic-anon.sh \ tls-basic.sh \ + tls-basic-anon.sh \ + tls-basic-certvalid.sh \ tls-basic-fingerprint.sh \ - tls-wrong-permittedPeer.sh \ - tls-wrong-authname.sh \ - tls-wrong-signedcert.sh \ - tls-basic-brokencert.sh \ + tls-basic-wildcard.sh \ tls-missing-param-sender.sh \ tls-missing-param-receiver.sh \ long-msg.sh \ oversize-msg-abort-errmsg.sh \ oversize-msg-accept-errmsg.sh \ truncate-oversize-msg.sh +# OpenSSL tests only! +if ENABLE_TLS_OPENSSL +TESTS += tls-wrong-permittedPeer.sh \ + tls-wrong-authname.sh \ + tls-wrong-signedcert.sh +# reenable tests when stable +# tls-basic-brokencert.sh +endif if HAVE_VALGRIND TESTS += $(VALGRIND_TESTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/Makefile.in new/librelp-1.2.18/tests/Makefile.in --- old/librelp-1.2.17/tests/Makefile.in 2018-08-02 10:18:18.000000000 +0200 +++ new/librelp-1.2.18/tests/Makefile.in 2018-09-17 12:40:24.000000000 +0200 @@ -88,7 +88,14 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = receive$(EXEEXT) send$(EXEEXT) -@HAVE_VALGRIND_TRUE@am__append_1 = $(VALGRIND_TESTS) +# OpenSSL tests only! +@ENABLE_TLS_OPENSSL_TRUE@am__append_1 = tls-wrong-permittedPeer.sh \ +@ENABLE_TLS_OPENSSL_TRUE@ tls-wrong-authname.sh \ +@ENABLE_TLS_OPENSSL_TRUE@ tls-wrong-signedcert.sh + +# reenable tests when stable +# tls-basic-brokencert.sh +@HAVE_VALGRIND_TRUE@am__append_2 = $(VALGRIND_TESTS) subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ @@ -526,13 +533,12 @@ tls-basic-vg.sh \ duplicate-receiver-vg.sh -TESTS = basic.sh tls-basic-anon.sh tls-basic.sh \ - tls-basic-fingerprint.sh tls-wrong-permittedPeer.sh \ - tls-wrong-authname.sh tls-wrong-signedcert.sh \ - tls-basic-brokencert.sh tls-missing-param-sender.sh \ - tls-missing-param-receiver.sh long-msg.sh \ - oversize-msg-abort-errmsg.sh oversize-msg-accept-errmsg.sh \ - truncate-oversize-msg.sh $(am__append_1) +TESTS = basic.sh tls-basic.sh tls-basic-anon.sh tls-basic-certvalid.sh \ + tls-basic-fingerprint.sh tls-basic-wildcard.sh \ + tls-missing-param-sender.sh tls-missing-param-receiver.sh \ + long-msg.sh oversize-msg-abort-errmsg.sh \ + oversize-msg-accept-errmsg.sh truncate-oversize-msg.sh \ + $(am__append_1) $(am__append_2) EXTRA_DIST = $(TESTS) \ $(VALGRIND_TESTS) \ test-framework.sh \ @@ -865,13 +871,6 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -tls-basic-anon.sh.log: tls-basic-anon.sh - @p='tls-basic-anon.sh'; \ - b='tls-basic-anon.sh'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) tls-basic.sh.log: tls-basic.sh @p='tls-basic.sh'; \ b='tls-basic.sh'; \ @@ -879,37 +878,30 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -tls-basic-fingerprint.sh.log: tls-basic-fingerprint.sh - @p='tls-basic-fingerprint.sh'; \ - b='tls-basic-fingerprint.sh'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -tls-wrong-permittedPeer.sh.log: tls-wrong-permittedPeer.sh - @p='tls-wrong-permittedPeer.sh'; \ - b='tls-wrong-permittedPeer.sh'; \ +tls-basic-anon.sh.log: tls-basic-anon.sh + @p='tls-basic-anon.sh'; \ + b='tls-basic-anon.sh'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -tls-wrong-authname.sh.log: tls-wrong-authname.sh - @p='tls-wrong-authname.sh'; \ - b='tls-wrong-authname.sh'; \ +tls-basic-certvalid.sh.log: tls-basic-certvalid.sh + @p='tls-basic-certvalid.sh'; \ + b='tls-basic-certvalid.sh'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -tls-wrong-signedcert.sh.log: tls-wrong-signedcert.sh - @p='tls-wrong-signedcert.sh'; \ - b='tls-wrong-signedcert.sh'; \ +tls-basic-fingerprint.sh.log: tls-basic-fingerprint.sh + @p='tls-basic-fingerprint.sh'; \ + b='tls-basic-fingerprint.sh'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -tls-basic-brokencert.sh.log: tls-basic-brokencert.sh - @p='tls-basic-brokencert.sh'; \ - b='tls-basic-brokencert.sh'; \ +tls-basic-wildcard.sh.log: tls-basic-wildcard.sh + @p='tls-basic-wildcard.sh'; \ + b='tls-basic-wildcard.sh'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ @@ -955,6 +947,27 @@ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tls-wrong-permittedPeer.sh.log: tls-wrong-permittedPeer.sh + @p='tls-wrong-permittedPeer.sh'; \ + b='tls-wrong-permittedPeer.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tls-wrong-authname.sh.log: tls-wrong-authname.sh + @p='tls-wrong-authname.sh'; \ + b='tls-wrong-authname.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tls-wrong-signedcert.sh.log: tls-wrong-signedcert.sh + @p='tls-wrong-signedcert.sh'; \ + b='tls-wrong-signedcert.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) tls-basic-vg.sh.log: tls-basic-vg.sh @p='tls-basic-vg.sh'; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/duplicate-receiver-vg.sh new/librelp-1.2.18/tests/duplicate-receiver-vg.sh --- old/librelp-1.2.17/tests/duplicate-receiver-vg.sh 2018-08-02 09:25:58.000000000 +0200 +++ new/librelp-1.2.18/tests/duplicate-receiver-vg.sh 2018-09-17 12:39:59.000000000 +0200 @@ -11,7 +11,6 @@ . ${srcdir}/test-framework.sh startup_receiver_valgrind -startup_receiver_valgrind echo 'Send Message...' ./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/oversize-msg-abort-errmsg.sh new/librelp-1.2.18/tests/oversize-msg-abort-errmsg.sh --- old/librelp-1.2.17/tests/oversize-msg-abort-errmsg.sh 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/oversize-msg-abort-errmsg.sh 2018-09-17 12:39:59.000000000 +0200 @@ -1,13 +1,13 @@ #!/bin/bash # check if oversize message error is generated by receiver . ${srcdir}/test-framework.sh -startup_receiver +startup_receiver -eerror.out.log echo 'Send Message...' ./send -t 127.0.0.1 -p $TESTPORT -m "testmessage1" -d 150000 ./send -t 127.0.0.1 -p $TESTPORT -m "testmessage2" stop_receiver -check_output "error.*frame too long" librelp.out.log +check_output "error.*frame too long" error.out.log check_output "testmessage2" terminate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/oversize-msg-accept-errmsg.sh new/librelp-1.2.18/tests/oversize-msg-accept-errmsg.sh --- old/librelp-1.2.17/tests/oversize-msg-accept-errmsg.sh 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/oversize-msg-accept-errmsg.sh 2018-09-17 12:39:59.000000000 +0200 @@ -2,12 +2,12 @@ # Check if oversize message error is generated by receiver # and message is accepted correctly. . ${srcdir}/test-framework.sh -startup_receiver -m 140 -o "accept" +startup_receiver -m 140 -o "accept" -e error.out.log echo 'Send Message...' ./send -t 127.0.0.1 -p $TESTPORT -m "testmessage1" -d 150 1>>client.err.log 2>&1 stop_receiver -check_output "error.*frame too long.*will still be accepted" librelp.out.log +check_output "error.*frame too long.*will still be accepted" error.out.log check_output "^testmessage1012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567$" terminate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/receive.c new/librelp-1.2.18/tests/receive.c --- old/librelp-1.2.17/tests/receive.c 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/receive.c 2018-09-17 12:39:59.000000000 +0200 @@ -23,10 +23,12 @@ #include <getopt.h> #include <string.h> #include <limits.h> +#include <errno.h> #include "librelp.h" -#define TRY(f) if(f != RELP_RET_OK) { fprintf(stderr, "receive.c: FAILURE in '%s'\n", #f); return 1; } +#define TRY(f) if(f != RELP_RET_OK) { fprintf(stderr, "receive.c: FAILURE in '%s'\n", #f); ret = 1; goto done; } +static FILE *errFile = NULL; static relpEngine_t *pRelpEngine; static void __attribute__((format(printf, 1, 2))) @@ -70,12 +72,18 @@ onErr( __attribute__((unused)) void *pUsr, char *objinfo, char* errmesg, __attribute__((unused)) relpRetVal errcode) { fprintf(stderr, "receive: error '%s', object '%s'\n", errmesg, objinfo); + if(errFile != NULL) { + fprintf(errFile, "receive: error '%s', object '%s'\n", errmesg, objinfo); + } } static void onGenericErr(char *objinfo, char* errmesg, __attribute__((unused)) relpRetVal errcode) { fprintf(stderr, "receive: librelp error '%s', object '%s'\n", errmesg, objinfo); + if(errFile != NULL) { + fprintf(errFile, "receive: librelp error '%s', object '%s'\n", errmesg, objinfo); + } } static void @@ -83,6 +91,17 @@ char* errmesg, __attribute__((unused)) relpRetVal errcode) { fprintf(stderr, "receive: authentication error '%s', object '%s'\n", errmesg, authinfo); + if(errFile != NULL) { + fprintf(errFile, "receive: authentication error '%s', object '%s'\n", errmesg, authinfo); + } +} + +static void +exit_hdlr(void) +{ + if(errFile != NULL) { + fclose(errFile); + } } int main(int argc, char *argv[]) { @@ -92,6 +111,7 @@ unsigned char *port = NULL; int verbose = 0; char *pidFileName = NULL; + char *errFileName = NULL; int protFamily = 2; /* IPv4=2, IPv6=10 */ relpSrv_t *pRelpSrv; int bEnableTLS = 0; @@ -102,6 +122,7 @@ char *authMode = NULL; int maxDataSize = 0; int oversizeMode = 0; + int ret = 0; static struct option long_options[] = { @@ -111,15 +132,19 @@ {"peer", required_argument, 0, 'P'}, {"authmode", required_argument, 0, 'a'}, {"pidfile", required_argument, 0, 'F'}, + {"errorfile", required_argument, 0, 'e'}, {0, 0, 0, 0} }; - while((c = getopt_long(argc, argv, "a:F:m:o:P:p:Tvx:y:z:", long_options, &option_index)) != -1) { + while((c = getopt_long(argc, argv, "a:e:F:m:o:P:p:Tvx:y:z:", long_options, &option_index)) != -1) { switch(c) { case 'a': authMode = optarg; break; + case 'e': + errFileName = optarg; + break; case 'v': verbose = 1; break; @@ -175,17 +200,29 @@ } } + atexit(exit_hdlr); + + if(errFileName != NULL) { + printf("errfile %s\n", errFileName); + if((errFile = fopen((char*) errFileName, "w")) == NULL) { + perror(errFileName); + goto done; + } + setvbuf(errFile, NULL, _IONBF, 128); + } + if(port == NULL) { printf("Port is missing\n"); print_usage(); - exit(1); + goto done; } if(authMode != NULL) { - if(permittedPeer == NULL || caCertFile == NULL || myCertFile == NULL - || myPrivKeyFile == NULL) { - printf("receive: parameter missing; certificates and permittedPeer required\n"); - exit(1); + if( (strcasecmp(authMode, "certvalid") != 0 && permittedPeer == NULL) || + caCertFile == NULL || myCertFile == NULL || myPrivKeyFile == NULL) { + printf("receive: mode '%s' parameter missing; certificates and permittedPeer required\n", + authMode); + goto done; } } @@ -196,7 +233,7 @@ printf("receive: Certificates were specified, but TLS was " "not enabled! Will continue without TLS. To enable " "it use parameter \"-T\"\n"); - exit(1); + goto done; } } @@ -228,7 +265,9 @@ TRY(relpSrvSetCACert(pRelpSrv, caCertFile)); TRY(relpSrvSetOwnCert(pRelpSrv, myCertFile)); TRY(relpSrvSetPrivKey(pRelpSrv, myPrivKeyFile)); - TRY(relpSrvAddPermittedPeer(pRelpSrv, permittedPeer)); + if (permittedPeer != NULL) { + TRY(relpSrvAddPermittedPeer(pRelpSrv, permittedPeer)); + } } } @@ -238,9 +277,19 @@ FILE *fp; if((fp = fopen((char*) pidFileName, "w")) == NULL) { fprintf(stderr, "receive: couldn't open PidFile\n"); + if(errFile != NULL) { + fprintf(errFile, "receive: couldn't open PidFile\n"); + } + ret = 1; + goto done; } if(fprintf(fp, "%d", getpid()) < 0) { fprintf(stderr, "receive: couldn't write to PidFile\n"); + if(errFile != NULL) { + fprintf(errFile, "receive: couldn't write to PidFile\n"); + } + ret = 1; + goto done; } fclose(fp); } @@ -250,5 +299,6 @@ TRY(relpEngineSetStop(pRelpEngine)); TRY(relpEngineDestruct(&pRelpEngine)); - return 0; +done: + return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/send.c new/librelp-1.2.18/tests/send.c --- old/librelp-1.2.17/tests/send.c 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/send.c 2018-09-17 12:39:59.000000000 +0200 @@ -24,8 +24,9 @@ #include <string.h> #include "librelp.h" -#define TRY(f) if(f != RELP_RET_OK) { fprintf(stderr, "send.c: FAILURE in: '%s'\n", #f); return 1; } +#define TRY(f) if(f != RELP_RET_OK) { fprintf(stderr, "send.c: FAILURE in '%s'\n", #f); ret = 1; goto done; } +static FILE *errFile = NULL; static relpEngine_t *pRelpEngine; static void __attribute__((format(printf, 1, 2))) @@ -50,12 +51,19 @@ onErr( __attribute__((unused)) void *pUsr, char *objinfo, char* errmesg, __attribute__((unused)) relpRetVal errcode) { printf("send: error '%s', object '%s'\n", errmesg, objinfo); + if(errFile != NULL) { + fprintf(errFile, "send: error '%s', object '%s'\n", errmesg, objinfo); + } } static void onGenericErr(char *objinfo, char* errmesg, __attribute__((unused)) relpRetVal errcode) { printf("send: librelp error '%s', object '%s'\n", errmesg, objinfo); + if(errFile != NULL) { + fprintf(errFile, "send: librelp error '%s', object '%s'\n", errmesg, objinfo); + } + } static void @@ -63,6 +71,17 @@ char* errmesg, __attribute__((unused)) relpRetVal errcode) { printf("send: authentication error '%s', object '%s'\n", errmesg, authinfo); + if(errFile != NULL) { + fprintf(errFile, "send: authentication error '%s', object '%s'\n", errmesg, authinfo); + } +} + +static void +exit_hdlr(void) +{ + if(errFile != NULL) { + fclose(errFile); + } } int main(int argc, char *argv[]) { @@ -75,6 +94,7 @@ size_t lenMsg = 0; unsigned timeout = 90; int verbose = 0; + char *errFileName = NULL; int protFamily = 2; /* IPv4=2, IPv6=10 */ relpClt_t *pRelpClt = NULL; int bEnableTLS = 0; @@ -86,6 +106,7 @@ size_t msgDataLen = 0; int len = 0; char *msgData = NULL;; + int ret = 0; static struct option long_options[] = { @@ -94,14 +115,18 @@ {"key", required_argument, 0, 'z'}, {"peer", required_argument, 0, 'P'}, {"authmode", required_argument, 0, 'a'}, + {"errorfile", required_argument, 0, 'e'}, {0, 0, 0, 0} }; - while((c = getopt_long(argc, argv, "a:d:m:P:p:Tt:vx:y:z:", long_options, &option_index)) != -1) { + while((c = getopt_long(argc, argv, "a:e:d:m:P:p:Tt:vx:y:z:", long_options, &option_index)) != -1) { switch(c) { case 'a': authMode = optarg; break; + case 'e': + errFileName = optarg; + break; case 'd': len = atoi(optarg); if(len < 128) { @@ -146,6 +171,16 @@ } } + atexit(exit_hdlr); + + if(errFileName != NULL) { + printf("errfile %s\n", errFileName); + if((errFile = fopen((char*) errFileName, "w")) == NULL) { + perror(errFileName); + goto done; + } + setvbuf(errFile, NULL, _IONBF, 128); + } if(msgDataLen != 0 && msgDataLen < lenMsg) { fprintf(stderr, "send.c: message is larger than configured message size!\n"); @@ -159,9 +194,10 @@ } if(authMode != NULL) { - if(permittedPeer == NULL || caCertFile == NULL || myCertFile == NULL - || myPrivKeyFile == NULL) { - printf("send: parameter missing; certificates and permittedPeer required\n"); + if( (strcasecmp(authMode, "certvalid") != 0 && permittedPeer == NULL) || + caCertFile == NULL || myCertFile == NULL || myPrivKeyFile == NULL) { + printf("send: mode '%s' parameter missing; certificates and permittedPeer required\n", + authMode); exit(1); } } @@ -195,7 +231,9 @@ TRY(relpCltSetCACert(pRelpClt, caCertFile)); TRY(relpCltSetOwnCert(pRelpClt, myCertFile)); TRY(relpCltSetPrivKey(pRelpClt, myPrivKeyFile)); - TRY(relpCltAddPermittedPeer(pRelpClt, permittedPeer)); + if (permittedPeer != NULL) { + TRY(relpCltAddPermittedPeer(pRelpClt, permittedPeer)); + } } } @@ -224,5 +262,10 @@ TRY(relpEngineCltDestruct(pRelpEngine, &pRelpClt)); TRY(relpEngineDestruct(&pRelpEngine)); - return 0; +done: + if(errFile != NULL) { + fclose(errFile); + } + + return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/test-framework.sh new/librelp-1.2.18/tests/test-framework.sh --- old/librelp-1.2.17/tests/test-framework.sh 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/test-framework.sh 2018-09-17 12:39:59.000000000 +0200 @@ -7,7 +7,7 @@ TB_TIMEOUT_STARTUP=400 # 40 seconds - Solaris sometimes needs this... TESTPORT=31514 export valgrind="valgrind --malloc-fill=ff --free-fill=fe --log-fd=1" -export OPT_VERBOSE=-v # We need verbose now for propper error checking! +#export OPT_VERBOSE=-v # uncomment for debugging ###################################################################### # functions @@ -17,7 +17,7 @@ function wait_process_startup_via_pidfile() { let "i=0" while test ! -f $1 ; do - printf "startup wait %s\n" $i + printf "startup wait %s: %s\n" $1 $i sleep .100 let "i++" if test $i -gt $TB_TIMEOUT_STARTUP @@ -32,10 +32,10 @@ # start receiver WITH valgrind, add receiver command line parameters after function name function startup_receiver_valgrind() { printf 'Starting Receiver...\n' - $valgrind ./receive -p $TESTPORT -F $srcdir/receive.pid $OPT_VERBOSE $* 1>>librelp.out.log 2>&1 & + $valgrind ./receive -p $TESTPORT -F receive.pid $OPT_VERBOSE $* 1>>librelp.out.log & export RECEIVE_PID=$! printf "got receive pid $RECEIVE_PID\n" - wait_process_startup_via_pidfile $srcdir/receive.pid + wait_process_startup_via_pidfile receive.pid sleep 1 printf 'Receiver running\n' } @@ -43,24 +43,24 @@ # start receiver, add receiver command line parameters after function name function startup_receiver() { printf 'Starting Receiver...\n' - ./receive -p $TESTPORT -F $srcdir/receive.pid $OPT_VERBOSE $* 1>>librelp.out.log 2>&1 & + ./receive -p $TESTPORT -F receive.pid $OPT_VERBOSE $* 1>>librelp.out.log & export RECEIVE_PID=$! printf "got receive pid $RECEIVE_PID\n" - wait_process_startup_via_pidfile $srcdir/receive.pid + wait_process_startup_via_pidfile receive.pid sleep 1 printf 'Receiver running\n' } # stop receiver function stop_receiver() { - if [ -f $srcdir/receive.pid ]; then - kill $(cat $srcdir/receive.pid) &> /dev/null + if [ -f receive.pid ]; then + kill $(cat receive.pid) &> /dev/null fi - wait -n 5 $(cat $srcdir/receive.pid) &> /dev/null + wait -n 5 $(cat receive.pid) &> /dev/null #kill $RECEIVE_PID - if [ -f $srcdir/receive.pid ]; then + if [ -f receive.pid ]; then # FORCE - kill -9 $(cat $srcdir/receive.pid) &> /dev/null + kill -9 $(cat receive.pid) &> /dev/null fi sleep 1 @@ -76,7 +76,7 @@ else FILE_TO_CHECK="$2" fi - grep "$EXPECTED" $FILE_TO_CHECK > /dev/null + grep $3 "$EXPECTED" $FILE_TO_CHECK > /dev/null if [ $? -ne 0 ]; then printf "\nFAIL: expected message not found. Expected:\n" printf "%s\n" "$EXPECTED" @@ -120,11 +120,11 @@ echo pkill result $? fi - if [ -f $srcdir/receive.pid ]; then - kill -9 `cat $srcdir/receive.pid` &> /dev/null + if [ -f receive.pid ]; then + kill -9 `cat receive.pid` &> /dev/null fi - rm -f receive.pid librelp.out.log *.err.log + rm -f receive.pid librelp.out.log *.err.log error.out.log } # cleanup at end of regular test run diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/tls-basic-anon.sh new/librelp-1.2.18/tests/tls-basic-anon.sh --- old/librelp-1.2.17/tests/tls-basic-anon.sh 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/tls-basic-anon.sh 2018-09-17 12:39:59.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash . ${srcdir}/test-framework.sh -startup_receiver -T +startup_receiver -T -e error.out.log echo 'Send Message...' ./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T $OPT_VERBOSE 1>>librelp.out.log 2>&1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/tls-basic-brokencert.sh new/librelp-1.2.18/tests/tls-basic-brokencert.sh --- old/librelp-1.2.17/tests/tls-basic-brokencert.sh 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/tls-basic-brokencert.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -#!/bin/bash -. ${srcdir}/test-framework.sh -startup_receiver -T -a "name" -x ${srcdir}/tls-certs/ossl-ca.pem -y ${srcdir}/tls-certs/ossl-server-cert.pem -z ${srcdir}/tls-certs/ossl-server-key.pem -P 'clientbrok.testbench.rsyslog.com' - -echo 'Send Message...' -./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "name" -x ${srcdir}/tls-certs/ossl-ca.pem -y ${srcdir}/tls-certs/ossl-clientbrok-cert.pem -z ${srcdir}/tls-certs/ossl-clientbrok-key.pem -P 'server.testbench.rsyslog.com' $OPT_VERBOSE 1>>librelp.out.log 2>&1 - -stop_receiver - -if check_output_only "certificate validation failed, names inside certifcate are way to long"; then - printf "\nExpected: certificate validation failed due broken client cert.\n" -else - printf "\nOpenSSL Version has limited key exchange, broken certs above 32K won't work anyway.\n" - printf "\nDEBUG: content of librelp.out.log\n" - cat $FILE_TO_CHECK - check_output "relpTcpLastSSLErrorMsg\: Errorstack\: error\:.*\:excessive message size" -fi - -terminate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/tls-basic-certvalid.sh new/librelp-1.2.18/tests/tls-basic-certvalid.sh --- old/librelp-1.2.17/tests/tls-basic-certvalid.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/librelp-1.2.18/tests/tls-basic-certvalid.sh 2018-09-17 12:39:59.000000000 +0200 @@ -0,0 +1,10 @@ +#!/bin/bash +. ${srcdir}/test-framework.sh +startup_receiver -T -a "certvalid" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -e error.out.log + +echo 'Send Message...' +./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "certvalid" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem $OPT_VERBOSE 1>>librelp.out.log 2>&1 + +stop_receiver +check_output "testmessage" +terminate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/tls-basic-fingerprint.sh new/librelp-1.2.18/tests/tls-basic-fingerprint.sh --- old/librelp-1.2.17/tests/tls-basic-fingerprint.sh 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/tls-basic-fingerprint.sh 2018-09-17 12:39:59.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash . ${srcdir}/test-framework.sh -startup_receiver -T -a "fingerprint" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P 'SHA1:5C:C6:62:D5:9D:25:9F:BC:F3:CB:61:FA:D2:B3:8B:61:88:D7:06:C3' +startup_receiver -T -a "fingerprint" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P 'SHA1:5C:C6:62:D5:9D:25:9F:BC:F3:CB:61:FA:D2:B3:8B:61:88:D7:06:C3' -e error.out.log echo 'Send Message...' ./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "fingerprint" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P 'SHA1:5C:C6:62:D5:9D:25:9F:BC:F3:CB:61:FA:D2:B3:8B:61:88:D7:06:C3' $OPT_VERBOSE 1>>librelp.out.log 2>&1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/tls-basic-vg.sh new/librelp-1.2.18/tests/tls-basic-vg.sh --- old/librelp-1.2.17/tests/tls-basic-vg.sh 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/tls-basic-vg.sh 2018-09-17 12:39:59.000000000 +0200 @@ -11,7 +11,7 @@ . ${srcdir}/test-framework.sh echo 'Start Receiver...' -startup_receiver_valgrind -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog-client" +startup_receiver_valgrind -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog-client" -e error.out.log echo 'Send Message...' $valgrind ./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog-client" $OPT_VERBOSE 1>>librelp.out.log 2>&1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/tls-basic-wildcard.sh new/librelp-1.2.18/tests/tls-basic-wildcard.sh --- old/librelp-1.2.17/tests/tls-basic-wildcard.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/librelp-1.2.18/tests/tls-basic-wildcard.sh 2018-09-17 12:39:59.000000000 +0200 @@ -0,0 +1,10 @@ +#!/bin/bash +. ${srcdir}/test-framework.sh +startup_receiver -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P '*.rsyslog.com' -e error.out.log + +echo 'Send Message...' +./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P '*.rsyslog.com' $OPT_VERBOSE + +stop_receiver +check_output "testmessage" +terminate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/tls-basic.sh new/librelp-1.2.18/tests/tls-basic.sh --- old/librelp-1.2.17/tests/tls-basic.sh 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/tls-basic.sh 2018-09-17 12:39:59.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash . ${srcdir}/test-framework.sh -startup_receiver -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P 'testbench.rsyslog.com' +startup_receiver -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P 'testbench.rsyslog.com' -e error.out.log echo 'Send Message...' ./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P 'testbench.rsyslog.com' $OPT_VERBOSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/tls-missing-param-receiver.sh new/librelp-1.2.18/tests/tls-missing-param-receiver.sh --- old/librelp-1.2.17/tests/tls-missing-param-receiver.sh 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/tls-missing-param-receiver.sh 2018-09-17 12:39:59.000000000 +0200 @@ -6,5 +6,5 @@ # NOT USING startup_receiver! ./receive -p $TESTPORT -T -a "name" -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog" > librelp.out.log -check_output "receive: parameter missing; certificates and permittedPeer required" +check_output "receive:.*parameter missing; certificates and permittedPeer required" terminate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/tls-missing-param-sender.sh new/librelp-1.2.18/tests/tls-missing-param-sender.sh --- old/librelp-1.2.17/tests/tls-missing-param-sender.sh 2018-05-04 12:10:44.000000000 +0200 +++ new/librelp-1.2.18/tests/tls-missing-param-sender.sh 2018-09-17 12:39:59.000000000 +0200 @@ -5,5 +5,5 @@ echo 'Send Message...' ./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "name" -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog" > librelp.out.log -check_output "send: parameter missing; certificates and permittedPeer required" +check_output "send:.*parameter missing; certificates and permittedPeer required" terminate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/tls-wrong-authname.sh new/librelp-1.2.18/tests/tls-wrong-authname.sh --- old/librelp-1.2.17/tests/tls-wrong-authname.sh 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/tls-wrong-authname.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -#!/bin/bash -. ${srcdir}/test-framework.sh -# NOT USING startup_receiver here! -./receive -p $TESTPORT -T -a "anon" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog" $OPT_VERBOSE $* 1>>librelp.out.log 2>&1 -check_output "relpSrvSetAuthMode(pRelpSrv, authMode)" - -echo 'Send Message...' -./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "anon" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "rsyslog" $OPT_VERBOSE 1>>client.err.log 2>&1 -check_output "relpCltSetAuthMode(pRelpClt, authMode)" client.err.log - -terminate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/tls-wrong-permittedPeer.sh new/librelp-1.2.18/tests/tls-wrong-permittedPeer.sh --- old/librelp-1.2.17/tests/tls-wrong-permittedPeer.sh 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/tls-wrong-permittedPeer.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#!/bin/bash -. ${srcdir}/test-framework.sh -startup_receiver -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "wrong name" - -echo 'Send Message...' -./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P "wrong name" $OPT_VERBOSE 1>>librelp.out.log 2>&1 - -stop_receiver - -check_output "librelp\: auth error\: authdata\:'DNSname\: testbench.rsyslog.com\; " - -terminate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/tls-wrong-signedcert.sh new/librelp-1.2.18/tests/tls-wrong-signedcert.sh --- old/librelp-1.2.17/tests/tls-wrong-signedcert.sh 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/tls-wrong-signedcert.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -#!/bin/bash -. ${srcdir}/test-framework.sh -startup_receiver -T -a "name" -x ${srcdir}/tls-certs/ossl-ca.pem -y ${srcdir}/tls-certs/ossl-server-cert.pem -z ${srcdir}/tls-certs/ossl-server-key.pem -P 'client.testbench.rsyslog.com' - -echo 'Send Message...' -./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -T -a "name" -x ${srcdir}/tls-certs/ca.pem -y ${srcdir}/tls-certs/cert.pem -z ${srcdir}/tls-certs/key.pem -P 'server.testbench.rsyslog.com' $OPT_VERBOSE 1>>librelp.out.log 2>&1 - -stop_receiver -check_output "librelp\: auth error\: authdata\:.*, ecode 10036" -terminate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.17/tests/truncate-oversize-msg.sh new/librelp-1.2.18/tests/truncate-oversize-msg.sh --- old/librelp-1.2.17/tests/truncate-oversize-msg.sh 2018-07-20 11:58:36.000000000 +0200 +++ new/librelp-1.2.18/tests/truncate-oversize-msg.sh 2018-09-17 12:39:59.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash . ${srcdir}/test-framework.sh -startup_receiver -o truncate -m 144 +startup_receiver -o truncate -m 144 -e error.out.log echo 'Send Message...' ./send -t 127.0.0.1 -p $TESTPORT -m "testmessage" -d 154 1>>client.err.log 2>&1 @@ -8,6 +8,6 @@ stop_receiver # ^-sign symbolizes the beginning of the message and $-sign the expected end. check_output "^testmessage0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012$" -check_output "error.*frame too long" librelp.out.log +check_output "error.*frame too long" error.out.log cat librelp.out.log terminate
