diff options
author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2021-06-09 19:54:01 +0200 |
---|---|---|
committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2021-06-09 19:54:01 +0200 |
commit | 596f2e32e38bef076001f4b9a4c75b07fd0264b7 (patch) | |
tree | 9ef95b1d5bdb1c541cfb14fd883a643e15a911e0 /nest | |
parent | 6d26f853951675bd188dbf88d539ccb9d02d7eb1 (diff) |
Nest: Allow both 'password' and 'key' keywords for authentication keys
Diffstat (limited to 'nest')
-rw-r--r-- | nest/config.Y | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nest/config.Y b/nest/config.Y index 94f9b5dc..7ead8589 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -115,7 +115,7 @@ CF_KEYWORDS(ROUTER, ID, HOSTNAME, PROTOCOL, TEMPLATE, PREFERENCE, DISABLED, DEBU CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE, VRF, DEFAULT, TABLE, STATES, ROUTES, FILTERS) CF_KEYWORDS(IPV4, IPV6, VPN4, VPN6, ROA4, ROA6, FLOW4, FLOW6, SADR, MPLS) CF_KEYWORDS(RECEIVE, LIMIT, ACTION, WARN, BLOCK, RESTART, DISABLE, KEEP, FILTERED, RPKI) -CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, CHANNELS, INTERFACES) +CF_KEYWORDS(PASSWORD, KEY, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, CHANNELS, INTERFACES) CF_KEYWORDS(ALGORITHM, KEYED, HMAC, MD5, SHA1, SHA256, SHA384, SHA512, BLAKE2S128, BLAKE2S256, BLAKE2B256, BLAKE2B512) CF_KEYWORDS(PRIMARY, STATS, COUNT, BY, FOR, COMMANDS, PREEXPORT, NOEXPORT, EXPORTED, GENERATE) CF_KEYWORDS(BGP, PASSWORDS, DESCRIPTION, SORTED) @@ -517,9 +517,11 @@ password_item: | password_item_begin password_item_end ; +pass_key: PASSWORD | KEY; + password_item_begin: - PASSWORD text { init_password_list(); init_password($2, strlen($2), password_id++); } - | PASSWORD BYTESTRING { init_password_list(); init_password($2->data, $2->length, password_id++); } + pass_key text { init_password_list(); init_password($2, strlen($2), password_id++); } + | pass_key BYTESTRING { init_password_list(); init_password($2->data, $2->length, password_id++); } ; password_item_params: |