diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index ebdc239cb..74f5abe13 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1824,8 +1824,7 @@ err:
 int ssl3_get_cert_status(SSL *s)
 	{
 	int ok, al;
-	unsigned long resplen;
-	long n;
+	unsigned long resplen,n;
 	const unsigned char *p;
 
 	n=s->method->ssl_get_message(s,
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index ee511a651..3a349920d 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -793,8 +793,8 @@ int tls1_final_finish_mac(SSL *s,
 		{
 		if (mask & s->s3->tmp.new_cipher->algorithm2)
 			{
-			int hashsize = EVP_MD_size(md);
-			if ((size_t)hashsize > (sizeof buf - (size_t)(q-buf)))
+			unsigned int hashsize = EVP_MD_size(md);
+			if (hashsize > (sizeof buf - (size_t)(q-buf)))
 				{
 				/* internal error: 'buf' is too small for this cipersuite! */
 				err = 1;