diff options
| author |   jsing <jsing@openbsd.org> | 2018-08-19 15:38:03 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2018-08-19 15:38:03 +0000 |
| commit | 481c1145e46ded4f26ffc82fbf5e609beda1850f (patch) | |
| tree | 92f065d3d6b2ba59ca3c3c5308d01523b925c339 /lib/libssl/ssl_srvr.c | |
| parent | Convert ssl3_send_newsession_ticket() to CBB. (diff) | |
| download | wireguard-openbsd-481c1145e46ded4f26ffc82fbf5e609beda1850f.tar.xz wireguard-openbsd-481c1145e46ded4f26ffc82fbf5e609beda1850f.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 'lib/libssl/ssl_srvr.c')
| -rw-r--r-- | lib/libssl/ssl_srvr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/libssl/ssl_srvr.c b/lib/libssl/ssl_srvr.c index 80c7208c138..01fe6475006 100644 --- a/lib/libssl/ssl_srvr.c +++ b/lib/libssl/ssl_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_srvr.c,v 1.40 2018/08/19 15:29:26 jsing Exp $ */ +/* $OpenBSD: ssl_srvr.c,v 1.41 2018/08/19 15:38:03 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1565,8 +1565,7 @@ ssl3_send_server_key_exchange(SSL *s) /* Send signature algorithm. */ if (SSL_USE_SIGALGS(s)) { - if (!tls12_get_sigandhash_cbb(&server_kex, pkey, - md)) { + if (!tls12_get_hashandsig(&server_kex, pkey, md)) { /* Should never happen */ al = SSL_AD_INTERNAL_ERROR; SSLerror(s, ERR_R_INTERNAL_ERROR); |