Commit 348240c6 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix misc size_t issues causing Windows warnings in 64 bit 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent a14aa99b

ssl/record/ssl3_record.c

+2 −2
Original line number Diff line number Diff line
@@ -1022,8 +1022,8 @@ int tls1_mac(SSL *ssl, SSL3_RECORD *rec, unsigned char *md, int send) 
    header[8] = rec->type;

    header[9] = (unsigned char)(ssl->version >> 8);

    header[10] = (unsigned char)(ssl->version);

    header[11] = (rec->length) >> 8;

    header[12] = (rec->length) & 0xff;

    header[11] = (unsigned char)(rec->length >> 8);

    header[12] = (unsigned char)(rec->length & 0xff);



    if (!send && !SSL_USE_ETM(ssl) &&

        EVP_CIPHER_CTX_mode(ssl->enc_read_ctx) == EVP_CIPH_CBC_MODE &&

ssl/s3_cbc.c

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, 


    if (k > 0) {

        if (is_sslv3) {

            unsigned overhang;

            size_t overhang;



            /*

             * The SSLv3 header is larger than a single block. overhang is

ssl/s3_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ size_t ssl3_final_finish_mac(SSL *s, const char *sender, size_t len, 


    if ((sender != NULL && EVP_DigestUpdate(ctx, sender, len) <= 0)

        || EVP_MD_CTX_ctrl(ctx, EVP_CTRL_SSL3_MASTER_SECRET,

                           s->session->master_key_length,

                           (int)s->session->master_key_length,

                           s->session->master_key) <= 0

        || EVP_DigestFinal_ex(ctx, p, NULL) <= 0) {

        SSLerr(SSL_F_SSL3_FINAL_FINISH_MAC, ERR_R_INTERNAL_ERROR);

ssl/s3_lib.c

+6 −4
Original line number Diff line number Diff line
@@ -3035,9 +3035,10 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) 


    case SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP:

        *(unsigned char **)parg = s->tlsext_ocsp_resp;

        if (s->tlsext_ocsp_resplen == 0)

        if (s->tlsext_ocsp_resplen == 0

                || s->tlsext_ocsp_resplen > LONG_MAX)

            return -1;

        return s->tlsext_ocsp_resplen;

        return (long)s->tlsext_ocsp_resplen;



    case SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP:

        OPENSSL_free(s->tlsext_ocsp_resp);
@@ -3955,9 +3956,10 @@ int ssl_fill_hello_random(SSL *s, int server, unsigned char *result, size_t len) 
        unsigned long Time = (unsigned long)time(NULL);

        unsigned char *p = result;

        l2n(Time, p);

        return RAND_bytes(p, len - 4);

        /* TODO(size_t): Convert this */

        return RAND_bytes(p, (int)(len - 4));

    } else

        return RAND_bytes(result, len);

        return RAND_bytes(result, (int)len);

}



int ssl_generate_master_secret(SSL *s, unsigned char *pms, size_t pmslen,

ssl/ssl_asn1.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static void ssl_session_oinit(ASN1_OCTET_STRING **dest, ASN1_OCTET_STRING *os, 
                              unsigned char *data, size_t len)

{

    os->data = data;

    os->length = len;

    os->length = (int)len;

    os->flags = 0;

    *dest = os;

}