mirror of
https://github.com/xcat2/xcat-core.git
synced 2025-06-24 15:05:36 +00:00
Merge pull request #7198 from peterwywong/revert-hostkeys
Revert PR 7193 - Need a better approach to extract supported host keys
This commit is contained in:
@ -21,16 +21,6 @@ check:rc==0
|
||||
check:output=~running
|
||||
cmd:rm -rf /install_xCAT_xcat-core.tar.bz2 /install_xCAT_xcat-dep.tar.bz2
|
||||
|
||||
# Check host keys supported by the operating system and report new ones, if any.
|
||||
cmd:echo -e "dsa\necdsa\ned25519\nrsa\nrsa1" > /tmp/known_host_keys
|
||||
check:rc==0
|
||||
cmd:ssh-keygen --help 2>&1 | grep "\[-t" | cut -d "[" -f4 | cut -d "]" -f1 | sed 's/-t//' | sed 's/|//g' | xargs -n 1 > /tmp/current_os_host_keys
|
||||
check:rc==0
|
||||
cmd:diff /tmp/known_host_keys /tmp/current_os_host_keys
|
||||
check:output!~>
|
||||
cmd:rm -f /tmp/known_host_keys /tmp/current_os_host_keys
|
||||
check:rc==0
|
||||
|
||||
# Obtain the highest version of TLS supported by OpenSSL/TLS.
|
||||
cmd:openssl s_client --help 2>&1 | grep "\-tls1" | awk '{print $1}' | sort | tail -1
|
||||
check:rc==0
|
||||
@ -71,16 +61,6 @@ cmd:sleep 5
|
||||
cmd:service goconserver status
|
||||
cmd:service conserver status
|
||||
|
||||
# Check host keys supported by the operating system and report new ones, if any.
|
||||
cmd:echo -e "dsa\necdsa\ned25519\nrsa\nrsa1" > /tmp/known_host_keys
|
||||
check:rc==0
|
||||
cmd:ssh-keygen --help 2>&1 | grep "\[-t" | cut -d "[" -f4 | cut -d "]" -f1 | sed 's/-t//' | sed 's/|//g' | xargs -n 1 > /tmp/current_os_host_keys
|
||||
check:rc==0
|
||||
cmd:diff /tmp/known_host_keys /tmp/current_os_host_keys
|
||||
check:output!~>
|
||||
cmd:rm -f /tmp/known_host_keys /tmp/current_os_host_keys
|
||||
check:rc==0
|
||||
|
||||
# Obtain the highest version of TLS supported by OpenSSL/TLS.
|
||||
cmd:openssl s_client --help 2>&1 | grep "\-tls1" | awk '{print $1}' | sort | tail -1
|
||||
check:rc==0
|
||||
|
Reference in New Issue
Block a user