summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2024-07-09 16:52:34 +0000
committertb <>2024-07-09 16:52:34 +0000
commit890e4d7b863486364cd61d49ca3ca3251f5a4386 (patch)
tree9826aabbab9dd2cd04b122b353877ef420ac00ab /src
parent4b93b9a66603691388f03427e499bdffe37380a8 (diff)
downloadopenbsd-890e4d7b863486364cd61d49ca3ca3251f5a4386.tar.gz
openbsd-890e4d7b863486364cd61d49ca3ca3251f5a4386.tar.bz2
openbsd-890e4d7b863486364cd61d49ca3ca3251f5a4386.zip
seedlen -> seed_len
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/kdf/tls1_prf.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libcrypto/kdf/tls1_prf.c b/src/lib/libcrypto/kdf/tls1_prf.c
index 37a4da3089..ad5275df60 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.20 2024/07/09 16:51:50 tb Exp $ */ 1/* $OpenBSD: tls1_prf.c,v 1.21 2024/07/09 16:52:34 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.
@@ -79,7 +79,7 @@ struct tls1_prf_ctx {
79 unsigned char *secret; 79 unsigned char *secret;
80 size_t secret_len; 80 size_t secret_len;
81 unsigned char seed[TLS1_PRF_MAXBUF]; 81 unsigned char seed[TLS1_PRF_MAXBUF];
82 size_t seedlen; 82 size_t seed_len;
83}; 83};
84 84
85static int 85static int
@@ -101,7 +101,7 @@ pkey_tls1_prf_cleanup(EVP_PKEY_CTX *ctx)
101{ 101{
102 struct tls1_prf_ctx *kctx = ctx->data; 102 struct tls1_prf_ctx *kctx = ctx->data;
103 freezero(kctx->secret, kctx->secret_len); 103 freezero(kctx->secret, kctx->secret_len);
104 explicit_bzero(kctx->seed, kctx->seedlen); 104 explicit_bzero(kctx->seed, kctx->seed_len);
105 free(kctx); 105 free(kctx);
106} 106}
107 107
@@ -120,8 +120,8 @@ pkey_tls1_prf_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
120 if (kctx->secret != NULL) 120 if (kctx->secret != NULL)
121 freezero(kctx->secret, kctx->secret_len); 121 freezero(kctx->secret, kctx->secret_len);
122 122
123 explicit_bzero(kctx->seed, kctx->seedlen); 123 explicit_bzero(kctx->seed, kctx->seed_len);
124 kctx->seedlen = 0; 124 kctx->seed_len = 0;
125 125
126 kctx->secret = NULL; 126 kctx->secret = NULL;
127 kctx->secret_len = 0; 127 kctx->secret_len = 0;
@@ -139,10 +139,10 @@ pkey_tls1_prf_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
139 case EVP_PKEY_CTRL_TLS_SEED: 139 case EVP_PKEY_CTRL_TLS_SEED:
140 if (p1 == 0 || p2 == NULL) 140 if (p1 == 0 || p2 == NULL)
141 return 1; 141 return 1;
142 if (p1 < 0 || p1 > (int)(TLS1_PRF_MAXBUF - kctx->seedlen)) 142 if (p1 < 0 || p1 > (int)(TLS1_PRF_MAXBUF - kctx->seed_len))
143 return 0; 143 return 0;
144 memcpy(kctx->seed + kctx->seedlen, p2, p1); 144 memcpy(kctx->seed + kctx->seed_len, p2, p1);
145 kctx->seedlen += p1; 145 kctx->seed_len += p1;
146 return 1; 146 return 1;
147 147
148 default: 148 default:
@@ -199,12 +199,12 @@ pkey_tls1_prf_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
199 KDFerror(KDF_R_MISSING_SECRET); 199 KDFerror(KDF_R_MISSING_SECRET);
200 return 0; 200 return 0;
201 } 201 }
202 if (kctx->seedlen == 0) { 202 if (kctx->seed_len == 0) {
203 KDFerror(KDF_R_MISSING_SEED); 203 KDFerror(KDF_R_MISSING_SEED);
204 return 0; 204 return 0;
205 } 205 }
206 return tls1_prf_alg(kctx->md, kctx->secret, kctx->secret_len, 206 return tls1_prf_alg(kctx->md, kctx->secret, kctx->secret_len,
207 kctx->seed, kctx->seedlen, 207 kctx->seed, kctx->seed_len,
208 key, *keylen); 208 key, *keylen);
209} 209}
210 210