Commit 1bc5c3cc authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Resolve warnings in VC-WIN32 build, which allows to add /WX. 



It's argued that /WX allows to keep better focus on new code, which
motivates its comeback...

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4718)
parent 45a58b16

apps/apps.c

+6 −2
Original line number Diff line number Diff line
@@ -148,6 +148,10 @@ 
#ifdef _WIN32

static int WIN32_rename(const char *from, const char *to);

# define rename(from,to) WIN32_rename((from),(to))

# ifdef fileno

#  undef fileno

# endif

# define fileno(a) (int)_fileno(a)

#endif



typedef struct {
@@ -2788,13 +2792,13 @@ unsigned char *next_protos_parse(unsigned short *outlen, const char *in) 
                OPENSSL_free(out);

                return NULL;

            }

            out[start] = i - start;

            out[start] = (unsigned char)(i - start);

            start = i + 1;

        } else

            out[i + 1] = in[i];

    }



    *outlen = len + 1;

    *outlen = (unsigned char)(len + 1);

    return out;

}

#endif                          /* ndef OPENSSL_NO_TLSEXT */

apps/s_client.c

+5 −4
Original line number Diff line number Diff line
@@ -630,10 +630,11 @@ static int serverinfo_cli_parse_cb(SSL *s, unsigned int ext_type, 
    unsigned char ext_buf[4 + 65536];



    /* Reconstruct the type/len fields prior to extension data */

    ext_buf[0] = ext_type >> 8;

    ext_buf[1] = ext_type & 0xFF;

    ext_buf[2] = inlen >> 8;

    ext_buf[3] = inlen & 0xFF;

    inlen &= 0xffff; /* for formal memcpy correctness */

    ext_buf[0] = (unsigned char)(ext_type >> 8);

    ext_buf[1] = (unsigned char)(ext_type);

    ext_buf[2] = (unsigned char)(inlen >> 8);

    ext_buf[3] = (unsigned char)(inlen);

    memcpy(ext_buf + 4, in, inlen);



    BIO_snprintf(pem_name, sizeof(pem_name), "SERVERINFO FOR EXTENSION %d",

apps/speed.c

+2 −2
Original line number Diff line number Diff line
@@ -2829,8 +2829,8 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher) 


                RAND_bytes(out, 16);

                len += 16;

                aad[11] = len >> 8;

                aad[12] = len;

                aad[11] = (unsigned char)(len >> 8);

                aad[12] = (unsigned char)(len);

                pad = EVP_CIPHER_CTX_ctrl(&ctx,

                                          EVP_CTRL_AEAD_TLS1_AAD,

                                          EVP_AEAD_TLS1_AAD_LEN, aad);

crypto/bio/b_print.c

+2 −2
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ _dopr(char **sbuffer, 
                if (cflags == DP_C_SHORT) {

                    short int *num;

                    num = va_arg(args, short int *);

                    *num = currlen;

                    *num = (short int)currlen;

                } else if (cflags == DP_C_LONG) { /* XXX */

                    long int *num;

                    num = va_arg(args, long int *);
@@ -502,7 +502,7 @@ fmtint(char **sbuffer, 
    if (!(flags & DP_F_UNSIGNED)) {

        if (value < 0) {

            signvalue = '-';

            uvalue = -(unsigned LLONG)value;

            uvalue = 0 - (unsigned LLONG)value;

        } else if (flags & DP_F_PLUS)

            signvalue = '+';

        else if (flags & DP_F_SPACE)

crypto/x509v3/v3_scts.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static void timestamp_print(BIO *out, SCT_TIMESTAMP timestamp) 
    gen = ASN1_GENERALIZEDTIME_new();

    ASN1_GENERALIZEDTIME_adj(gen, (time_t)0,

                             (int)(timestamp / 86400000),

                             (timestamp % 86400000) / 1000);

                             (int)(timestamp % 86400000) / 1000);

    /*

     * Note GeneralizedTime from ASN1_GENERALIZETIME_adj is always 15

     * characters long with a final Z. Update it with fractional seconds.