Merge 19686b3 into bbc9c6d

curl · Jul 7, 2017 · eb4a894 · eb4a894
2 parents bbc9c6d + 19686b3
commit eb4a894
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
@@ -206,7 +206,7 @@ static CURLcode rtmp_connect(struct connectdata *conn, bool *done)
   RTMP *r = conn->proto.generic;
   SET_RCVTIMEO(tv, 10);
 
-  r->m_sb.sb_socket = conn->sock[FIRSTSOCKET];
+  r->m_sb.sb_socket = (int)conn->sock[FIRSTSOCKET];
 
   /* We have to know if it's a write before we send the
    * connect request packet

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
@@ -293,11 +293,13 @@ static CURLcode Curl_ossl_seed(struct Curl_easy *data)
     for(i = 0, i_max = len / sizeof(struct timeval); i < i_max; ++i) {
       struct timeval tv = curlx_tvnow();
       Curl_wait_ms(1);
-      tv.tv_sec *= i + 1;
-      tv.tv_usec *= i + 2;
-      tv.tv_sec ^= ((curlx_tvnow().tv_sec + curlx_tvnow().tv_usec) *
+      tv.tv_sec *= (long)i + 1;
+      tv.tv_usec *= (long)i + 2;
+      tv.tv_sec ^= (long)
+                   ((curlx_tvnow().tv_sec + curlx_tvnow().tv_usec) *
                     (i + 3)) << 8;
-      tv.tv_usec ^= ((curlx_tvnow().tv_sec + curlx_tvnow().tv_usec) *
+      tv.tv_usec ^= (long)
+                    ((curlx_tvnow().tv_sec + curlx_tvnow().tv_usec) *
                      (i + 4)) << 16;
       memcpy(&randb[i * sizeof(struct timeval)], &tv, sizeof(struct timeval));
     }