GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-08-10 18:31:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

tests: fix test-sighup-key-change for current OpenConnect

Browse Source 
OpenConnect 7.08 removed the option `--no-cert-check`. Pass the actual
id of the newly generated server key. On systems with older versions of
GnuTLS, pass the server key fingerprint instead.

Resolves #81

Signed-off-by: Mike Miller <mtmiller@debian.org>
This commit is contained in:
Mike Miller
2016-12-17 12:52:15 -08:00
parent 273024c7ce
commit dc222463e0
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test-sighup-key-change
+8 -1
View File
@@ -77,12 +77,19 @@ sleep 10
certtool --generate-privkey --outfile "${SERVER_KEY}" 2>/dev/null
certtool --generate-self-signed --load-privkey "${SERVER_KEY}" --template "${TEMPLATE}" --outfile "${SERVER_CERT}" 2>/dev/null
CERTARG=`certtool --key-id < "${SERVER_CERT}" 2>/dev/null | grep -v '^Invalid option'`
if test -n "$CERTARG";then
CERTARG="sha1:${CERTARG}"
else
CERTARG=`certtool -i < "${SERVER_CERT}" 2>/dev/null | sed -n '/SHA-*1 fingerprint:/{x;N;s/.*\s\([0-9a-f]\+\).*/\1/;p}'`
fi
echo "Reloading server with new key/cert pair"
kill -HUP $PID
sleep 5
echo -n "Connecting to obtain cookie (with certificate)... "
( LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS:$PORT --sslkey "${srcdir}/certs/user-key.pem" -c "${srcdir}/certs/user-cert.pem" --no-cert-check --cookieonly </dev/null >/dev/null 2>&1 ) ||
( LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS:$PORT --sslkey "${srcdir}/certs/user-key.pem" -c "${srcdir}/certs/user-cert.pem" --servercert="${CERTARG}" --cookieonly </dev/null >/dev/null 2>&1 ) ||
fail $PID "Could not connect with certificate!"
echo ok