X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fs3_srvr.c;h=389f708b3ede168cd52322827790d67a575d735b;hp=3f0c1efb7c6bc982e2d8056ae303c48b6f74dba8;hb=80ccc66d7eedb2d06050130c77c482ae1584199a;hpb=2daceb0342c8ca3514f37796e7f983e232d63f2a

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 3f0c1efb7c..389f708b3e 100644
--- 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 char *p,*d,*q;
+	unsigned char *p,*d;
 	SSL_CIPHER *c;
 #ifndef OPENSSL_NO_COMP
+	unsigned char *q;
 	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;
 		}
+#ifndef OPENSSL_NO_COMP
 	q=p;
+#endif
 	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);
-			SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATE_RETURNED);
+			SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
 			goto f_err;
 			}
 		}