[openssl] master update
Dr. Paul Dale
pauli at openssl.org
Thu Sep 2 22:55:53 UTC 2021
The branch master has been updated
via 1b9e467887d7852d79270c73cb88383c50460b0a (commit)
from f92bfddc1d4c4957c57337d7f4192c586cc09a5c (commit)
- Log -----------------------------------------------------------------
commit 1b9e467887d7852d79270c73cb88383c50460b0a
Author: Daniel Bevenius <daniel.bevenius at gmail.com>
Date: Wed Sep 1 11:45:45 2021 +0200
Fix indentation of tls13_hkdf_expand parameters
Reviewed-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Paul Dale <pauli at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16489)
-----------------------------------------------------------------------
Summary of changes:
ssl/tls13_enc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
index 7f6133f29c..12388922e3 100644
--- a/ssl/tls13_enc.c
+++ b/ssl/tls13_enc.c
@@ -32,9 +32,9 @@ static const unsigned char label_prefix[] = "tls13 ";
* |fatal| is set. Returns 1 on success 0 on failure.
*/
int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret,
- const unsigned char *label, size_t labellen,
- const unsigned char *data, size_t datalen,
- unsigned char *out, size_t outlen, int fatal)
+ const unsigned char *label, size_t labellen,
+ const unsigned char *data, size_t datalen,
+ unsigned char *out, size_t outlen, int fatal)
{
EVP_KDF *kdf = EVP_KDF_fetch(s->ctx->libctx, OSSL_KDF_NAME_TLS1_3_KDF,
s->ctx->propq);
More information about the openssl-commits
mailing list