Commit 3003e0a4 authored by Alessandro Ghedini's avatar Alessandro Ghedini Committed by Andy Polyakov
Browse files

Fix (minor) problems found by ubsan 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent c880b3e3

crypto/evp/scrypt.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static void scryptROMix(unsigned char *B, uint64_t r, uint64_t N, 
        *pV = *pB++;

        *pV |= *pB++ << 8;

        *pV |= *pB++ << 16;

        *pV |= *pB++ << 24;

        *pV |= (uint32_t)*pB++ << 24;

    }



    for (i = 1; i < N; i++, pV += 32 * r)

test/ssltest.c

+6 −1
Original line number Diff line number Diff line
@@ -454,7 +454,12 @@ static int verify_alpn(SSL *client, SSL *server) 
    OPENSSL_free(alpn_selected);

    alpn_selected = NULL;



    if (client_proto_len != server_proto_len ||

    if (client_proto_len != server_proto_len) {

        BIO_printf(bio_stdout, "ALPN selected protocols differ!\n");

        goto err;

    }



    if (client_proto != NULL &&

        memcmp(client_proto, server_proto, client_proto_len) != 0) {

        BIO_printf(bio_stdout, "ALPN selected protocols differ!\n");

        goto err;