DVG-5770109_SSL_get_shared_ciphers.patch [plain text]
diff -uNr ../openssl-0.9.7l.orig/ssl/ssl_lib.c ./ssl/ssl_lib.c
--- ../openssl-0.9.7l.orig/ssl/ssl_lib.c 2006-09-28 04:53:51.000000000 -0700
+++ ./ssl/ssl_lib.c 2008-02-28 12:34:53.000000000 -0800
@@ -1169,7 +1169,6 @@
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 @@
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; )
+ n=strlen(c->name);
+ if (n+1 > len)
{
- if (len-- <= 0)
- {
- *p='\0';
- return(buf);
- }
- else
- *(p++)= *(cp++);
+ if (p != buf)
+ --p;
+ *p='\0';
+ return buf;
}
+ strcpy(p,c->name);
+ p+=n;
*(p++)=':';
+ len-=n+1;
}
p[-1]='\0';
return(buf);