Fix WIN32+KRB5 issues.

diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c
index bcf5ebbd3ed737dbfac91f52bd63970e64414787..0f840f439d35f6c38b86328499f6b9451a60e008 100644 (file)
--- a/ssl/d1_clnt.c
+++ b/ssl/d1_clnt.c
@@ -115,6 +115,7 @@
 
 #include <stdio.h>
 #include "ssl_locl.h"
+#include "kssl_lcl.h"
 #include <openssl/buffer.h>
 #include <openssl/rand.h>
 #include <openssl/objects.h>

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 4b1931a71fe1e0f016bf6087e4c4fb564819db11..29cb2170e6f0d226b55d8bacf92337f700f46c83 100644 (file)
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -1886,7 +1886,7 @@ int ssl3_get_client_key_exchange(SSL *s)
                n2s(p,i);
                enc_ticket.length = i;
 
-               if (n < enc_ticket.length + 6)
+               if (n < (int)enc_ticket.length + 6)
                        {
                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
                                SSL_R_DATA_LENGTH_TOO_LONG);
@@ -1899,7 +1899,7 @@ int ssl3_get_client_key_exchange(SSL *s)
                n2s(p,i);
                authenticator.length = i;
 
-               if (n < enc_ticket.length + authenticator.length + 6)
+               if (n < (int)(enc_ticket.length + authenticator.length) + 6)
                        {
                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
                                SSL_R_DATA_LENGTH_TOO_LONG);