From 6535bd837c4df935c9b8881180e8dd93a83530dc Mon Sep 17 00:00:00 2001 From: jsing <> Date: Sat, 9 Feb 2019 15:26:15 +0000 Subject: 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@ --- src/lib/libssl/t1_hash.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/lib/libssl/t1_hash.c') diff --git a/src/lib/libssl/t1_hash.c b/src/lib/libssl/t1_hash.c index 50e0ad3ca0..12d66d4def 100644 --- a/src/lib/libssl/t1_hash.c +++ b/src/lib/libssl/t1_hash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_hash.c,v 1.5 2018/11/21 15:13:29 jsing Exp $ */ +/* $OpenBSD: t1_hash.c,v 1.6 2019/02/09 15:26:15 jsing Exp $ */ /* * Copyright (c) 2017 Joel Sing * @@ -20,13 +20,13 @@ #include int -tls1_handshake_hash_init(SSL *s) +tls1_transcript_hash_init(SSL *s) { const unsigned char *data; const EVP_MD *md; size_t len; - tls1_handshake_hash_free(s); + tls1_transcript_hash_free(s); if (!ssl_get_handshake_evp_md(s, &md)) { SSLerrorx(ERR_R_INTERNAL_ERROR); @@ -46,7 +46,7 @@ tls1_handshake_hash_init(SSL *s) SSLerror(s, SSL_R_BAD_HANDSHAKE_LENGTH); goto err; } - if (!tls1_handshake_hash_update(s, data, len)) { + if (!tls1_transcript_hash_update(s, data, len)) { SSLerror(s, ERR_R_EVP_LIB); goto err; } @@ -54,13 +54,13 @@ tls1_handshake_hash_init(SSL *s) return 1; err: - tls1_handshake_hash_free(s); + tls1_transcript_hash_free(s); return 0; } int -tls1_handshake_hash_update(SSL *s, const unsigned char *buf, size_t len) +tls1_transcript_hash_update(SSL *s, const unsigned char *buf, size_t len) { if (S3I(s)->handshake_hash == NULL) return 1; @@ -69,7 +69,7 @@ tls1_handshake_hash_update(SSL *s, const unsigned char *buf, size_t len) } int -tls1_handshake_hash_value(SSL *s, const unsigned char *out, size_t len, +tls1_transcript_hash_value(SSL *s, const unsigned char *out, size_t len, size_t *outlen) { EVP_MD_CTX *mdctx = NULL; @@ -103,7 +103,7 @@ tls1_handshake_hash_value(SSL *s, const unsigned char *out, size_t len, } void -tls1_handshake_hash_free(SSL *s) +tls1_transcript_hash_free(SSL *s) { EVP_MD_CTX_free(S3I(s)->handshake_hash); S3I(s)->handshake_hash = NULL; @@ -191,7 +191,7 @@ tls1_transcript_freeze(SSL *s) int tls1_transcript_record(SSL *s, const unsigned char *buf, size_t len) { - if (!tls1_handshake_hash_update(s, buf, len)) + if (!tls1_transcript_hash_update(s, buf, len)) return 0; if (!tls1_transcript_append(s, buf, len)) -- cgit v1.2.3-55-g6feb