projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ef1fe90
)
make no-comp compile again
author
Dr. Stephen Henson
<steve@openssl.org>
Tue, 30 Mar 2010 17:31:58 +0000
(17:31 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Tue, 30 Mar 2010 17:31:58 +0000
(17:31 +0000)
ssl/s23_clnt.c
patch
|
blob
|
history
diff --git
a/ssl/s23_clnt.c
b/ssl/s23_clnt.c
index de0238935a2f93bbaff8a4431cced9b805993a7e..c6b9142c909cad2174611bee996b1d7ed4e1cd08 100644
(file)
--- a/
ssl/s23_clnt.c
+++ b/
ssl/s23_clnt.c
@@
-369,7
+369,9
@@
static int ssl23_client_hello(SSL *s)
}
s2n(i,p);
p+=i;
-
+#ifdef OPENSSL_NO_COMP
+ *(p++)=1;
+#else
/* COMPRESSION */
if (s->ctx->comp_methods == NULL)
j=0;
@@
-381,6
+383,7
@@
static int ssl23_client_hello(SSL *s)
comp=sk_SSL_COMP_value(s->ctx->comp_methods,i);
*(p++)=comp->id;
}
+#endif
*(p++)=0; /* Add the NULL method */
#ifndef OPENSSL_NO_TLSEXT
if ((p = ssl_add_clienthello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL)