summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfred M. Szmidt <ams@gnu.org>2011-12-25 13:11:52 +0100
committerAlfred M. Szmidt <ams@gnu.org>2011-12-25 13:11:52 +0100
commit665f1e73cdd9b38e2d2e11b8db9958a315935592 (patch)
tree5d9216c9382d6965c458bcb1e626301d3cb22f8e
parentb48e61c52c10955ca2cc848834c2de306cf0d157 (diff)
downloadinetutils-665f1e73cdd9b38e2d2e11b8db9958a315935592.tar.gz
libtelnet/encrypt.c (encrypt_keyid): Make sure that LEN never is greater than MAXKEYLEN.
-rw-r--r--ChangeLog5
-rw-r--r--libtelnet/encrypt.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index dd381d1..f4e4457 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-25 Alfred M. Szmidt <ams@gnu.org>
+
+ * libtelnet/encrypt.c (encrypt_keyid): Make sure that LEN never is
+ greater than MAXKEYLEN.
+
2011-12-22 Mats Erik Andersson <gnu@gisladisker.se>
* libinetutils/setsig.c (setsig) [HAVE_SIGACTION]: Initialize
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index 06827d9..abfa6d4 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -796,6 +796,9 @@ encrypt_keyid (kp, keyid, len)
int dir = kp->dir;
register int ret = 0;
+ if (len > MAXKEYLEN)
+ len = MAXKEYLEN;
+
if (!(ep = (*kp->getcrypt) (*kp->modep)))
{
if (len == 0)