projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid unnecessary fragmentation.
[openssl.git]
/
ssl
/
s3_srvr.c
diff --git
a/ssl/s3_srvr.c
b/ssl/s3_srvr.c
index 3f0c1efb7c6bc982e2d8056ae303c48b6f74dba8..389f708b3ede168cd52322827790d67a575d735b 100644
(file)
--- a/
ssl/s3_srvr.c
+++ b/
ssl/s3_srvr.c
@@
-940,9
+940,10
@@
int ssl3_get_client_hello(SSL *s)
unsigned int cookie_len;
long n;
unsigned long id;
unsigned int cookie_len;
long n;
unsigned long id;
- unsigned char *p,*d
,*q
;
+ unsigned char *p,*d;
SSL_CIPHER *c;
#ifndef OPENSSL_NO_COMP
SSL_CIPHER *c;
#ifndef OPENSSL_NO_COMP
+ unsigned char *q;
SSL_COMP *comp=NULL;
#endif
STACK_OF(SSL_CIPHER) *ciphers=NULL;
SSL_COMP *comp=NULL;
#endif
STACK_OF(SSL_CIPHER) *ciphers=NULL;
@@
-1178,7
+1179,9
@@
int ssl3_get_client_hello(SSL *s)
SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_LENGTH_MISMATCH);
goto f_err;
}
SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_LENGTH_MISMATCH);
goto f_err;
}
+#ifndef OPENSSL_NO_COMP
q=p;
q=p;
+#endif
for (j=0; j<i; j++)
{
if (p[j] == 0) break;
for (j=0; j<i; j++)
{
if (p[j] == 0) break;
@@
-3348,7
+3351,7
@@
int ssl3_get_client_certificate(SSL *s)
if (i <= 0)
{
al=ssl_verify_alarm_type(s->verify_result);
if (i <= 0)
{
al=ssl_verify_alarm_type(s->verify_result);
- SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_
NO_CERTIFICATE_RETURN
ED);
+ SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_
CERTIFICATE_VERIFY_FAIL
ED);
goto f_err;
}
}
goto f_err;
}
}