tests: Use the default key length when generating RSA keys

This commit removes the explicit set of 1024-bit RSA keys when ovs-pki is launched and so the default (2048-bit) is used. Signed-off-by: Timothy Redaelli <[email protected]> Signed-off-by: Ben Pfaff <[email protected]> Tested-by: Maxime Coquelin <[email protected]>
lxyustc08 · Aug 10, 2018 · 3391136 · 3391136
1 parent 6d947d5
commit 3391136
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at
@@ -1374,7 +1374,7 @@ AT_KEYWORDS([ovs-vsctl ssl])
 AT_SKIP_IF([test "$HAVE_OPENSSL" = no])
 PKIDIR=`pwd`
 OVS_PKI="sh $abs_top_srcdir/utilities/ovs-pki.in --dir=$PKIDIR/pki --log=$PKIDIR/ovs-pki.log"
-AT_CHECK([$OVS_PKI -B 1024 init && $OVS_PKI -B 1024 req+sign vsctl switch && $OVS_PKI -B 1024 req ovsdbserver && $OVS_PKI self-sign ovsdbserver], [0], [ignore], [ignore])
+AT_CHECK([$OVS_PKI init && $OVS_PKI req+sign vsctl switch && $OVS_PKI req ovsdbserver && $OVS_PKI self-sign ovsdbserver], [0], [ignore], [ignore])
 
 dnl Create database.
 OVSDB_INIT([conf.db])
@@ -1401,7 +1401,7 @@ AT_KEYWORDS([ovs-vsctl ssl])
 AT_SKIP_IF([test "$HAVE_OPENSSL" = no])
 PKIDIR=`pwd`
 OVS_PKI="sh $abs_top_srcdir/utilities/ovs-pki.in --dir=$PKIDIR/pki --log=$PKIDIR/ovs-pki.log"
-AT_CHECK([$OVS_PKI -B 1024 init && $OVS_PKI -B 1024 req+sign vsctl switch && $OVS_PKI -B 1024 req+sign ovsdbserver controller], [0], [ignore], [ignore])
+AT_CHECK([$OVS_PKI init && $OVS_PKI req+sign vsctl switch && $OVS_PKI req+sign ovsdbserver controller], [0], [ignore], [ignore])
 
 dnl Create database.
 OVSDB_INIT([conf.db])

diff --git a/tests/ovsdb-rbac.at b/tests/ovsdb-rbac.at
@@ -6,10 +6,10 @@ AT_SKIP_IF([test "$HAVE_OPENSSL" = no])
 
 RBAC_PKIDIR="$(pwd)"
 RBAC_PKI="sh $abs_top_srcdir/utilities/ovs-pki.in --dir=$RBAC_PKIDIR/pki --log=$RBAC_PKIDIR/rbac-pki.log"
-$RBAC_PKI -B 1024 init
-$RBAC_PKI -B 1024 req+sign ovsdb-server switch
-$RBAC_PKI -B 1024 -u req+sign client-1 switch
-$RBAC_PKI -B 1024 -u req+sign client-2 switch
+$RBAC_PKI init
+$RBAC_PKI req+sign ovsdb-server switch
+$RBAC_PKI -u req+sign client-1 switch
+$RBAC_PKI -u req+sign client-2 switch
 
 AT_DATA([schema],
   [[{"name": "mydb",