proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-25 12:18:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Drop SSH public key for RPKI CLI option

Browse Source 
It's not used anywhere.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2022-06-20 22:22:07 +03:00
parent cc22635ac4
commit 2a5f5ec00f
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bgpd/bgp_rpki.c
View File

@ -114,7 +114,6 @@ static struct rtr_mgr_group *get_groups(void);
#if defined(FOUND_SSH) #if defined(FOUND_SSH)
static int add_ssh_cache(const char *host, const unsigned int port, static int add_ssh_cache(const char *host, const unsigned int port,
const char *username, const char *client_privkey_path, const char *username, const char *client_privkey_path,
const char *client_pubkey_path,
const char *server_pubkey_path, const char *server_pubkey_path,
const uint8_t preference, const char *bindaddr); const uint8_t preference, const char *bindaddr);
#endif #endif
@ -928,7 +927,6 @@ static int add_tcp_cache(const char *host, const char *port,
#if defined(FOUND_SSH) #if defined(FOUND_SSH)
static int add_ssh_cache(const char *host, const unsigned int port, static int add_ssh_cache(const char *host, const unsigned int port,
const char *username, const char *client_privkey_path, const char *username, const char *client_privkey_path,
const char *client_pubkey_path,
const char *server_pubkey_path, const char *server_pubkey_path,
const uint8_t preference, const char *bindaddr) const uint8_t preference, const char *bindaddr)
{ {
@ -1184,15 +1182,15 @@ DEFUN (no_rpki_retry_interval,
} }
DEFPY(rpki_cache, rpki_cache_cmd, DEFPY(rpki_cache, rpki_cache_cmd,
"rpki cache <A.B.C.D|WORD> <TCPPORT|(1-65535)$sshport SSH_UNAME SSH_PRIVKEY SSH_PUBKEY [SERVER_PUBKEY]> [source <A.B.C.D>$bindaddr] preference (1-255)", "rpki cache <A.B.C.D|WORD> <TCPPORT|(1-65535)$sshport SSH_UNAME SSH_PRIVKEY [SERVER_PUBKEY]> [source <A.B.C.D>$bindaddr] preference (1-255)",
RPKI_OUTPUT_STRING RPKI_OUTPUT_STRING
"Install a cache server to current group\n" "Install a cache server to current group\n"
"IP address of cache server\n Hostname of cache server\n" "IP address of cache server\n"
"Hostname of cache server\n"
"TCP port number\n" "TCP port number\n"
"SSH port number\n" "SSH port number\n"
"SSH user name\n" "SSH user name\n"
"Path to own SSH private key\n" "Path to own SSH private key\n"
"Path to own SSH public key\n"
"Path to Public key of cache server\n" "Path to Public key of cache server\n"
"Configure source IP address of RPKI connection\n" "Configure source IP address of RPKI connection\n"
"Define a Source IP Address\n" "Define a Source IP Address\n"
@ -1216,8 +1214,8 @@ DEFPY(rpki_cache, rpki_cache_cmd,
// use ssh connection // use ssh connection
if (ssh_uname) { if (ssh_uname) {
#if defined(FOUND_SSH) #if defined(FOUND_SSH)
return_value = add_ssh_cache( return_value =
cache, sshport, ssh_uname, ssh_privkey, ssh_pubkey, add_ssh_cache(cache, sshport, ssh_uname, ssh_privkey,
server_pubkey, preference, bindaddr_str); server_pubkey, preference, bindaddr_str);
#else #else
return_value = SUCCESS; return_value = SUCCESS;
@ -1239,16 +1237,16 @@ DEFPY(rpki_cache, rpki_cache_cmd,
DEFPY (no_rpki_cache, DEFPY (no_rpki_cache,
no_rpki_cache_cmd, no_rpki_cache_cmd,
"no rpki cache <A.B.C.D|WORD> <TCPPORT|(1-65535)$sshport SSH_UNAME SSH_PRIVKEY SSH_PUBKEY [SERVER_PUBKEY]> [source <A.B.C.D>$bindaddr] preference (1-255)", "no rpki cache <A.B.C.D|WORD> <TCPPORT|(1-65535)$sshport SSH_UNAME SSH_PRIVKEY [SERVER_PUBKEY]> [source <A.B.C.D>$bindaddr] preference (1-255)",
NO_STR NO_STR
RPKI_OUTPUT_STRING RPKI_OUTPUT_STRING
"Install a cache server to current group\n" "Install a cache server to current group\n"
"IP address of cache server\n Hostname of cache server\n" "IP address of cache server\n"
"Hostname of cache server\n"
"TCP port number\n" "TCP port number\n"
"SSH port number\n" "SSH port number\n"
"SSH user name\n" "SSH user name\n"
"Path to own SSH private key\n" "Path to own SSH private key\n"
"Path to own SSH public key\n"
"Path to Public key of cache server\n" "Path to Public key of cache server\n"
"Configure source IP address of RPKI connection\n" "Configure source IP address of RPKI connection\n"
"Define a Source IP Address\n" "Define a Source IP Address\n"

8
doc/user/rpki.rst
View File

@ -120,7 +120,7 @@ The following commands are independent of a specific cache server.
The default value is 600 seconds. The default value is 600 seconds.
.. clicmd:: rpki cache (A.B.C.D|WORD) PORT [SSH_USERNAME] [SSH_PRIVKEY_PATH] [SSH_PUBKEY_PATH] [KNOWN_HOSTS_PATH] [source A.B.C.D] PREFERENCE .. clicmd:: rpki cache (A.B.C.D|WORD) PORT [SSH_USERNAME] [SSH_PRIVKEY_PATH] [KNOWN_HOSTS_PATH] [source A.B.C.D] PREFERENCE
Add a cache server to the socket. By default, the connection between router Add a cache server to the socket. By default, the connection between router
@ -137,15 +137,9 @@ The following commands are independent of a specific cache server.
SSH_USERNAME SSH_USERNAME
SSH username to establish an SSH connection to the cache server. SSH username to establish an SSH connection to the cache server.
SSH_PRIVKEY_PATH SSH_PRIVKEY_PATH
Local path that includes the private key file of the router. Local path that includes the private key file of the router.
SSH_PUBKEY_PATH
Local path that includes the public key file of the router.
KNOWN_HOSTS_PATH KNOWN_HOSTS_PATH
Local path that includes the known hosts file. The default value depends Local path that includes the known hosts file. The default value depends
on the configuration of the operating system environment, usually on the configuration of the operating system environment, usually