From 4ddb3c431a24f55e2e20d36bbcefaf3ab168082d Mon Sep 17 00:00:00 2001 From: jsing <> Date: Tue, 10 Jun 2014 14:49:15 +0000 Subject: Remove pointless casts and use c instead of &c[0], since it is the same thing for an unsigned char array. ok deraadt@ --- src/lib/libssl/src/ssl/s3_enc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/lib/libssl/src/ssl/s3_enc.c b/src/lib/libssl/src/ssl/s3_enc.c index c934e04eea..8f88a4a88d 100644 --- a/src/lib/libssl/src/ssl/s3_enc.c +++ b/src/lib/libssl/src/ssl/s3_enc.c @@ -805,11 +805,7 @@ int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p, int len) { - static const unsigned char *salt[3] = { - (const unsigned char *)"A", - (const unsigned char *)"BB", - (const unsigned char *)"CCC", - }; + static const unsigned char *salt[3] = { "A", "BB", "CCC", }; unsigned char buf[EVP_MAX_MD_SIZE]; EVP_MD_CTX ctx; int i, ret = 0; @@ -820,10 +816,8 @@ ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p, EVP_DigestInit_ex(&ctx, s->ctx->sha1, NULL); EVP_DigestUpdate(&ctx, salt[i], strlen((const char *)salt[i])); EVP_DigestUpdate(&ctx, p, len); - EVP_DigestUpdate(&ctx, &(s->s3->client_random[0]), - SSL3_RANDOM_SIZE); - EVP_DigestUpdate(&ctx, &(s->s3->server_random[0]), - SSL3_RANDOM_SIZE); + EVP_DigestUpdate(&ctx, s->s3->client_random, SSL3_RANDOM_SIZE); + EVP_DigestUpdate(&ctx, s->s3->server_random, SSL3_RANDOM_SIZE); EVP_DigestFinal_ex(&ctx, buf, &n); EVP_DigestInit_ex(&ctx, s->ctx->md5, NULL); -- cgit v1.2.3-55-g6feb