Skip to contentSkip to conversation

check_engine_keys: make pass with OpenSSL 3

PATCH In review Frank Lichtenheld 2 participants 4 messages Jan 10, 2023 – Jan 11, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 check_engine_keys: make pass with OpenSSL 3

Not enabled by default with OpenSSL 3, so we don't see this in our builds.
While here add missing entries to .gitignore (which is what made me look at engine-key test in the first place).

---
 .gitignore                                       | 4 ++++
 tests/unit_tests/engine-key/check_engine_keys.sh | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
.gitignore +4 -0
index 7335154f..813413fe 100644
@@ -68,6 +68,10 @@ tests/t_client-*-20??????-??????/
 t_client.rc
 t_client_ips.rc
 tests/unit_tests/**/*_testdriver
+tests/unit_tests/engine-key/client.key
+tests/unit_tests/engine-key/log.txt
+tests/unit_tests/engine-key/openssl.cnf
+tests/unit_tests/engine-key/passwd
 
 src/openvpn/openvpn
 include/openvpn-plugin.h
tests/unit_tests/engine-key/check_engine_keys.sh +1 -1
index 7e9a0e80..12dd2301 100755
@@ -27,7 +27,7 @@ ${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
-loggrep '(X509_check_private_key:key values mismatch|func\(128\):reason\(116\))' log.txt || { echo "Key mismatch not detected"; exit 1; }
+loggrep '(x509 certificate routines:(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)
 loggrep 'ENGINE: engine_init called' || { echo "Engine initialization not detected"; exit 1; }
Signature · 1 line
2.34.1
#1 lore raw

Hi,

tests/unit_tests/engine-key/check_engine_keys.sh ${top_builddir}/src/openvpn/openvpn --cd ${top_srcdir}/sample --config sample-co · line 30

Quoted 6 lines · Frank Lichtenheld
tests/unit_tests/engine-key/check_engine_keys.sh +1 -1
@@ -27,7 +27,7 @@ ${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
-loggrep '(X509_check_private_key:key values mismatch|func\(128\):reason\(116\))' log.txt || { echo "Key mismatch not detected"; exit 1; }
+loggrep '(x509 certificate routines:(X509_check_private_key)?:key values mismatch|func\(128\):reason\(116\))' log.txt || { echo "Key mismatch not detected"; exit 1; }

This change does not convince me - assuming normal regex here, the original grep would have found any lines with

X509_check_private_key:key values mismatch

in them, while the new one would find

X509_check_private_key::key values mismatch X509_check_private_key:X509_check_private_key:key values mismatch

but not "the old one with just one :"

Should this be

(x509 certificate routines:(X509_check_private_key:)?key va...

with the second ":" part of the (...:)? zero-or-once match?

(... as a side note, I hate this test... it's easily the test with the most commits to make it behave across platforms and SSL library versions)

gert

Signature · 6 lines
"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                             [email protected]...
#2 lore raw
Quoted 20 lines · Gert Doering

Hi,

tests/unit_tests/engine-key/check_engine_keys.sh ${top_builddir}/src/openvpn/openvpn --cd ${top_srcdir}/sample --config sample-co · line 30

Quoted 6 lines · Frank Lichtenheld
tests/unit_tests/engine-key/check_engine_keys.sh +1 -1
@@ -27,7 +27,7 @@ ${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
-loggrep '(X509_check_private_key:key values mismatch|func\(128\):reason\(116\))' log.txt || { echo "Key mismatch not detected"; exit 1; }
+loggrep '(x509 certificate routines:(X509_check_private_key)?:key values mismatch|func\(128\):reason\(116\))' log.txt || { echo "Key mismatch not detected"; exit 1; }

This change does not convince me - assuming normal regex here, the original grep would have found any lines with

X509_check_private_key:key values mismatch

in them, while the new one would find

X509_check_private_key::key values mismatch X509_check_private_key:X509_check_private_key:key values mismatch

Quoted 7 lines

but not "the old one with just one :"

Should this be

(x509 certificate routines:(X509_check_private_key:)?key va...

with the second ":" part of the (...:)? zero-or-once match?

So, OpenSSL 3 prints:

x509 certificate routines::key values mismatch

yes, two colons!

OpenSSL 1.1 prints:

x509 certificate routines:X509_check_private_key:key values mismatch

My patch matches for both. But you are right that I made it slightly stricter, since it previously we only matched on

X509_check_private_key:key values mismatch

for OpenSSL 1.1. If you would prefer that we could go for

(x509 certificate routines:|X509_check_private_key):key values mismatch

But I like my version better. If that passes buildbot, I think it should be "good enough".

Quoted 2 lines

(... as a side note, I hate this test... it's easily the test with the most commits to make it behave across platforms and SSL library versions)

yeah, definitely.

Regards,

Signature · 1 line
  Frank Lichtenheld
Acked-by on v1 1/1
#3 lore raw
In reply to Frank Lichtenheld

Looking more closely I can see that I misread the regex, and it's all fine indeed. Passing the test on my test candidates (ossl 1.1.x, ossl 3.0.x but no engine support) and also on the GHA actions with both ossl versions.

Your patch has been applied to the master branch.

commit af25448ee19da5d225a6a1f30f26dc3949ed8921 (master) commit d09db604dac1e8140c0e4cad73a8b3d2e21cbebc (release/2.6)

Author: Frank Lichtenheld
Date:   Tue Jan 10 18:02:57 2023 +0100
     check_engine_keys: make pass with OpenSSL 3

     Signed-off-by: Frank Lichtenheld <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg25949.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering