Ede_Vau
/
frr
mirror of https://github.com/FRRouting/frr.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #9191 from idryzhov/rip-auth 

ripd: fix authentication key length
This commit is contained in:
Russ White 2021-08-03 09:29:09 -04:00 committed by GitHub
parent 11093fc905 b5b4f44eb3
commit cdc549b51a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ripd/ripd.c
View File

@ -920,9 +920,11 @@ static int rip_auth_md5(struct rip_packet *packet, struct sockaddr_in *from,
if (key == NULL || key->string == NULL)
return 0;
strlcpy(auth_str, key->string, sizeof(auth_str));
memcpy(auth_str, key->string,
MIN(sizeof(auth_str), strlen(key->string)));
} else if (ri->auth_str)
strlcpy(auth_str, ri->auth_str, sizeof(auth_str));
memcpy(auth_str, ri->auth_str,
MIN(sizeof(auth_str), strlen(ri->auth_str)));
if (auth_str[0] == 0)
return 0;
@ -965,9 +967,11 @@ static void rip_auth_prepare_str_send(struct rip_interface *ri, struct key *key,
memset(auth_str, 0, len);
if (key && key->string)
strlcpy(auth_str, key->string, len);
memcpy(auth_str, key->string,
MIN((size_t)len, strlen(key->string)));
else if (ri->auth_str)
strlcpy(auth_str, ri->auth_str, len);
memcpy(auth_str, ri->auth_str,
MIN((size_t)len, strlen(ri->auth_str)));
return;
}