diff options
author | tedu <> | 2014-09-19 14:32:24 +0000 |
---|---|---|
committer | tedu <> | 2014-09-19 14:32:24 +0000 |
commit | ddabb314aa9f75db7efa299f3bf6f42df71cedad (patch) | |
tree | 50784e2d0e851fed7414c543c7a85e4badd09df5 /src/lib/libssl/s3_clnt.c | |
parent | 7010b1975cb00c045b15e4d4359d39e81710f38b (diff) | |
download | openbsd-ddabb314aa9f75db7efa299f3bf6f42df71cedad.tar.gz openbsd-ddabb314aa9f75db7efa299f3bf6f42df71cedad.tar.bz2 openbsd-ddabb314aa9f75db7efa299f3bf6f42df71cedad.zip |
remove obfuscating parens. man operator is your friend.
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
-rw-r--r-- | src/lib/libssl/s3_clnt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index bbe2b91392..1f64091f87 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/lib/libssl/s3_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_clnt.c,v 1.89 2014/09/07 12:16:23 jsing Exp $ */ | 1 | /* $OpenBSD: s3_clnt.c,v 1.90 2014/09/19 14:32:23 tedu Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -661,7 +661,7 @@ ssl3_client_hello(SSL *s) | |||
661 | RAND_pseudo_bytes(p, SSL3_RANDOM_SIZE); | 661 | RAND_pseudo_bytes(p, SSL3_RANDOM_SIZE); |
662 | 662 | ||
663 | /* Do the message type and length last */ | 663 | /* Do the message type and length last */ |
664 | d = p = &(buf[4]); | 664 | d = p = &buf[4]; |
665 | 665 | ||
666 | /* | 666 | /* |
667 | * Version indicates the negotiated version: for example from | 667 | * Version indicates the negotiated version: for example from |
@@ -1489,10 +1489,10 @@ ssl3_get_key_exchange(SSL *s) | |||
1489 | (num == 2) ? s->ctx->md5 : s->ctx->sha1, | 1489 | (num == 2) ? s->ctx->md5 : s->ctx->sha1, |
1490 | NULL); | 1490 | NULL); |
1491 | EVP_DigestUpdate(&md_ctx, | 1491 | EVP_DigestUpdate(&md_ctx, |
1492 | &(s->s3->client_random[0]), | 1492 | s->s3->client_random, |
1493 | SSL3_RANDOM_SIZE); | 1493 | SSL3_RANDOM_SIZE); |
1494 | EVP_DigestUpdate(&md_ctx, | 1494 | EVP_DigestUpdate(&md_ctx, |
1495 | &(s->s3->server_random[0]), | 1495 | s->s3->server_random, |
1496 | SSL3_RANDOM_SIZE); | 1496 | SSL3_RANDOM_SIZE); |
1497 | EVP_DigestUpdate(&md_ctx, param, param_len); | 1497 | EVP_DigestUpdate(&md_ctx, param, param_len); |
1498 | EVP_DigestFinal_ex(&md_ctx, q, | 1498 | EVP_DigestFinal_ex(&md_ctx, q, |
@@ -1517,9 +1517,9 @@ ssl3_get_key_exchange(SSL *s) | |||
1517 | } | 1517 | } |
1518 | } else { | 1518 | } else { |
1519 | EVP_VerifyInit_ex(&md_ctx, md, NULL); | 1519 | EVP_VerifyInit_ex(&md_ctx, md, NULL); |
1520 | EVP_VerifyUpdate(&md_ctx, &(s->s3->client_random[0]), | 1520 | EVP_VerifyUpdate(&md_ctx, s->s3->client_random, |
1521 | SSL3_RANDOM_SIZE); | 1521 | SSL3_RANDOM_SIZE); |
1522 | EVP_VerifyUpdate(&md_ctx, &(s->s3->server_random[0]), | 1522 | EVP_VerifyUpdate(&md_ctx, s->s3->server_random, |
1523 | SSL3_RANDOM_SIZE); | 1523 | SSL3_RANDOM_SIZE); |
1524 | EVP_VerifyUpdate(&md_ctx, param, param_len); | 1524 | EVP_VerifyUpdate(&md_ctx, param, param_len); |
1525 | if (EVP_VerifyFinal(&md_ctx, p,(int)n, pkey) <= 0) { | 1525 | if (EVP_VerifyFinal(&md_ctx, p,(int)n, pkey) <= 0) { |