blob: 957a0e527d6068fb0262405cab11123c6209bdbd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
$NetBSD: patch-ao,v 1.1.10.1 2007/10/22 08:47:23 ghen Exp $
# CVE-2007-5135
--- ssl/ssl_lib.c.orig 2005-06-10 21:00:39.000000000 +0100
+++ ssl/ssl_lib.c
@@ -1169,7 +1169,6 @@ int SSL_set_cipher_list(SSL *s,const cha
char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len)
{
char *p;
- const char *cp;
STACK_OF(SSL_CIPHER) *sk;
SSL_CIPHER *c;
int i;
@@ -1182,20 +1181,21 @@ char *SSL_get_shared_ciphers(const SSL *
sk=s->session->ciphers;
for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
{
- /* Decrement for either the ':' or a '\0' */
- len--;
+ int n;
+
c=sk_SSL_CIPHER_value(sk,i);
- for (cp=c->name; *cp; )
- {
- if (len-- == 0)
- {
- *p='\0';
- return(buf);
- }
- else
- *(p++)= *(cp++);
- }
- *(p++)=':';
+ n=strlen(c->name);
+ if (n+1 > len)
+ {
+ if (p != buf)
+ --p;
+ *p='\0';
+ return buf;
+ }
+ strcpy(p,c->name);
+ p+=n;
+ *(p++)=':';
+ len-=n+1;
}
p[-1]='\0';
return(buf);
|
