diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-09-19 14:32:25 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-09-19 14:32:25 +0000 |
| commit | 0a08a33909c1b615af80242bf7535728d1054a33 (patch) | |
| tree | 13bda4e4b22a1d9ce4133dad4e8cc05ce42ef356 /lib | |
| parent | c829d9c6024659a6ef1a28959b0d3f984d11ed7f (diff) | |
remove obfuscating parens. man operator is your friend.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/s3_clnt.c | 12 | ||||
| -rw-r--r-- | lib/libssl/s3_srvr.c | 18 |
2 files changed, 15 insertions, 15 deletions
diff --git a/lib/libssl/s3_clnt.c b/lib/libssl/s3_clnt.c index bbe2b913921..1f64091f87e 100644 --- a/lib/libssl/s3_clnt.c +++ b/lib/libssl/s3_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_clnt.c,v 1.89 2014/09/07 12:16:23 jsing Exp $ */ +/* $OpenBSD: s3_clnt.c,v 1.90 2014/09/19 14:32:23 tedu Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -661,7 +661,7 @@ ssl3_client_hello(SSL *s) RAND_pseudo_bytes(p, SSL3_RANDOM_SIZE); /* Do the message type and length last */ - d = p = &(buf[4]); + d = p = &buf[4]; /* * Version indicates the negotiated version: for example from @@ -1489,10 +1489,10 @@ ssl3_get_key_exchange(SSL *s) (num == 2) ? s->ctx->md5 : s->ctx->sha1, NULL); EVP_DigestUpdate(&md_ctx, - &(s->s3->client_random[0]), + s->s3->client_random, SSL3_RANDOM_SIZE); EVP_DigestUpdate(&md_ctx, - &(s->s3->server_random[0]), + s->s3->server_random, SSL3_RANDOM_SIZE); EVP_DigestUpdate(&md_ctx, param, param_len); EVP_DigestFinal_ex(&md_ctx, q, @@ -1517,9 +1517,9 @@ ssl3_get_key_exchange(SSL *s) } } else { EVP_VerifyInit_ex(&md_ctx, md, NULL); - EVP_VerifyUpdate(&md_ctx, &(s->s3->client_random[0]), + EVP_VerifyUpdate(&md_ctx, s->s3->client_random, SSL3_RANDOM_SIZE); - EVP_VerifyUpdate(&md_ctx, &(s->s3->server_random[0]), + EVP_VerifyUpdate(&md_ctx, s->s3->server_random, SSL3_RANDOM_SIZE); EVP_VerifyUpdate(&md_ctx, param, param_len); if (EVP_VerifyFinal(&md_ctx, p,(int)n, pkey) <= 0) { diff --git a/lib/libssl/s3_srvr.c b/lib/libssl/s3_srvr.c index 7ff3de77f33..18663c6ee3b 100644 --- a/lib/libssl/s3_srvr.c +++ b/lib/libssl/s3_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_srvr.c,v 1.83 2014/09/07 12:16:23 jsing Exp $ */ +/* $OpenBSD: s3_srvr.c,v 1.84 2014/09/19 14:32:24 tedu Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1605,7 +1605,7 @@ ssl3_send_server_key_exchange(SSL *s) goto err; } d = (unsigned char *)s->init_buf->data; - p = &(d[4]); + p = &d[4]; for (i = 0; i < 4 && r[i] != NULL; i++) { s2n(nr[i], p); @@ -1652,12 +1652,12 @@ ssl3_send_server_key_exchange(SSL *s) (num == 2) ? s->ctx->md5 : s->ctx->sha1, NULL); EVP_DigestUpdate(&md_ctx, - &(s->s3->client_random[0]), + s->s3->client_random, SSL3_RANDOM_SIZE); EVP_DigestUpdate(&md_ctx, - &(s->s3->server_random[0]), + s->s3->server_random, SSL3_RANDOM_SIZE); - EVP_DigestUpdate(&md_ctx, &(d[4]), n); + EVP_DigestUpdate(&md_ctx, &d[4], n); EVP_DigestFinal_ex(&md_ctx, q, (unsigned int *)&i); q += i; @@ -1687,13 +1687,13 @@ ssl3_send_server_key_exchange(SSL *s) } EVP_SignInit_ex(&md_ctx, md, NULL); EVP_SignUpdate(&md_ctx, - &(s->s3->client_random[0]), + s->s3->client_random, SSL3_RANDOM_SIZE); EVP_SignUpdate(&md_ctx, - &(s->s3->server_random[0]), + s->s3->server_random, SSL3_RANDOM_SIZE); - EVP_SignUpdate(&md_ctx, &(d[4]), n); - if (!EVP_SignFinal(&md_ctx, &(p[2]), + EVP_SignUpdate(&md_ctx, &d[4], n); + if (!EVP_SignFinal(&md_ctx, &p[2], (unsigned int *)&i, pkey)) { SSLerr( SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, |