diff options
| author | jsing <> | 2019-02-09 15:26:15 +0000 |
|---|---|---|
| committer | jsing <> | 2019-02-09 15:26:15 +0000 |
| commit | bf3fc1487ab4d49b366d075e6f48ee4eef2d29a4 (patch) | |
| tree | ccde70d521f0e94dd1570fd0a07f27a5b4ca631e /src/lib/libssl/ssl_srvr.c | |
| parent | 697813b6701818d308182e24502b82a16067be78 (diff) | |
| download | openbsd-bf3fc1487ab4d49b366d075e6f48ee4eef2d29a4.tar.gz openbsd-bf3fc1487ab4d49b366d075e6f48ee4eef2d29a4.tar.bz2 openbsd-bf3fc1487ab4d49b366d075e6f48ee4eef2d29a4.zip | |
Rename tls1_handshake_hash*() to tls1_transcript_hash*().
While handshake hash is correct (in as far as it is a hash of handshake
messages), using tls1_transcript_hash*() aligns them with the naming of the
tls1_transcript*() functions. Additionally, the TLSv1.3 specification uses
Transcript-Hash and "transcript hash", which this matches.
ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_srvr.c')
| -rw-r--r-- | src/lib/libssl/ssl_srvr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c index afc7c94de8..6872fa3523 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.63 2019/01/18 00:54:42 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_srvr.c,v 1.64 2019/02/09 15:26:15 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 | * |
| @@ -575,7 +575,7 @@ ssl3_accept(SSL *s) | |||
| 575 | * We need to get hashes here so if there is | 575 | * We need to get hashes here so if there is |
| 576 | * a client cert, it can be verified. | 576 | * a client cert, it can be verified. |
| 577 | */ | 577 | */ |
| 578 | if (!tls1_handshake_hash_value(s, | 578 | if (!tls1_transcript_hash_value(s, |
| 579 | S3I(s)->tmp.cert_verify_md, | 579 | S3I(s)->tmp.cert_verify_md, |
| 580 | sizeof(S3I(s)->tmp.cert_verify_md), | 580 | sizeof(S3I(s)->tmp.cert_verify_md), |
| 581 | NULL)) { | 581 | NULL)) { |
| @@ -1104,7 +1104,7 @@ ssl3_get_client_hello(SSL *s) | |||
| 1104 | S3I(s)->hs.new_cipher = s->session->cipher; | 1104 | S3I(s)->hs.new_cipher = s->session->cipher; |
| 1105 | } | 1105 | } |
| 1106 | 1106 | ||
| 1107 | if (!tls1_handshake_hash_init(s)) | 1107 | if (!tls1_transcript_hash_init(s)) |
| 1108 | goto err; | 1108 | goto err; |
| 1109 | 1109 | ||
| 1110 | alg_k = S3I(s)->hs.new_cipher->algorithm_mkey; | 1110 | alg_k = S3I(s)->hs.new_cipher->algorithm_mkey; |
