|
 |
5fa452 |
From 8af41abbd3c0b078425963d88494cfa4e22627e5 Mon Sep 17 00:00:00 2001
|
|
|
5fa452 |
From: "Alan T. DeKok" <aland@freeradius.org>
|
|
|
5fa452 |
Date: Tue, 4 Jul 2017 10:12:09 -0400
|
|
|
5fa452 |
Subject: [PATCH] FR-GV-201 - check input / output length in make_secret()
|
|
|
5fa452 |
|
|
|
5fa452 |
---
|
|
|
5fa452 |
src/lib/radius.c | 17 +++++++++++------
|
|
|
5fa452 |
1 file changed, 11 insertions(+), 6 deletions(-)
|
|
|
5fa452 |
|
|
|
5fa452 |
diff --git a/src/lib/radius.c b/src/lib/radius.c
|
|
|
5fa452 |
index b9f0f59c9..62ec11c7a 100644
|
|
|
5fa452 |
--- a/src/lib/radius.c
|
|
|
5fa452 |
+++ b/src/lib/radius.c
|
|
|
5fa452 |
@@ -542,17 +542,17 @@ static ssize_t rad_recvfrom(int sockfd, RADIUS_PACKET *packet, int flags,
|
|
|
5fa452 |
* encrypting passwords to RADIUS.
|
|
|
5fa452 |
*/
|
|
|
5fa452 |
static void make_secret(uint8_t *digest, uint8_t const *vector,
|
|
|
5fa452 |
- char const *secret, uint8_t const *value)
|
|
|
5fa452 |
+ char const *secret, uint8_t const *value, size_t length)
|
|
|
5fa452 |
{
|
|
|
5fa452 |
FR_MD5_CTX context;
|
|
|
5fa452 |
- int i;
|
|
|
5fa452 |
+ size_t i;
|
|
|
5fa452 |
|
|
|
5fa452 |
fr_md5_init(&context);
|
|
|
5fa452 |
fr_md5_update(&context, vector, AUTH_VECTOR_LEN);
|
|
|
5fa452 |
fr_md5_update(&context, (uint8_t const *) secret, strlen(secret));
|
|
|
5fa452 |
fr_md5_final(digest, &context);
|
|
|
5fa452 |
|
|
|
5fa452 |
- for ( i = 0; i < AUTH_VECTOR_LEN; i++ ) {
|
|
|
5fa452 |
+ for ( i = 0; i < length; i++ ) {
|
|
|
5fa452 |
digest[i] ^= value[i];
|
|
|
5fa452 |
}
|
|
|
5fa452 |
}
|
|
|
5fa452 |
@@ -1010,8 +1010,8 @@ static ssize_t vp2data_any(RADIUS_PACKET const *packet,
|
|
|
5fa452 |
* always fits.
|
|
|
5fa452 |
*/
|
|
|
5fa452 |
case FLAG_ENCRYPT_ASCEND_SECRET:
|
|
|
5fa452 |
- if (len != 16) return 0;
|
|
|
5fa452 |
- make_secret(ptr, packet->vector, secret, data);
|
|
|
5fa452 |
+ if (len > AUTH_VECTOR_LEN) len = AUTH_VECTOR_LEN;
|
|
|
5fa452 |
+ make_secret(ptr, packet->vector, secret, data, len);
|
|
|
5fa452 |
len = AUTH_VECTOR_LEN;
|
|
|
5fa452 |
break;
|
|
|
5fa452 |
|
|
|
5fa452 |
@@ -3769,9 +3769,14 @@ ssize_t data2vp(TALLOC_CTX *ctx,
|
|
|
5fa452 |
goto raw;
|
|
|
5fa452 |
} else {
|
|
|
5fa452 |
uint8_t my_digest[AUTH_VECTOR_LEN];
|
|
|
5fa452 |
+ size_t secret_len;
|
|
|
5fa452 |
+
|
|
|
5fa452 |
+ secret_len = datalen;
|
|
|
5fa452 |
+ if (secret_len > AUTH_VECTOR_LEN) secret_len = AUTH_VECTOR_LEN;
|
|
|
5fa452 |
+
|
|
|
5fa452 |
make_secret(my_digest,
|
|
|
5fa452 |
original->vector,
|
|
|
5fa452 |
- secret, data);
|
|
|
5fa452 |
+ secret, data, secret_len);
|
|
|
5fa452 |
memcpy(buffer, my_digest,
|
|
|
5fa452 |
AUTH_VECTOR_LEN );
|
|
|
5fa452 |
buffer[AUTH_VECTOR_LEN] = '\0';
|
|
|
5fa452 |
--
|
|
|
5fa452 |
2.13.2
|
|
|
5fa452 |
|