Re: [Openvpn-devel] [PATCH applied] Re: Add unit tests for engine keys
On Wed, 2020-06-24 at 01:18 +0500, Илья Шипицин wrote:
[...]
> I've added output of log.txt, if you are going to modify "grep"
> magic, can you adopt something like that, please ?
OK, I folded this into the --enable-small correction
James
---8>8>8><8<8<8---
From: James Bottomley
Subject: [PATCH] engine-key tests: make check_engine_keys.sh work with
--enable-small
--enable-small eliminates one of the openssl errors the test is
looking for, so alter the grep also to account for the message in this
version. Additionally output log.txt on failure so any test platform
gives an easy clue about what went wrong.
Signed-off-by: James Bottomley
---
tests/unit_tests/engine-key/check_engine_keys.sh | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/tests/unit_tests/engine-key/check_engine_keys.sh
b/tests/unit_tests/engine-key/check_engine_keys.sh
index e0c9d7b0..7e9a0e80 100755
--- a/tests/unit_tests/engine-key/check_engine_keys.sh
+++ b/tests/unit_tests/engine-key/check_engine_keys.sh
@@ -12,6 +12,12 @@ pwdfile="${builddir}/passwd"
sed 's/PRIVATE KEY/TEST ENGINE KEY/' <
${top_srcdir}/sample/sample-keys/client.key > ${key}
echo "$password" > $pwdfile
+# our version of grep to output log.txt on failure in case it's an openssl
+# error mismatch and the grep expression needs updating
+loggrep() {
+egrep -q "$1" log.txt || { echo ' begin log.txt '; cat log.txt;
echo '--- end log.txt ---'; return 1; }
+}
+
# note here we've induced a mismatch in the client key and the server
# cert which openvpn should report and die. Check that it does. Note
# also that this mismatch depends on openssl not openvpn, so it is
@@ -21,10 +27,10 @@ ${top_builddir}/src/openvpn/openvpn --cd
${top_srcdir}/sample --config sample-co
# first off check we died because of a key mismatch. If this doesn't
# pass, suspect openssl of returning different messages and update the
# test accordingly
-grep -q 'X509_check_private_key:key values mismatch' log.txt || { echo "Key
mismatch not detected"; exit 1; }
+loggrep '(X509_check_private_key:key values
mismatch|func\(128\):reason\(116\))' log.txt || { echo "Key mismatch not
detected"; exit 1; }
# now look for the engine prints (these are under our control)
-grep -q 'ENGINE: engine_init called' log.txt || { echo "Engine initialization
not detected"; exit 1; }
-grep -q 'ENGINE: engine_load_key called' log.txt || { echo "Key was not loaded
from engine"; exit 1; }
-grep -q "ENGINE: engine_load_key got password ${password}" log.txt || { echo
"Key password was not retrieved by the engine"; exit 1; }
+loggrep 'ENGINE: engine_init called' || { echo "Engine initialization not
detected"; exit 1; }
+loggrep 'ENGINE: engine_load_key called' || { echo "Key was not loaded from
engine"; exit 1; }
+loggrep "ENGINE: engine_load_key got password ${password}" || { echo "Key
password was not retrieved by the engine"; exit 1; }
exit 0
--
2.26.2
___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH applied] Re: Add unit tests for engine keys
ср, 24 июн. 2020 г. в 00:37, Gert Doering :
> Hi,
>
> On Tue, Jun 23, 2020 at 12:32:42PM -0700, James Bottomley wrote:
> > > James, are you triggering on specific openvpn messages? "--enable-
> > > small"
> > > changes these (trimming some warnings and help texts). Can you test
> > > with
> > > "configure --enable-small", please?
> > >
> > > https://travis-ci.org/github/OpenVPN/openvpn/builds/701385033?utm_med
> > > ium=notification_source=email
> >
> > Yes, that's it. The problem is the message output by openssl is
> >
> > 2020-06-23 19:28:46 OpenSSL: error:0B080074:lib(11):func(128):reason(116)
> >
> > Instead of:
> >
> > 2020-06-23 12:30:43 OpenSSL: error:0B080074:x509 certificate
> routines:X509_check_private_key:key values mismatch
>
> Indeed :-)
>
> > I think I can make the grep work with the former.
>
> Please do not forget to output log.txt when it fails - it eases diagnosing
> remote failures where we do not have easy access to "file system things"
> (like travis or buildbot).
>
I've added output of log.txt, if you are going to modify "grep" magic, can
you adopt something like that, please ?
https://travis-ci.org/github/chipitsine/openvpn/jobs/701409750
diff --git a/tests/unit_tests/engine-key/check_engine_keys.sh
b/tests/unit_tests/engine-key/check_engine_keys.sh
index e0c9d7b0..770a0c9c 100755
--- a/tests/unit_tests/engine-key/check_engine_keys.sh
+++ b/tests/unit_tests/engine-key/check_engine_keys.sh
@@ -8,6 +8,10 @@ password='AT3S4PASSWD'
key="${builddir}/client.key"
pwdfile="${builddir}/passwd"
+grep_a_log () {
+ grep -q $1 $2 || { echo $3; cat $2 ; exit 1; }
+}
+
# create an engine key for us
sed 's/PRIVATE KEY/TEST ENGINE KEY/' <
${top_srcdir}/sample/sample-keys/client.key > ${key}
echo "$password" > $pwdfile
@@ -21,10 +25,10 @@ ${top_builddir}/src/openvpn/openvpn --cd
${top_srcdir}/sample --config sample-co
# first off check we died because of a key mismatch. If this doesn't
# pass, suspect openssl of returning different messages and update the
# test accordingly
-grep -q 'X509_check_private_key:key values mismatch' log.txt || { echo
"Key mismatch not detected"; exit 1; }
+grep_a_log 'X509_check_private_key:key values mismatch' log.txt 'Key
mismatch not detected'
# now look for the engine prints (these are under our control)
-grep -q 'ENGINE: engine_init called' log.txt || { echo "Engine
initialization not detected"; exit 1; }
-grep -q 'ENGINE: engine_load_key called' log.txt || { echo "Key was not
loaded from engine"; exit 1; }
-grep -q "ENGINE: engine_load_key got password ${password}" log.txt || {
echo "Key password was not retrieved by the engine"; exit 1; }
+grep_a_log 'ENGINE: engine_init called' log.txt 'Engine initialization not
detected'
+grep_a_log 'ENGINE: engine_load_key called' log.txt 'Key was not loaded
from engine'
+grep_a_log "ENGINE: engine_load_key got password ${password}" log.txt 'Key
password was not retrieved by the engine'
exit 0
--
2.26.2
>
> gert
>
> --
> "If was one thing all people took for granted, was conviction that if you
> feed honest figures into a computer, honest figures come out. Never
> doubted
> it myself till I met a computer with a sense of humor."
> Robert A. Heinlein, The Moon is a Harsh
> Mistress
>
> Gert Doering - Munich, Germany
> g...@greenie.muc.de
>
___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH applied] Re: Add unit tests for engine keys
Hi, On Tue, Jun 23, 2020 at 12:32:42PM -0700, James Bottomley wrote: > > James, are you triggering on specific openvpn messages? "--enable- > > small" > > changes these (trimming some warnings and help texts). Can you test > > with > > "configure --enable-small", please? > > > > https://travis-ci.org/github/OpenVPN/openvpn/builds/701385033?utm_med > > ium=notification_source=email > > Yes, that's it. The problem is the message output by openssl is > > 2020-06-23 19:28:46 OpenSSL: error:0B080074:lib(11):func(128):reason(116) > > Instead of: > > 2020-06-23 12:30:43 OpenSSL: error:0B080074:x509 certificate > routines:X509_check_private_key:key values mismatch Indeed :-) > I think I can make the grep work with the former. Please do not forget to output log.txt when it fails - it eases diagnosing remote failures where we do not have easy access to "file system things" (like travis or buildbot). gert -- "If was one thing all people took for granted, was conviction that if you feed honest figures into a computer, honest figures come out. Never doubted it myself till I met a computer with a sense of humor." Robert A. Heinlein, The Moon is a Harsh Mistress Gert Doering - Munich, Germany g...@greenie.muc.de signature.asc Description: PGP signature ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH applied] Re: Add unit tests for engine keys
On Tue, 2020-06-23 at 21:26 +0200, Gert Doering wrote: > Hi, > > On Tue, Jun 23, 2020 at 08:47:33PM +0200, Gert Doering wrote: > > On Tue, Jun 23, 2020 at 11:36:49PM +0500, ?? > > wrote: > > > Also, I think we should out log.txt in case of failure. > > > > Indeed, this would help. > > Yep. > > The "make distcheck" travis instance is now happy, but the "1.0.2u + > enable-small" instance is still unhappy. > > James, are you triggering on specific openvpn messages? "--enable- > small" > changes these (trimming some warnings and help texts). Can you test > with > "configure --enable-small", please? > > https://travis-ci.org/github/OpenVPN/openvpn/builds/701385033?utm_med > ium=notification_source=email Yes, that's it. The problem is the message output by openssl is 2020-06-23 19:28:46 OpenSSL: error:0B080074:lib(11):func(128):reason(116) Instead of: 2020-06-23 12:30:43 OpenSSL: error:0B080074:x509 certificate routines:X509_check_private_key:key values mismatch I think I can make the grep work with the former. James signature.asc Description: This is a digitally signed message part ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH applied] Re: Add unit tests for engine keys
Hi, On Tue, Jun 23, 2020 at 08:47:33PM +0200, Gert Doering wrote: > On Tue, Jun 23, 2020 at 11:36:49PM +0500, ?? wrote: > > Also, I think we should out log.txt in case of failure. > > Indeed, this would help. Yep. The "make distcheck" travis instance is now happy, but the "1.0.2u + enable-small" instance is still unhappy. James, are you triggering on specific openvpn messages? "--enable-small" changes these (trimming some warnings and help texts). Can you test with "configure --enable-small", please? https://travis-ci.org/github/OpenVPN/openvpn/builds/701385033?utm_medium=notification_source=email gert -- "If was one thing all people took for granted, was conviction that if you feed honest figures into a computer, honest figures come out. Never doubted it myself till I met a computer with a sense of humor." Robert A. Heinlein, The Moon is a Harsh Mistress Gert Doering - Munich, Germany g...@greenie.muc.de signature.asc Description: PGP signature ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH applied] Re: Add unit tests for engine keys
Hi, On Tue, Jun 23, 2020 at 11:36:49PM +0500, ?? wrote: > Also, I think we should out log.txt in case of failure. Indeed, this would help. gert -- "If was one thing all people took for granted, was conviction that if you feed honest figures into a computer, honest figures come out. Never doubted it myself till I met a computer with a sense of humor." Robert A. Heinlein, The Moon is a Harsh Mistress Gert Doering - Munich, Germany g...@greenie.muc.de signature.asc Description: PGP signature ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH applied] Re: Add unit tests for engine keys
вт, 23 июн. 2020 г. в 23:17, James Bottomley <
james.bottom...@hansenpartnership.com>:
> On Tue, 2020-06-23 at 21:43 +0500, Илья Шипицин wrote:
> > as far as I understand, openssl-1.0.2 does not support engines ?
>
> No, it does. Engines were a pre 0.9.8 thing. I support openssl in my
> builds for the TPM engine down to 1.0.1
>
> However, the failure:
>
> > Key mismatch not detected
> >
> > FAIL: check_engine_keys.sh
> >
> >
> >
> > 1 of 1 test failed
> >
> > Please report to openvpn-us...@lists.sourceforge.net
> >
> >
>
> Is because an expected message isn't found in the output. I think it's
> this:
>
># first off check we died because of a key mismatch. If this doesn't
># pass, suspect openssl of returning different messages and update the
># test accordingly
>grep -q 'X509_check_private_key:key values mismatch' log.txt || { echo
> "Key mismatch not detected"; exit 1; }
>
>If I could get hold of log.txt that would confirm that the test is
>outputting something slightly different from what's expected.
>
>I did run this test on openssl-1.0.2j (I keep a copy of
>openSUSE_Leap_42.3 around precisely for this openssl testing) but it
>ran just fine. so there's clearly something different about the 1.0.2u
>you're using (might be a locale issue?).
>
I'll have a look. Also, I think we should out log.txt in case of failure.
>
>James
>
>
___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH applied] Re: Add unit tests for engine keys
On Tue, 2020-06-23 at 21:43 +0500, Илья Шипицин wrote:
> as far as I understand, openssl-1.0.2 does not support engines ?
No, it does. Engines were a pre 0.9.8 thing. I support openssl in my
builds for the TPM engine down to 1.0.1
However, the failure:
> Key mismatch not detected
>
> FAIL: check_engine_keys.sh
>
>
>
> 1 of 1 test failed
>
> Please report to openvpn-us...@lists.sourceforge.net
>
>
Is because an expected message isn't found in the output. I think it's
this:
# first off check we died because of a key mismatch. If this doesn't
# pass, suspect openssl of returning different messages and update the
# test accordingly
grep -q 'X509_check_private_key:key values mismatch' log.txt || { echo "Key
mismatch not detected"; exit 1; }
If I could get hold of log.txt that would confirm that the test is
outputting something slightly different from what's expected.
I did run this test on openssl-1.0.2j (I keep a copy of
openSUSE_Leap_42.3 around precisely for this openssl testing) but it
ran just fine. so there's clearly something different about the 1.0.2u
you're using (might be a locale issue?).
James
___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH applied] Re: Add unit tests for engine keys
Hi, On Tue, Jun 23, 2020 at 09:42:51PM +0500, ?? wrote: > apparently, it fails for some build on travis > https://travis-ci.org/github/OpenVPN/openvpn/jobs/701158156 This is the reason why James sent this new patch - what we have in master works but fails "make distcheck". [..] > > > > - Linux with mbedtls (does not try engine tests, good :-) ) > > > > - Linux with OpenSSL 1.1.1, works > > > > - FreeBSD 11.3 with OpenSSL 1.0.2s -> v6 fails, v6 works \o/ As I've tested the patch with 1.0.2s, I can confirm that it supports engines, at least "enough for our needs". (Haven't had time to verify that "distcheck" works now, busy with other issues to wrangle today) gert -- "If was one thing all people took for granted, was conviction that if you feed honest figures into a computer, honest figures come out. Never doubted it myself till I met a computer with a sense of humor." Robert A. Heinlein, The Moon is a Harsh Mistress Gert Doering - Munich, Germany g...@greenie.muc.de signature.asc Description: PGP signature ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH applied] Re: Add unit tests for engine keys
as far as I understand, openssl-1.0.2 does not support engines ? вт, 23 июн. 2020 г. в 21:42, Илья Шипицин : > apparently, it fails for some build on travis > https://travis-ci.org/github/OpenVPN/openvpn/jobs/701158156 > > вт, 23 июн. 2020 г. в 18:07, James Bottomley < > james.bottom...@hansenpartnership.com>: > >> On Tue, 2020-06-23 at 09:21 +0200, Gert Doering wrote: >> > Hi, >> > >> > On Tue, Jun 23, 2020 at 08:28:36AM +0200, Gert Doering wrote: >> > > Acked-by: Gert Doering >> > > >> > > Tested on : >> > > - MacOS Mojave with OpenSSL 1.1.1c (brew) and out-of-tree build, >> > > works. >> > > - Linux with mbedtls (does not try engine tests, good :-) ) >> > > - Linux with OpenSSL 1.1.1, works >> > > - FreeBSD 11.3 with OpenSSL 1.0.2s -> v6 fails, v6 works \o/ >> > > >> > > Conferred with Arne, we agreed on "this is good enough, and who >> > > wants >> > > something more sophisticated is welcome to send more patches". >> > >> > Oh well. We do need another round - Travis tells me that "make >> > distcheck" >> > is failing. Which hints at "autoconf is not told what to pack in the >> > tarball" >> > >> > https://travis-ci.org/github/OpenVPN/openvpn/jobs/701158155 >> > ... >> > make[6]: Entering directory >> > '/home/travis/build/OpenVPN/openvpn/openvpn- >> > 2.5_git/_build/sub/tests/unit_tests/engine-key' >> > 3672make[6]: *** No rule to make target >> > '../../../../../tests/unit_tests/engine-key/openssl.cnf.in', needed >> > by 'openssl.cnf'. Stop. >> > 3673make[6]: Leaving directory >> > '/home/travis/build/OpenVPN/openvpn/openvpn- >> > 2.5_git/_build/sub/tests/unit_tests/engine-key' >> > 3674 >> > >> > (so now the source file is missing) >> > >> > Please... :-) >> >> Sorry about that ... it's missing files from EXTRA_DIST ... plus I >> don't usually use make dist, so I never remember to run make distcheck. >> It passes after this >> >> ---8>8>8><8<8<8--- >> >> From: James Bottomley >> Subject: [PATCH] Fix make distcheck for new engine key unit test >> >> Add config precursor and script to extra dist and make sure >> built and test leftover files are cleaned up afterwards. >> >> Signed-off-by: James Bottomley >> --- >> tests/unit_tests/engine-key/Makefile.am | 10 -- >> 1 file changed, 8 insertions(+), 2 deletions(-) >> >> diff --git a/tests/unit_tests/engine-key/Makefile.am >> b/tests/unit_tests/engine-key/Makefile.am >> index 95e7d868..0bfdfcd4 100644 >> --- a/tests/unit_tests/engine-key/Makefile.am >> +++ b/tests/unit_tests/engine-key/Makefile.am >> @@ -2,6 +2,9 @@ AUTOMAKE_OPTIONS = foreign >> >> check_LTLIBRARIES = libtestengine.la >> conffiles = openssl.cnf >> +EXTRA_DIST = \ >> + openssl.cnf.in \ >> + check_engine_keys.sh >> >> TESTS_ENVIRONMENT = srcdir="$(abs_srcdir)"; \ >> builddir="$(abs_builddir)"; \ >> @@ -12,8 +15,11 @@ TESTS_ENVIRONMENT = srcdir="$(abs_srcdir)"; \ >> TESTS = check_engine_keys.sh >> check_engine_keys.sh: $(conffiles) >> >> -clean-local: >> - rm -f $(conffiles) >> +CLEANFILES = \ >> + client.key \ >> + passwd \ >> + log.txt \ >> + $(conffiles) >> >> $(builddir)/openssl.cnf: $(srcdir)/openssl.cnf.in >> sed "s|ABSBUILDDIR|$(abs_builddir)|" < $< > $@ >> -- >> 2.26.2 >> >> >> >> ___ >> Openvpn-devel mailing list >> Openvpn-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/openvpn-devel >> > ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH applied] Re: Add unit tests for engine keys
apparently, it fails for some build on travis https://travis-ci.org/github/OpenVPN/openvpn/jobs/701158156 вт, 23 июн. 2020 г. в 18:07, James Bottomley < james.bottom...@hansenpartnership.com>: > On Tue, 2020-06-23 at 09:21 +0200, Gert Doering wrote: > > Hi, > > > > On Tue, Jun 23, 2020 at 08:28:36AM +0200, Gert Doering wrote: > > > Acked-by: Gert Doering > > > > > > Tested on : > > > - MacOS Mojave with OpenSSL 1.1.1c (brew) and out-of-tree build, > > > works. > > > - Linux with mbedtls (does not try engine tests, good :-) ) > > > - Linux with OpenSSL 1.1.1, works > > > - FreeBSD 11.3 with OpenSSL 1.0.2s -> v6 fails, v6 works \o/ > > > > > > Conferred with Arne, we agreed on "this is good enough, and who > > > wants > > > something more sophisticated is welcome to send more patches". > > > > Oh well. We do need another round - Travis tells me that "make > > distcheck" > > is failing. Which hints at "autoconf is not told what to pack in the > > tarball" > > > > https://travis-ci.org/github/OpenVPN/openvpn/jobs/701158155 > > ... > > make[6]: Entering directory > > '/home/travis/build/OpenVPN/openvpn/openvpn- > > 2.5_git/_build/sub/tests/unit_tests/engine-key' > > 3672make[6]: *** No rule to make target > > '../../../../../tests/unit_tests/engine-key/openssl.cnf.in', needed > > by 'openssl.cnf'. Stop. > > 3673make[6]: Leaving directory > > '/home/travis/build/OpenVPN/openvpn/openvpn- > > 2.5_git/_build/sub/tests/unit_tests/engine-key' > > 3674 > > > > (so now the source file is missing) > > > > Please... :-) > > Sorry about that ... it's missing files from EXTRA_DIST ... plus I > don't usually use make dist, so I never remember to run make distcheck. > It passes after this > > ---8>8>8><8<8<8--- > > From: James Bottomley > Subject: [PATCH] Fix make distcheck for new engine key unit test > > Add config precursor and script to extra dist and make sure > built and test leftover files are cleaned up afterwards. > > Signed-off-by: James Bottomley > --- > tests/unit_tests/engine-key/Makefile.am | 10 -- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/tests/unit_tests/engine-key/Makefile.am > b/tests/unit_tests/engine-key/Makefile.am > index 95e7d868..0bfdfcd4 100644 > --- a/tests/unit_tests/engine-key/Makefile.am > +++ b/tests/unit_tests/engine-key/Makefile.am > @@ -2,6 +2,9 @@ AUTOMAKE_OPTIONS = foreign > > check_LTLIBRARIES = libtestengine.la > conffiles = openssl.cnf > +EXTRA_DIST = \ > + openssl.cnf.in \ > + check_engine_keys.sh > > TESTS_ENVIRONMENT = srcdir="$(abs_srcdir)"; \ > builddir="$(abs_builddir)"; \ > @@ -12,8 +15,11 @@ TESTS_ENVIRONMENT = srcdir="$(abs_srcdir)"; \ > TESTS = check_engine_keys.sh > check_engine_keys.sh: $(conffiles) > > -clean-local: > - rm -f $(conffiles) > +CLEANFILES = \ > + client.key \ > + passwd \ > + log.txt \ > + $(conffiles) > > $(builddir)/openssl.cnf: $(srcdir)/openssl.cnf.in > sed "s|ABSBUILDDIR|$(abs_builddir)|" < $< > $@ > -- > 2.26.2 > > > > ___ > Openvpn-devel mailing list > Openvpn-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/openvpn-devel > ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH applied] Re: Add unit tests for engine keys
On Tue, 2020-06-23 at 09:21 +0200, Gert Doering wrote: > Hi, > > On Tue, Jun 23, 2020 at 08:28:36AM +0200, Gert Doering wrote: > > Acked-by: Gert Doering > > > > Tested on : > > - MacOS Mojave with OpenSSL 1.1.1c (brew) and out-of-tree build, > > works. > > - Linux with mbedtls (does not try engine tests, good :-) ) > > - Linux with OpenSSL 1.1.1, works > > - FreeBSD 11.3 with OpenSSL 1.0.2s -> v6 fails, v6 works \o/ > > > > Conferred with Arne, we agreed on "this is good enough, and who > > wants > > something more sophisticated is welcome to send more patches". > > Oh well. We do need another round - Travis tells me that "make > distcheck" > is failing. Which hints at "autoconf is not told what to pack in the > tarball" > > https://travis-ci.org/github/OpenVPN/openvpn/jobs/701158155 > ... > make[6]: Entering directory > '/home/travis/build/OpenVPN/openvpn/openvpn- > 2.5_git/_build/sub/tests/unit_tests/engine-key' > 3672make[6]: *** No rule to make target > '../../../../../tests/unit_tests/engine-key/openssl.cnf.in', needed > by 'openssl.cnf'. Stop. > 3673make[6]: Leaving directory > '/home/travis/build/OpenVPN/openvpn/openvpn- > 2.5_git/_build/sub/tests/unit_tests/engine-key' > 3674 > > (so now the source file is missing) > > Please... :-) Sorry about that ... it's missing files from EXTRA_DIST ... plus I don't usually use make dist, so I never remember to run make distcheck. It passes after this ---8>8>8><8<8<8--- From: James Bottomley Subject: [PATCH] Fix make distcheck for new engine key unit test Add config precursor and script to extra dist and make sure built and test leftover files are cleaned up afterwards. Signed-off-by: James Bottomley --- tests/unit_tests/engine-key/Makefile.am | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/unit_tests/engine-key/Makefile.am b/tests/unit_tests/engine-key/Makefile.am index 95e7d868..0bfdfcd4 100644 --- a/tests/unit_tests/engine-key/Makefile.am +++ b/tests/unit_tests/engine-key/Makefile.am @@ -2,6 +2,9 @@ AUTOMAKE_OPTIONS = foreign check_LTLIBRARIES = libtestengine.la conffiles = openssl.cnf +EXTRA_DIST = \ + openssl.cnf.in \ + check_engine_keys.sh TESTS_ENVIRONMENT = srcdir="$(abs_srcdir)"; \ builddir="$(abs_builddir)"; \ @@ -12,8 +15,11 @@ TESTS_ENVIRONMENT = srcdir="$(abs_srcdir)"; \ TESTS = check_engine_keys.sh check_engine_keys.sh: $(conffiles) -clean-local: - rm -f $(conffiles) +CLEANFILES = \ + client.key \ + passwd \ + log.txt \ + $(conffiles) $(builddir)/openssl.cnf: $(srcdir)/openssl.cnf.in sed "s|ABSBUILDDIR|$(abs_builddir)|" < $< > $@ -- 2.26.2 ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Re: [Openvpn-devel] [PATCH applied] Re: Add unit tests for engine keys
Hi, On Tue, Jun 23, 2020 at 08:28:36AM +0200, Gert Doering wrote: > Acked-by: Gert Doering > > Tested on : > - MacOS Mojave with OpenSSL 1.1.1c (brew) and out-of-tree build, works. > - Linux with mbedtls (does not try engine tests, good :-) ) > - Linux with OpenSSL 1.1.1, works > - FreeBSD 11.3 with OpenSSL 1.0.2s -> v6 fails, v6 works \o/ > > Conferred with Arne, we agreed on "this is good enough, and who wants > something more sophisticated is welcome to send more patches". Oh well. We do need another round - Travis tells me that "make distcheck" is failing. Which hints at "autoconf is not told what to pack in the tarball" https://travis-ci.org/github/OpenVPN/openvpn/jobs/701158155 ... make[6]: Entering directory '/home/travis/build/OpenVPN/openvpn/openvpn-2.5_git/_build/sub/tests/unit_tests/engine-key' 3672make[6]: *** No rule to make target '../../../../../tests/unit_tests/engine-key/openssl.cnf.in', needed by 'openssl.cnf'. Stop. 3673make[6]: Leaving directory '/home/travis/build/OpenVPN/openvpn/openvpn-2.5_git/_build/sub/tests/unit_tests/engine-key' 3674 (so now the source file is missing) Please... :-9 gert -- "If was one thing all people took for granted, was conviction that if you feed honest figures into a computer, honest figures come out. Never doubted it myself till I met a computer with a sense of humor." Robert A. Heinlein, The Moon is a Harsh Mistress Gert Doering - Munich, Germany g...@greenie.muc.de signature.asc Description: PGP signature ___ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
