Commit da0bbdd6 authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

Fix some more gcc-9 warnings [-Wstringop-truncation] 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6586)
parent e78c4f53

apps/passwd.c

+3 −3
Original line number Diff line number Diff line
@@ -306,9 +306,9 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt) 
    out_buf[0] = '$';

    out_buf[1] = 0;

    assert(strlen(magic) <= 4); /* "1" or "apr1" */

    strncat(out_buf, magic, 4);

    strncat(out_buf, "$", 1);

    strncat(out_buf, salt, 8);

    BUF_strlcat(out_buf, magic, sizeof(out_buf));

    BUF_strlcat(out_buf, "$", sizeof(out_buf));

    BUF_strlcat(out_buf, salt, sizeof(out_buf));

    assert(strlen(out_buf) <= 6 + 8); /* "$apr1$..salt.." */

    salt_out = out_buf + 2 + strlen(magic);

    salt_len = strlen(salt_out);

ssl/s3_srvr.c

+5 −4
Original line number Diff line number Diff line
@@ -1959,11 +1959,12 @@ int ssl3_send_server_key_exchange(SSL *s) 


#ifndef OPENSSL_NO_PSK

        if (type & SSL_kPSK) {

            size_t len = strlen(s->ctx->psk_identity_hint);



            /* copy PSK identity hint */

            s2n(strlen(s->ctx->psk_identity_hint), p);

            strncpy((char *)p, s->ctx->psk_identity_hint,

                    strlen(s->ctx->psk_identity_hint));

            p += strlen(s->ctx->psk_identity_hint);

            s2n(len, p);

            memcpy(p, s->ctx->psk_identity_hint, len);

            p += len;

        }

#endif