fix compiler warnings due to type mismatches (size_t vs. int)

diff --git a/openssh/monitor.c b/openssh/monitor.c
index 99379b9c05df2d2653f5c405094b7dd01cd22f99..494c4303a7e67c2f448f876bbeaee3f36f419cad 100644 (file)
--- a/openssh/monitor.c
+++ b/openssh/monitor.c
@@ -1892,11 +1892,13 @@ int
 mm_answer_gss_sign(int socket, Buffer *m) {
         gss_buffer_desc data,hash;
         OM_uint32 major,minor;
+       u_int len;
 
-        data.value = buffer_get_string(m,&data.length);
-        if (data.length != 16) {  /* HACK - i.e. we are using SSHv1 */
+        data.value = buffer_get_string(m, &len);
+       data.length = len;
         if (data.length != 20)
-                fatal("%s: data length incorrect: %d", __func__, data.length);
+               fatal("%s: data length incorrect: %d", __func__,
+                     (int)data.length);
 
         /* Save the session ID - only first time round */
         if (session_id2_len == 0) {
@@ -1904,7 +1906,6 @@ mm_answer_gss_sign(int socket, Buffer *m) {
                 session_id2 = xmalloc(session_id2_len);
                 memcpy(session_id2, data.value, session_id2_len);
         }
-        } /* HACK - end */
         major=ssh_gssapi_sign(gsscontext, &data, &hash);
 
         xfree(data.value);

diff --git a/openssh/monitor_wrap.c b/openssh/monitor_wrap.c
index 77b3cacacf3e155c320d6cc55d7bd90f946d4a6c..396ec3266d11ffab8607b496ee875471f9d3c5e4 100644 (file)
--- a/openssh/monitor_wrap.c
+++ b/openssh/monitor_wrap.c
@@ -1180,6 +1180,7 @@ OM_uint32
 mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash) {
         Buffer m;
         OM_uint32 major;
+       u_int len;
 
         buffer_init(&m);
         buffer_put_string(&m, data->value, data->length);
@@ -1188,7 +1189,8 @@ mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash) {
         mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m);
 
         major=buffer_get_int(&m);
-        hash->value = buffer_get_string(&m, &hash->length);
+        hash->value = buffer_get_string(&m, &len);
+       hash->length = len;
 
        buffer_free(&m);