diff options
| author | Arne Schwabe | 2019-06-13 15:48:29 +0200 |
|---|---|---|
| committer | Gert Doering | 2019-07-05 12:32:49 +0200 |
| commit | 0d80b562e48a243c36dba9f1f66c3da6e3b3eb98 (patch) | |
| tree | 9b62beb562f672478362efccefc9351d372123ef /tests | |
| parent | 9f04bf189981517162d82549886f7496497b69a8 (diff) | |
| download | openvpn-0d80b562e48a243c36dba9f1f66c3da6e3b3eb98.zip openvpn-0d80b562e48a243c36dba9f1f66c3da6e3b3eb98.tar.gz | |
Implement --genkey type keyfile syntax and migrate tls-crypt-v2
This unifies our key generation and also migrates the generation
of the tls-crypt-v2 keys. Since tls-crypt-v2 is not included in any
released version, we remove the the old syntax without compatibility.
PATCH V4: Introduce warning/error when using --secret with --genkey
Update non code usages to use new --genkey syntax
Acked-by: David Sommerseth <davids@openvpn.net>
Message-Id: <20190613134834.5709-1-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18524.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/t_lpback.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/t_lpback.sh b/tests/t_lpback.sh index 3b1e73a..d851289 100755 --- a/tests/t_lpback.sh +++ b/tests/t_lpback.sh @@ -38,7 +38,7 @@ CIPHERS=$(echo "$CIPHERS" | egrep -v '^(DES-EDE3-CFB1|DES-CFB1|RC5-)' ) # Also test cipher 'none' CIPHERS=${CIPHERS}$(printf "\nnone") -"${top_builddir}/src/openvpn/openvpn" --genkey --secret key.$$ +"${top_builddir}/src/openvpn/openvpn" --genkey secret key.$$ set +e e=0 @@ -57,7 +57,7 @@ done echo -n "Testing tls-crypt-v2 server key generation..." "${top_builddir}/src/openvpn/openvpn" \ - --tls-crypt-v2-genkey server tc-server-key.$$ >log.$$ 2>&1 + --genkey tls-crypt-v2-server tc-server-key.$$ >log.$$ 2>&1 if [ $? != 0 ] ; then echo "FAILED" cat log.$$ @@ -68,7 +68,7 @@ fi echo -n "Testing tls-crypt-v2 key generation (no metadata)..." "${top_builddir}/src/openvpn/openvpn" --tls-crypt-v2 tc-server-key.$$ \ - --tls-crypt-v2-genkey client tc-client-key.$$ >log.$$ 2>&1 + --genkey tls-crypt-v2-client tc-client-key.$$ >log.$$ 2>&1 if [ $? != 0 ] ; then echo "FAILED" cat log.$$ @@ -86,7 +86,7 @@ while [ $i -lt 732 ]; do done echo -n "Testing tls-crypt-v2 key generation (max length metadata)..." "${top_builddir}/src/openvpn/openvpn" --tls-crypt-v2 tc-server-key.$$ \ - --tls-crypt-v2-genkey client tc-client-key.$$ "${METADATA}" \ + --genkey tls-crypt-v2-client tc-client-key.$$ "${METADATA}" \ >log.$$ 2>&1 if [ $? != 0 ] ; then echo "FAILED" |