From caf396cbda5a0fdd13109ecc792d9705738f1829 Mon Sep 17 00:00:00 2001 From: Olof Hagsand Date: Thu, 24 Jun 2021 17:41:46 +0000 Subject: [PATCH] - disable util_validate - test vagrant: add libnghttp2 dependency --- test/test_restconf_ssl_certs.sh | 2 +- test/vagrant/vagrant.sh | 6 +++++- util/Makefile.in | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/test/test_restconf_ssl_certs.sh b/test/test_restconf_ssl_certs.sh index dec1b1b3..18a363b7 100755 --- a/test/test_restconf_ssl_certs.sh +++ b/test/test_restconf_ssl_certs.sh @@ -288,7 +288,7 @@ EOF new "limited invalid cert" - expectpart "$(curl $CURLOPTS --key $certdir/limited.key --cert $certdir/limited.crt -X GET $RCPROTO://localhost/restconf/data/example:x 2>&1)" "35 55 56" # 55 "certificate expired" + expectpart "$(curl $CURLOPTS --key $certdir/limited.key --cert $certdir/limited.crt -X GET $RCPROTO://localhost/restconf/data/example:x 2>&1)" "16 35 55 56" # 55 "certificate expired" new "too weak cert (sign w md5)" expectpart "$(curl $CURLOPTS --key $certdir/mymd5.key --cert $certdir/mymd5.crt -X GET $RCPROTO://localhost/restconf/data/example:x 2>&1)" 58 "md too weak" diff --git a/test/vagrant/vagrant.sh b/test/vagrant/vagrant.sh index 03fc22ad..efadf216 100755 --- a/test/vagrant/vagrant.sh +++ b/test/vagrant/vagrant.sh @@ -169,6 +169,8 @@ case $release in native) $sshcmd sudo yum install -y libevent openssl $sshcmd sudo yum install -y libevent-devel openssl-devel + $sshcmd sudo dnf config-manager --set-enabled powertools + $sshcmd sudo yum install -y libnghttp2-devel ;; esac ;; @@ -213,7 +215,9 @@ case $release in ;; native) # $sshcmd sudo apt install -y libevent-2.1 - $sshcmd sudo apt install -y libevent-dev libssl-dev + $sshcmd sudo apt install -y libssl-dev + $sshcmd sudo apt install -y libevent-dev # evhtp + $sshcmd sudo apt install -y libnghttp2-dev # nghttp2 ;; esac ;; diff --git a/util/Makefile.in b/util/Makefile.in index 33da0c6d..f857033e 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -91,7 +91,7 @@ APPSRC += clixon_util_path.c APPSRC += clixon_util_datastore.c APPSRC += clixon_util_regexp.c APPSRC += clixon_util_socket.c -APPSRC += clixon_util_validate.c +# APPSRC += clixon_util_validate.c APPSRC += clixon_netconf_ssh_callhome.c APPSRC += clixon_netconf_ssh_callhome_client.c ifdef with_restconf