diff options
author | tb <> | 2024-07-10 06:53:27 +0000 |
---|---|---|
committer | tb <> | 2024-07-10 06:53:27 +0000 |
commit | c5cef66db0165c6ed9a4acf7e35fd30bc5e4a13f (patch) | |
tree | cd7908b50b64f3198773de3658bac7ba03ca8a1e /src | |
parent | eecc63dc089f7a4776aec4741ff042d7fe8435e2 (diff) | |
download | openbsd-c5cef66db0165c6ed9a4acf7e35fd30bc5e4a13f.tar.gz openbsd-c5cef66db0165c6ed9a4acf7e35fd30bc5e4a13f.tar.bz2 openbsd-c5cef66db0165c6ed9a4acf7e35fd30bc5e4a13f.zip |
Unwrap two lines
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/kdf/tls1_prf.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/libcrypto/kdf/tls1_prf.c b/src/lib/libcrypto/kdf/tls1_prf.c index 9d2f777199..7d6231e3c7 100644 --- a/src/lib/libcrypto/kdf/tls1_prf.c +++ b/src/lib/libcrypto/kdf/tls1_prf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls1_prf.c,v 1.39 2024/07/09 17:58:36 tb Exp $ */ | 1 | /* $OpenBSD: tls1_prf.c,v 1.40 2024/07/10 06:53:27 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project | 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project |
4 | * 2016. | 4 | * 2016. |
@@ -146,8 +146,7 @@ pkey_tls1_prf_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) | |||
146 | } | 146 | } |
147 | 147 | ||
148 | static int | 148 | static int |
149 | pkey_tls1_prf_ctrl_str(EVP_PKEY_CTX *ctx, | 149 | pkey_tls1_prf_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, const char *value) |
150 | const char *type, const char *value) | ||
151 | { | 150 | { |
152 | if (value == NULL) { | 151 | if (value == NULL) { |
153 | KDFerror(KDF_R_VALUE_MISSING); | 152 | KDFerror(KDF_R_VALUE_MISSING); |
@@ -178,10 +177,8 @@ pkey_tls1_prf_ctrl_str(EVP_PKEY_CTX *ctx, | |||
178 | } | 177 | } |
179 | 178 | ||
180 | static int | 179 | static int |
181 | tls1_prf_P_hash(const EVP_MD *md, | 180 | tls1_prf_P_hash(const EVP_MD *md, const unsigned char *secret, size_t secret_len, |
182 | const unsigned char *secret, size_t secret_len, | 181 | const unsigned char *seed, size_t seed_len, unsigned char *out, size_t out_len) |
183 | const unsigned char *seed, size_t seed_len, | ||
184 | unsigned char *out, size_t out_len) | ||
185 | { | 182 | { |
186 | int chunk; | 183 | int chunk; |
187 | EVP_MD_CTX *ctx = NULL, *ctx_tmp = NULL, *ctx_init = NULL; | 184 | EVP_MD_CTX *ctx = NULL, *ctx_tmp = NULL, *ctx_init = NULL; |