summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_srvr.c
diff options
context:
space:
mode:
authorjsing <>2018-08-19 15:38:03 +0000
committerjsing <>2018-08-19 15:38:03 +0000
commite081c84895470c8464a8df8c8263cc07071bc844 (patch)
tree51b241a94a4954d6e015ae2a61f04f2bc963f114 /src/lib/libssl/ssl_srvr.c
parent9d1923bca80e91560a5f939cbcdd04c1d25383c2 (diff)
downloadopenbsd-e081c84895470c8464a8df8c8263cc07071bc844.tar.gz
openbsd-e081c84895470c8464a8df8c8263cc07071bc844.tar.bz2
openbsd-e081c84895470c8464a8df8c8263cc07071bc844.zip
Rename and collapse tls12_get_sigandhash_cbb().
Now that all callers of tls12_get_sigandhash() have been converted to CBB, collapse tls12_get_sigandhash() and tls12_get_sigandhash_cbb() into a single function. Rename it to tls12_gethashandsig() to be representative of the actual order of the sigalgs parameters, and perform some other clean up. ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_srvr.c')
-rw-r--r--src/lib/libssl/ssl_srvr.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c
index 80c7208c13..01fe647500 100644
--- a/src/lib/libssl/ssl_srvr.c
+++ b/src/lib/libssl/ssl_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_srvr.c,v 1.40 2018/08/19 15:29:26 jsing Exp $ */ 1/* $OpenBSD: ssl_srvr.c,v 1.41 2018/08/19 15:38:03 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 *
@@ -1565,8 +1565,7 @@ ssl3_send_server_key_exchange(SSL *s)
1565 1565
1566 /* Send signature algorithm. */ 1566 /* Send signature algorithm. */
1567 if (SSL_USE_SIGALGS(s)) { 1567 if (SSL_USE_SIGALGS(s)) {
1568 if (!tls12_get_sigandhash_cbb(&server_kex, pkey, 1568 if (!tls12_get_hashandsig(&server_kex, pkey, md)) {
1569 md)) {
1570 /* Should never happen */ 1569 /* Should never happen */
1571 al = SSL_AD_INTERNAL_ERROR; 1570 al = SSL_AD_INTERNAL_ERROR;
1572 SSLerror(s, ERR_R_INTERNAL_ERROR); 1571 SSLerror(s, ERR_R_INTERNAL_ERROR);