Blame SOURCES/openssl-0.9.8b-cve-2007-5135.patch

c4366c
Possible one byte buffer overflow in SSL_get_shared_ciphers.
c4366c
CVE-2007-5135
c4366c
diff -up openssl-0.9.8b/ssl/ssl_lib.c.orig openssl-0.9.8b/ssl/ssl_lib.c
c4366c
--- openssl-0.9.8b/ssl/ssl_lib.c.orig	2007-10-08 10:20:42.000000000 +0200
c4366c
+++ openssl-0.9.8b/ssl/ssl_lib.c	2007-10-08 17:32:29.000000000 +0200
c4366c
@@ -1201,7 +1201,6 @@ int SSL_set_cipher_list(SSL *s,const cha
c4366c
 char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len)
c4366c
 	{
c4366c
 	char *p;
c4366c
-	const char *cp;
c4366c
 	STACK_OF(SSL_CIPHER) *sk;
c4366c
 	SSL_CIPHER *c;
c4366c
 	int i;
c4366c
@@ -1214,20 +1213,21 @@ char *SSL_get_shared_ciphers(const SSL *
c4366c
 	sk=s->session->ciphers;
c4366c
 	for (i=0; i
c4366c
 		{
c4366c
-		/* Decrement for either the ':' or a '\0' */
c4366c
-		len--;
c4366c
+		int n;
c4366c
+
c4366c
 		c=sk_SSL_CIPHER_value(sk,i);
c4366c
-		for (cp=c->name; *cp; )
c4366c
+		n=strlen(c->name);
c4366c
+		if (n+1 > len)
c4366c
 			{
c4366c
-			if (len-- <= 0)
c4366c
-				{
c4366c
-				*p='\0';
c4366c
-				return(buf);
c4366c
-				}
c4366c
-			else
c4366c
-				*(p++)= *(cp++);
c4366c
+			if (p != buf)
c4366c
+				--p;
c4366c
+			*p='\0';
c4366c
+			return buf;
c4366c
 			}
c4366c
+		strcpy(p,c->name);
c4366c
+		p+=n;
c4366c
 		*(p++)=':';
c4366c
+		len-=n+1;
c4366c
 		}
c4366c
 	p[-1]='\0';
c4366c
 	return(buf);