diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-26 17:44:18 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-26 17:44:18 +0000 |
| commit | 1da76b3706a6c9bd41bf8f219d7c97de5e1e5c7f (patch) | |
| tree | 9930fb4bb87cd6037f60efff9656f967121c8c2d /extcap/wifidump.c | |
| parent | Adding debian version 4.2.2-1.1. (diff) | |
| download | wireshark-1da76b3706a6c9bd41bf8f219d7c97de5e1e5c7f.tar.xz wireshark-1da76b3706a6c9bd41bf8f219d7c97de5e1e5c7f.zip | |
Merging upstream version 4.2.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | extcap/wifidump.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/extcap/wifidump.c b/extcap/wifidump.c index 489118eb..ba3a6364 100644 --- a/extcap/wifidump.c +++ b/extcap/wifidump.c @@ -59,6 +59,7 @@ enum { OPT_SSHKEY, OPT_SSHKEY_PASSPHRASE, OPT_PROXYCOMMAND, + OPT_SSH_SHA1, OPT_REMOTE_COUNT }; @@ -456,6 +457,10 @@ static int list_config(char *interface) printf("arg {number=%u}{call=--sshkey-passphrase}{display=SSH key passphrase}" "{type=password}{tooltip=Passphrase to unlock the SSH private key}{group=Authentication}\n", inc++); + printf("arg {number=%u}{call=--ssh-sha1}{display=Support SHA-1 keys (deprecated)}" + "{type=boolflag}{tooltip=Support keys and key exchange algorithms using SHA-1 (deprecated)}{group=Authentication}" + "\n", inc++); + // Capture tab printf("arg {number=%u}{call=--remote-interface}{display=Remote interface}" @@ -579,6 +584,7 @@ int main(int argc, char *argv[]) extcap_help_add_option(extcap_conf, "--remote-password <password>", "the remote SSH password. If not specified, ssh-agent and ssh-key are used"); extcap_help_add_option(extcap_conf, "--sshkey <public key path>", "the path of the ssh key"); extcap_help_add_option(extcap_conf, "--sshkey-passphrase <public key passphrase>", "the passphrase to unlock public ssh"); + extcap_help_add_option(extcap_conf, "--ssh-sha1", "support keys and key exchange using SHA-1 (deprecated)"); extcap_help_add_option(extcap_conf, "--remote-interface <iface>", "the remote capture interface"); extcap_help_add_option(extcap_conf, "--remote-channel-frequency <channel_frequency>", "the remote channel frequency in MHz"); extcap_help_add_option(extcap_conf, "--remote-channel-width <channel_width>", "the remote channel width in MHz"); @@ -641,6 +647,10 @@ int main(int argc, char *argv[]) memset(ws_optarg, 'X', strlen(ws_optarg)); break; + case OPT_SSH_SHA1: + ssh_params->ssh_sha1 = true; + break; + case OPT_REMOTE_INTERFACE: g_free(remote_interface); remote_interface = g_strdup(ws_optarg); |