summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortedu <>2014-09-19 14:32:24 +0000
committertedu <>2014-09-19 14:32:24 +0000
commitddabb314aa9f75db7efa299f3bf6f42df71cedad (patch)
tree50784e2d0e851fed7414c543c7a85e4badd09df5
parent7010b1975cb00c045b15e4d4359d39e81710f38b (diff)
downloadopenbsd-ddabb314aa9f75db7efa299f3bf6f42df71cedad.tar.gz
openbsd-ddabb314aa9f75db7efa299f3bf6f42df71cedad.tar.bz2
openbsd-ddabb314aa9f75db7efa299f3bf6f42df71cedad.zip
remove obfuscating parens. man operator is your friend.
Diffstat
-rw-r--r--src/lib/libssl/s3_clnt.c12
-rw-r--r--src/lib/libssl/s3_srvr.c18
-rw-r--r--src/lib/libssl/src/ssl/s3_clnt.c12
-rw-r--r--src/lib/libssl/src/ssl/s3_srvr.c18
4 files changed, 30 insertions, 30 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) {
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index 7ff3de77f3..18663c6ee3 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_srvr.c,v 1.83 2014/09/07 12:16:23 jsing Exp $ */ 1/* $OpenBSD: s3_srvr.c,v 1.84 2014/09/19 14:32:24 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 *
@@ -1605,7 +1605,7 @@ ssl3_send_server_key_exchange(SSL *s)
1605 goto err; 1605 goto err;
1606 } 1606 }
1607 d = (unsigned char *)s->init_buf->data; 1607 d = (unsigned char *)s->init_buf->data;
1608 p = &(d[4]); 1608 p = &d[4];
1609 1609
1610 for (i = 0; i < 4 && r[i] != NULL; i++) { 1610 for (i = 0; i < 4 && r[i] != NULL; i++) {
1611 s2n(nr[i], p); 1611 s2n(nr[i], p);
@@ -1652,12 +1652,12 @@ ssl3_send_server_key_exchange(SSL *s)
1652 (num == 2) ? s->ctx->md5 : 1652 (num == 2) ? s->ctx->md5 :
1653 s->ctx->sha1, NULL); 1653 s->ctx->sha1, NULL);
1654 EVP_DigestUpdate(&md_ctx, 1654 EVP_DigestUpdate(&md_ctx,
1655 &(s->s3->client_random[0]), 1655 s->s3->client_random,
1656 SSL3_RANDOM_SIZE); 1656 SSL3_RANDOM_SIZE);
1657 EVP_DigestUpdate(&md_ctx, 1657 EVP_DigestUpdate(&md_ctx,
1658 &(s->s3->server_random[0]), 1658 s->s3->server_random,
1659 SSL3_RANDOM_SIZE); 1659 SSL3_RANDOM_SIZE);
1660 EVP_DigestUpdate(&md_ctx, &(d[4]), n); 1660 EVP_DigestUpdate(&md_ctx, &d[4], n);
1661 EVP_DigestFinal_ex(&md_ctx, q, 1661 EVP_DigestFinal_ex(&md_ctx, q,
1662 (unsigned int *)&i); 1662 (unsigned int *)&i);
1663 q += i; 1663 q += i;
@@ -1687,13 +1687,13 @@ ssl3_send_server_key_exchange(SSL *s)
1687 } 1687 }
1688 EVP_SignInit_ex(&md_ctx, md, NULL); 1688 EVP_SignInit_ex(&md_ctx, md, NULL);
1689 EVP_SignUpdate(&md_ctx, 1689 EVP_SignUpdate(&md_ctx,
1690 &(s->s3->client_random[0]), 1690 s->s3->client_random,
1691 SSL3_RANDOM_SIZE); 1691 SSL3_RANDOM_SIZE);
1692 EVP_SignUpdate(&md_ctx, 1692 EVP_SignUpdate(&md_ctx,
1693 &(s->s3->server_random[0]), 1693 s->s3->server_random,
1694 SSL3_RANDOM_SIZE); 1694 SSL3_RANDOM_SIZE);
1695 EVP_SignUpdate(&md_ctx, &(d[4]), n); 1695 EVP_SignUpdate(&md_ctx, &d[4], n);
1696 if (!EVP_SignFinal(&md_ctx, &(p[2]), 1696 if (!EVP_SignFinal(&md_ctx, &p[2],
1697 (unsigned int *)&i, pkey)) { 1697 (unsigned int *)&i, pkey)) {
1698 SSLerr( 1698 SSLerr(
1699 SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, 1699 SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
diff --git a/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c
index bbe2b91392..1f64091f87 100644
--- a/src/lib/libssl/src/ssl/s3_clnt.c
+++ b/src/lib/libssl/src/ssl/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) {
diff --git a/src/lib/libssl/src/ssl/s3_srvr.c b/src/lib/libssl/src/ssl/s3_srvr.c
index 7ff3de77f3..18663c6ee3 100644
--- a/src/lib/libssl/src/ssl/s3_srvr.c
+++ b/src/lib/libssl/src/ssl/s3_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_srvr.c,v 1.83 2014/09/07 12:16:23 jsing Exp $ */ 1/* $OpenBSD: s3_srvr.c,v 1.84 2014/09/19 14:32:24 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 *
@@ -1605,7 +1605,7 @@ ssl3_send_server_key_exchange(SSL *s)
1605 goto err; 1605 goto err;
1606 } 1606 }
1607 d = (unsigned char *)s->init_buf->data; 1607 d = (unsigned char *)s->init_buf->data;
1608 p = &(d[4]); 1608 p = &d[4];
1609 1609
1610 for (i = 0; i < 4 && r[i] != NULL; i++) { 1610 for (i = 0; i < 4 && r[i] != NULL; i++) {
1611 s2n(nr[i], p); 1611 s2n(nr[i], p);
@@ -1652,12 +1652,12 @@ ssl3_send_server_key_exchange(SSL *s)
1652 (num == 2) ? s->ctx->md5 : 1652 (num == 2) ? s->ctx->md5 :
1653 s->ctx->sha1, NULL); 1653 s->ctx->sha1, NULL);
1654 EVP_DigestUpdate(&md_ctx, 1654 EVP_DigestUpdate(&md_ctx,
1655 &(s->s3->client_random[0]), 1655 s->s3->client_random,
1656 SSL3_RANDOM_SIZE); 1656 SSL3_RANDOM_SIZE);
1657 EVP_DigestUpdate(&md_ctx, 1657 EVP_DigestUpdate(&md_ctx,
1658 &(s->s3->server_random[0]), 1658 s->s3->server_random,
1659 SSL3_RANDOM_SIZE); 1659 SSL3_RANDOM_SIZE);
1660 EVP_DigestUpdate(&md_ctx, &(d[4]), n); 1660 EVP_DigestUpdate(&md_ctx, &d[4], n);
1661 EVP_DigestFinal_ex(&md_ctx, q, 1661 EVP_DigestFinal_ex(&md_ctx, q,
1662 (unsigned int *)&i); 1662 (unsigned int *)&i);
1663 q += i; 1663 q += i;
@@ -1687,13 +1687,13 @@ ssl3_send_server_key_exchange(SSL *s)
1687 } 1687 }
1688 EVP_SignInit_ex(&md_ctx, md, NULL); 1688 EVP_SignInit_ex(&md_ctx, md, NULL);
1689 EVP_SignUpdate(&md_ctx, 1689 EVP_SignUpdate(&md_ctx,
1690 &(s->s3->client_random[0]), 1690 s->s3->client_random,
1691 SSL3_RANDOM_SIZE); 1691 SSL3_RANDOM_SIZE);
1692 EVP_SignUpdate(&md_ctx, 1692 EVP_SignUpdate(&md_ctx,
1693 &(s->s3->server_random[0]), 1693 s->s3->server_random,
1694 SSL3_RANDOM_SIZE); 1694 SSL3_RANDOM_SIZE);
1695 EVP_SignUpdate(&md_ctx, &(d[4]), n); 1695 EVP_SignUpdate(&md_ctx, &d[4], n);
1696 if (!EVP_SignFinal(&md_ctx, &(p[2]), 1696 if (!EVP_SignFinal(&md_ctx, &p[2],
1697 (unsigned int *)&i, pkey)) { 1697 (unsigned int *)&i, pkey)) {
1698 SSLerr( 1698 SSLerr(
1699 SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, 1699 SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-26 08:43:09 +0000