X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Ft1_enc.c;h=e35173823771e9303520f99e4c85b17daa20a1f8;hb=ed5ac22e5bf72e6ce2e53a8b5d2ccaecf8579b8a;hp=ea3cd710e518012b9d5e77f07bba9774c2095aab;hpb=0eab41fb78cf4d7c76e563fd677ab6c32fc28bb0;p=oweals%2Fopenssl.git

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index ea3cd710e5..e351738237 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -137,7 +137,9 @@
 
 #include <stdio.h>
 #include "ssl_locl.h"
+#ifndef OPENSSL_NO_COMP
 #include <openssl/comp.h>
+#endif
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/md5.h>
@@ -804,7 +806,7 @@ int tls1_final_finish_mac(SSL *s,
 		if (mask & s->s3->tmp.new_cipher->algorithm2)
 			{
 			int hashsize = EVP_MD_size(md);
-			if (hashsize < 0 || hashsize > (sizeof buf - (size_t)(q-buf)))
+			if (hashsize < 0 || hashsize > (int)(sizeof buf - (size_t)(q-buf)))
 				{
 				/* internal error: 'buf' is too small for this cipersuite! */
 				err = 1;
@@ -813,7 +815,7 @@ int tls1_final_finish_mac(SSL *s,
 				{
 				EVP_MD_CTX_copy_ex(&ctx,s->s3->handshake_dgst[idx]);
 				EVP_DigestFinal_ex(&ctx,q,&i);
-				if (i != hashsize) /* can't really happen */
+				if (i != (unsigned int)hashsize) /* can't really happen */
 					err = 1;
 				q+=i;
 				}