summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
-rw-r--r--src/lib/libssl/t1_lib.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index 03af6e29ef..46b47a95b7 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: t1_lib.c,v 1.49 2014/07/09 11:10:51 bcook Exp $ */ 1/* $OpenBSD: t1_lib.c,v 1.50 2014/07/12 22:33:39 jsing 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 *
@@ -1477,7 +1477,7 @@ ssl_prepare_clienthello_tlsext(SSL *s)
1477 1477
1478 alg_k = c->algorithm_mkey; 1478 alg_k = c->algorithm_mkey;
1479 alg_a = c->algorithm_auth; 1479 alg_a = c->algorithm_auth;
1480 if ((alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe) || 1480 if ((alg_k & (SSL_kECDHE|SSL_kECDHr|SSL_kECDHe) ||
1481 (alg_a & SSL_aECDSA))) { 1481 (alg_a & SSL_aECDSA))) {
1482 using_ecc = 1; 1482 using_ecc = 1;
1483 break; 1483 break;
@@ -1524,7 +1524,7 @@ ssl_prepare_serverhello_tlsext(SSL *s)
1524 1524
1525 unsigned long alg_k = s->s3->tmp.new_cipher->algorithm_mkey; 1525 unsigned long alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
1526 unsigned long alg_a = s->s3->tmp.new_cipher->algorithm_auth; 1526 unsigned long alg_a = s->s3->tmp.new_cipher->algorithm_auth;
1527 int using_ecc = (alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe)) || (alg_a & SSL_aECDSA); 1527 int using_ecc = (alg_k & (SSL_kECDHE|SSL_kECDHr|SSL_kECDHe)) || (alg_a & SSL_aECDSA);
1528 using_ecc = using_ecc && (s->session->tlsext_ecpointformatlist != NULL); 1528 using_ecc = using_ecc && (s->session->tlsext_ecpointformatlist != NULL);
1529 1529
1530 if (using_ecc) { 1530 if (using_ecc) {
@@ -1650,7 +1650,7 @@ ssl_check_serverhello_tlsext(SSL *s)
1650 (s->tlsext_ecpointformatlist_length > 0) && 1650 (s->tlsext_ecpointformatlist_length > 0) &&
1651 (s->session->tlsext_ecpointformatlist != NULL) && 1651 (s->session->tlsext_ecpointformatlist != NULL) &&
1652 (s->session->tlsext_ecpointformatlist_length > 0) && 1652 (s->session->tlsext_ecpointformatlist_length > 0) &&
1653 ((alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe)) || (alg_a & SSL_aECDSA))) { 1653 ((alg_k & (SSL_kECDHE|SSL_kECDHr|SSL_kECDHe)) || (alg_a & SSL_aECDSA))) {
1654 /* we are using an ECC cipher */ 1654 /* we are using an ECC cipher */
1655 size_t i; 1655 size_t i;
1656 unsigned char *list; 1656 unsigned char *list;