Merge remote-tracking branch 'frr/master' into rip-vrf

Merge commit to solve a bunch of conflicts with other PRs that were
merged in the previous weeks.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

1 files changed, 2 insertions, 7 deletions

diff --git a/lib/md5.c b/lib/md5.c
index 8989a93c59..5a3e7c8d1b 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -375,13 +375,8 @@ static void md5_calc(const uint8_t *b64, md5_ctxt *ctxt)
 }
 
 /* From RFC 2104 */
-void hmac_md5(text, text_len, key, key_len,
-	      digest) unsigned char *text; /* pointer to data stream */
-int text_len;				   /* length of data stream */
-unsigned char *key;			   /* pointer to authentication key */
-int key_len;				   /* length of authentication key */
-uint8_t *digest;			   /* caller digest to be filled in */
-
+void hmac_md5(unsigned char *text, int text_len, unsigned char *key,
+	      int key_len, uint8_t *digest)
 {
 	MD5_CTX context;
 	unsigned char k_ipad[65]; /* inner padding -