Test: check openssl 3.3.0 for x509 v1

test/lib.sh

@@ -1268,9 +1268,12 @@ challengePassword      = test
 EOF
 
     # Generate CA cert
-    # XXX v3 requires usage
+    # XXX v3 requires x509 version 1
-    openssl req -batch -new -x509v1 -days 1 -config $tmpdir/ca.cnf -keyout $cakey -out $cacert || err "Generate CA cert"
+    if [ $(openssl version|awk '{print $2}') = "3.3.0" ]; then
-
+        openssl req -batch -new -x509v1 -days 1 -config $tmpdir/ca.cnf -keyout $cakey -out $cacert || err1 "Generate CA cert"
+    else
+        openssl req -batch -new -x509 -days 1 -config $tmpdir/ca.cnf -keyout $cakey -out $cacert || err1 "Generate CA cert"
+    fi
     rm -rf $tmpdir
 }
 

test/test_api.sh

@@ -26,6 +26,9 @@ fi
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_augment.sh

@@ -25,6 +25,9 @@ fyang2=$dir/ietf-interfaces@2019-03-04.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_choice.sh

@@ -20,6 +20,9 @@ mkdir $clidir
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_client.sh

@@ -27,6 +27,9 @@ fi
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_confirmed_commit.sh

@@ -23,6 +23,9 @@ USER=${BUSER}
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_copy_config.sh

@@ -31,6 +31,9 @@ fyang=$dir/ietf-interfaces@2019-03-04.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none true)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_debug.sh

@@ -13,6 +13,9 @@ fyang=$dir/restconf.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 #  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
 cat <<EOF > $cfg

test/test_http_data.sh

@@ -128,6 +128,9 @@ function testrun()
     enable=$2 # true/false
     
     RESTCONFIG=$(restconf_config none false $proto $enable)
+    if [ $? -ne 0 ]; then
+        err1 "Error when generating certs"
+    fi
 
     if true; then
         # Proper test setup

test/test_identity.sh

@@ -13,6 +13,9 @@ fyang=$dir/example-my-crypto.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_nacm.sh

@@ -19,6 +19,9 @@ fyang=$dir/nacm-example.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_nacm_datanode.sh

@@ -50,6 +50,9 @@ fyang2=$dir/itf.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_nacm_datanode_paths.sh

@@ -19,6 +19,9 @@ fyang=$dir/nacm-example.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_nacm_datanode_read.sh

@@ -27,6 +27,9 @@ fyang2=$dir/nacm-example2.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_nacm_datanode_write.sh

@@ -19,6 +19,9 @@ fyang=$dir/nacm-example.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_nacm_default.sh

@@ -15,6 +15,9 @@ fyang=$dir/nacm-example.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_nacm_ext.sh

@@ -18,6 +18,9 @@ nacmfile=$dir/nacmfile
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 # Note filter out example_backend_nacm.so in CLICON_BACKEND_REGEXP below
 cat <<EOF > $cfg

test/test_nacm_module_read.sh

@@ -21,6 +21,9 @@ fyang2=$dir/clixon-example.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_nacm_module_write.sh

@@ -34,6 +34,9 @@ fyang2=$dir/clixon-example.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_nacm_mount.sh

@@ -21,6 +21,9 @@ CFD=$dir/conf.d
 test -d $CFD || mkdir -p $CFD
 
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_nacm_protocol.sh

@@ -36,6 +36,9 @@ fyang=$dir/nacm-example.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_nacm_recovery.sh

@@ -24,6 +24,9 @@ NACMUSER=$(whoami)
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $fyang
 module nacm-example{

test/test_netconf_monitoring_location.sh

@@ -22,6 +22,9 @@ datapath=/data
 wdir=$dir/www
         
 RESTCONFIG=$(restconf_config none false $RCPROTO $enable)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_pagination_draft.sh

@@ -17,6 +17,9 @@ fstate=$dir/mystate.xml
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 # Validate internal state xml
 : ${validatexml:=false}

test/test_perf_restconf.sh

@@ -67,6 +67,9 @@ EOF
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_perf_state.sh

@@ -31,6 +31,9 @@ fstate=$dir/state.xml
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_perf_state_only.sh

@@ -30,6 +30,9 @@ fstate=$dir/state.xml
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_restconf.sh

@@ -53,6 +53,9 @@ if [ "${WITH_RESTCONF}" = "native" ]; then
 else
     # Define default restconfig config: RESTCONFIG
     RESTCONFIG=$(restconf_config none false)
+    if [ $? -ne 0 ]; then
+        err1 "Error when generating certs"
+    fi
 fi
 
 # This is a fixed 'state' implemented in routing_backend. It is assumed to be always there

test/test_restconf_basic_auth.sh

@@ -179,6 +179,9 @@ function testrun()
     
     # Change restconf configuration before start restconf daemon
     RESTCONFIG=$(restconf_config $auth false)
+    if [ $? -ne 0 ]; then
+        err1 "Error when generating certs"
+    fi
 
     # Start with common config, then append fcgi/native specific config
     cat <<EOF > $cfg

test/test_restconf_continue.sh

@@ -27,6 +27,9 @@ fjson=$dir/large.json
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 #  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
 cat <<EOF > $cfg

test/test_restconf_err.sh

@@ -53,6 +53,9 @@ fstate=$dir/state.xml
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 #  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
 cat <<EOF > $cfg

test/test_restconf_http_upgrade.sh

@@ -29,6 +29,9 @@ cfg=$dir/conf.xml
 
 RCPROTO=http
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 # Clixon config
 cat <<EOF > $cfg

test/test_restconf_jukebox.sh

@@ -25,6 +25,9 @@ EOF
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 #  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
 cat <<EOF > $cfg

test/test_restconf_listkey.sh

@@ -13,6 +13,9 @@ fyang=$dir/list.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 #  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
 cat <<EOF > $cfg

test/test_restconf_noalpn.sh

@@ -25,9 +25,6 @@ APPNAME=example
 cfg=$dir/conf.xml
 fyang=$dir/restconf.yang
 
-# Define default restconfig config: RESTCONFIG
-# RESTCONFIG=$(restconf_config none false)
-
 # Local for test here
 certdir=$dir/certs
 test -d $certdir || mkdir $certdir

test/test_restconf_notifications.sh

@@ -53,6 +53,9 @@ xml=$dir/xml.xml
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 #  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
 cat <<EOF > $cfg

test/test_restconf_op.sh

@@ -15,6 +15,9 @@ fyang=$dir/restconf.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 #  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
 cat <<EOF > $cfg

test/test_restconf_plain_patch.sh

@@ -14,6 +14,9 @@ fjukebox=$dir/example-jukebox.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_restconf_startup.sh

@@ -36,6 +36,9 @@ EOF
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none true)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_restconf_yang_patch_json.sh

@@ -22,6 +22,9 @@ fjukebox=$dir/example-jukebox.yang
     
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_restconf_yang_patch_xml.sh

@@ -23,6 +23,9 @@ fexample=$dir/clixon-example.yang
     
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config user false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_rpc.sh

@@ -17,6 +17,9 @@ fyang=$dir/clixon-example.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_submodule.sh

@@ -29,6 +29,9 @@ fextra2=$dir/extra2.yang     # Referenced from sub2
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_yang_anydata.sh

@@ -23,6 +23,9 @@ fstate=$dir/state.xml
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $fanydata
 module any{

test/test_yang_namespace.sh

@@ -15,6 +15,9 @@ fyang2=$dir/example2.yang
 
 # Define default restconfig config: RESTCONFIG
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_yang_schema_mount.sh

@@ -21,6 +21,9 @@ test -d $CFD || mkdir -p $CFD
 
 AUTOCLI=$(autocli_config clixon-\* kw-nokey false)
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_yang_wdcc.sh

@@ -15,6 +15,9 @@ fyang=$dir/example-default.yang
 fstate=$dir/state.xml
 clispec=$dir/spec.cli
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">

test/test_yang_with_defaults.sh

@@ -18,6 +18,9 @@ fyang=$dir/example-default.yang
 fstate=$dir/state.xml
 clispec=$dir/spec.cli
 RESTCONFIG=$(restconf_config none false)
+if [ $? -ne 0 ]; then
+    err1 "Error when generating certs"
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">