[Openvpn-devel] [S] Change in openvpn[master]: Replace ASSERT(rand_bytes(...)) with prng_bytes
"plaisthos \(Code Review\) via Openvpn-devel" <[email protected]> Mon, 3 Aug 2026 13:02:53 +0000
| Newsgroups | net.sourceforge.lists.openvpn-devel |
|---|---|
| Message-ID | <[email protected]> |
--===============8188072366925085095==
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="UtVWWF5IJpo="; charset=UTF-8
--UtVWWF5IJpo=
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
plaisthos has uploaded this change for review=2E ( http://gerrit=2Eopenvpn=
=2Enet/c/openvpn/+/1833?usp=3Demail )
Change subject: Replace ASSERT(rand=
_bytes(=2E=2E=2E)) with prng_bytes
=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=
=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=
=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=2E=
=2E=2E=2E=2E=2E=2E=2E
Replace ASSERT(rand_bytes(=2E=2E=2E)) with prng_byte=
s
prng_bytes is already ASSERT(rand_bytes(=2E=2E=2E)), so this change is
j=
ust a little cleanup that makes a code a little bit nicer=2E
Change-Id: If=
458a3362e03630ce699bd122e957169601657a5
Signed-off-by: Arne Schwabe <arne@r=
fc2549=2Eorg>
---
M src/openvpn/crypto=2Ec
M src/openvpn/proxy=2Ec
M tests/=
unit_tests/openvpn/test_ssl=2Ec
3 files changed, 9 insertions(+), 9 deletio=
ns(-)
git pull ssh://gerrit=2Eopenvpn=2Enet:29418/openvpn refs/changes=
/33/1833/1
diff --git a/src/openvpn/crypto=2Ec b/src/openvpn/crypto=2Ec
in=
dex ee43d65=2E=2E8f59838 100644
--- a/src/openvpn/crypto=2Ec
+++ b/src/open=
vpn/crypto=2Ec
@@ -1219,7 +1219,7 @@
ASSERT(cipher_ctx_iv_leng=
th(cipher) >=3D OPENVPN_AEAD_MIN_IV_LEN);
/* Generate dummy =
implicit IV */
- ASSERT(rand_bytes(co->key_ctx_bi=2Eencrypt=2Eim=
plicit_iv, OPENVPN_MAX_IV_LENGTH));
+ prng_bytes(co->key_ctx_bi=
=2Eencrypt=2Eimplicit_iv, OPENVPN_MAX_IV_LENGTH);
memcpy(co-=
>key_ctx_bi=2Edecrypt=2Eimplicit_iv, co->key_ctx_bi=2Eencrypt=2Eimplicit_iv=
,
OPENVPN_MAX_IV_LENGTH);
@@ -1239,7 +1239,7 @@
=
ASSERT(buf_init(&src, 0));
ASSERT(i <=3D src=2Ecapacity);
=
src=2Elen =3D i;
- ASSERT(rand_bytes(BPTR(&src), BLEN(&src)));
+ =
prng_bytes(BPTR(&src), BLEN(&src));
/* copy source to inp=
ut buf */
buf =3D work;
diff --git a/src/openvpn/proxy=2Ec b/src/o=
penvpn/proxy=2Ec
index 9f3ec93=2E=2E9acb2fa 100644
--- a/src/openvpn/proxy=
=2Ec
+++ b/src/openvpn/proxy=2Ec
@@ -734,7 +734,7 @@
}
=
/* generate a client nonce */
- ASSERT(rand_=
bytes(cnonce_raw, sizeof(cnonce_raw)));
+ prng_bytes(cnonce_=
raw, sizeof(cnonce_raw));
cnonce =3D make_base64_string2(c=
nonce_raw, sizeof(cnonce_raw), &gc);
diff --git a/tests/unit_tests/open=
vpn/test_ssl=2Ec b/tests/unit_tests/openvpn/test_ssl=2Ec
index d473d67=2E=
=2Eb86d57c 100644
--- a/tests/unit_tests/openvpn/test_ssl=2Ec
+++ b/tests/u=
nit_tests/openvpn/test_ssl=2Ec
@@ -322,7 +322,7 @@
ASSERT(buf_init=
(&src, 0));
ASSERT(i <=3D src=2Ecapacity);
src=2Elen =3D =
i;
- ASSERT(rand_bytes(BPTR(&src), BLEN(&src)));
+ prng_bytes=
(BPTR(&src), BLEN(&src));
/* copy source to input buf */
=
buf =3D work;
@@ -368,7 +368,7 @@
ASSERT(buf_init(&src, 0));
AS=
SERT(len <=3D src=2Ecapacity);
src=2Elen =3D len;
- ASSERT(rand_byt=
es(BPTR(&src), BLEN(&src)));
+ prng_bytes(BPTR(&src), BLEN(&src));
=
/* copy source to input buf */
buf =3D work;
@@ -453,10 +453,10 @@
=
}
else
{
- ASSERT(rand_bytes(key2=2Ekeys[0]=2Ecipher, =
sizeof(key2=2Ekeys[0]=2Ecipher)));
- ASSERT(rand_bytes(key2=2Ekeys[0=
]=2Ehmac, sizeof(key2=2Ekeys[0]=2Ehmac)));
- ASSERT(rand_bytes(key2=
=2Ekeys[1]=2Ecipher, sizeof(key2=2Ekeys[1]=2Ecipher)));
- ASSERT(ran=
d_bytes(key2=2Ekeys[1]=2Ehmac, sizeof(key2=2Ekeys)[1]=2Ehmac));
+ pr=
ng_bytes(key2=2Ekeys[0]=2Ecipher, sizeof(key2=2Ekeys[0]=2Ecipher));
+ =
prng_bytes(key2=2Ekeys[0]=2Ehmac, sizeof(key2=2Ekeys[0]=2Ehmac));
+ =
prng_bytes(key2=2Ekeys[1]=2Ecipher, sizeof(key2=2Ekeys[1]=2Ecipher));
+ =
prng_bytes(key2=2Ekeys[1]=2Ehmac, sizeof(key2=2Ekeys)[1]=2Ehmac);
=
}
struct crypto_options co =3D { 0 };
--
To view, visit http://g=
errit=2Eopenvpn=2Enet/c/openvpn/+/1833?usp=3Demail
To unsubscribe, or for h=
elp writing mail filters, visit http://gerrit=2Eopenvpn=2Enet/settings?usp=
=3Demail
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Bran=
ch: master
Gerrit-Change-Id: If458a3362e03630ce699bd122e957169601657a5
Gerr=
it-Change-Number: 1833
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <arne-ope=
nvpn@rfc2549=2Eorg>
Gerrit-CC: openvpn-devel <openvpn-devel@lists=2Esourcef=
orge=2Enet>
--UtVWWF5IJpo=
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
<!DOCTYPE html><html><head><style></style></head><body><p>plaisthos has upl=
oaded this change for <strong>review</strong>=2E</p><p><a href=3D"http://ge=
rrit=2Eopenvpn=2Enet/c/openvpn/+/1833?usp=3Demail">View Change</a></p><pre =
class=3D"blocks" style=3D"font-family: monospace,monospace; white-space: pr=
e-wrap;">Replace ASSERT(rand_bytes(=2E=2E=2E)) with prng_bytes<br><br>prng_=
bytes is already ASSERT(rand_bytes(=2E=2E=2E)), so this change is<br>just a=
little cleanup that makes a code a little bit nicer=2E<br><br>Change-Id: I=
f458a3362e03630ce699bd122e957169601657a5<br>Signed-off-by: Arne Schwabe <=
;arne@rfc2549=2Eorg><br>---<br>M src/openvpn/crypto=2Ec<br>M src/openvpn=
/proxy=2Ec<br>M tests/unit_tests/openvpn/test_ssl=2Ec<br>3 files changed, 9=
insertions(+), 9 deletions(-)<br><br></pre><pre class=3D"blocks" style=3D"=
font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://ge=
rrit=2Eopenvpn=2Enet:29418/openvpn refs/changes/33/1833/1</pre><pre style=
=3D"font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --=
git a/src/openvpn/crypto=2Ec b/src/openvpn/crypto=2Ec</span><br><span>index=
ee43d65=2E=2E8f59838 100644</span><br><span>--- a/src/openvpn/crypto=2Ec</=
span><br><span>+++ b/src/openvpn/crypto=2Ec</span><br><span>@@ -1219,7 +121=
9,7 @@</span><br><span> ASSERT(cipher_ctx_iv_length(cipher) >=
;=3D OPENVPN_AEAD_MIN_IV_LEN);</span><br><span> </span><br><span> =
/* Generate dummy implicit IV */</span><br><span style=3D"color: hsl(0, =
100%, 40%);">- ASSERT(rand_bytes(co->key_ctx_bi=2Eencrypt=2Ei=
mplicit_iv, OPENVPN_MAX_IV_LENGTH));</span><br><span style=3D"color: hsl(12=
0, 100%, 40%);">+ prng_bytes(co->key_ctx_bi=2Eencrypt=2Eimpli=
cit_iv, OPENVPN_MAX_IV_LENGTH);</span><br><span> </span><br><span> =
memcpy(co->key_ctx_bi=2Edecrypt=2Eimplicit_iv, co->key_ctx_bi=2Ee=
ncrypt=2Eimplicit_iv,</span><br><span> OPENVPN_MAX_IV_LE=
NGTH);</span><br><span>@@ -1239,7 +1239,7 @@</span><br><span> ASSER=
T(buf_init(&src, 0));</span><br><span> ASSERT(i <=3D src=2Ec=
apacity);</span><br><span> src=2Elen =3D i;</span><br><span style=
=3D"color: hsl(0, 100%, 40%);">- ASSERT(rand_bytes(BPTR(&src), B=
LEN(&src)));</span><br><span style=3D"color: hsl(120, 100%, 40%);">+ =
prng_bytes(BPTR(&src), BLEN(&src));</span><br><span> </span><b=
r><span> /* copy source to input buf */</span><br><span> bu=
f =3D work;</span><br><span>diff --git a/src/openvpn/proxy=2Ec b/src/openvp=
n/proxy=2Ec</span><br><span>index 9f3ec93=2E=2E9acb2fa 100644</span><br><sp=
an>--- a/src/openvpn/proxy=2Ec</span><br><span>+++ b/src/openvpn/proxy=2Ec<=
/span><br><span>@@ -734,7 +734,7 @@</span><br><span> }</spa=
n><br><span> </span><br><span> /* generate a client nonce *=
/</span><br><span style=3D"color: hsl(0, 100%, 40%);">- ASSE=
RT(rand_bytes(cnonce_raw, sizeof(cnonce_raw)));</span><br><span style=3D"co=
lor: hsl(120, 100%, 40%);">+ prng_bytes(cnonce_raw, sizeof(c=
nonce_raw));</span><br><span> cnonce =3D make_base64_string=
2(cnonce_raw, sizeof(cnonce_raw), &gc);</span><br><span> </span><br><sp=
an> </span><br><span>diff --git a/tests/unit_tests/openvpn/test_ssl=2Ec b/t=
ests/unit_tests/openvpn/test_ssl=2Ec</span><br><span>index d473d67=2E=2Eb86=
d57c 100644</span><br><span>--- a/tests/unit_tests/openvpn/test_ssl=2Ec</sp=
an><br><span>+++ b/tests/unit_tests/openvpn/test_ssl=2Ec</span><br><span>@@=
-322,7 +322,7 @@</span><br><span> ASSERT(buf_init(&src, 0));</=
span><br><span> ASSERT(i <=3D src=2Ecapacity);</span><br><span> =
src=2Elen =3D i;</span><br><span style=3D"color: hsl(0, 100%, 40%);=
">- ASSERT(rand_bytes(BPTR(&src), BLEN(&src)));</span><br><s=
pan style=3D"color: hsl(120, 100%, 40%);">+ prng_bytes(BPTR(&src=
), BLEN(&src));</span><br><span> </span><br><span> /* copy sour=
ce to input buf */</span><br><span> buf =3D work;</span><br><span>@=
@ -368,7 +368,7 @@</span><br><span> ASSERT(buf_init(&src, 0));</spa=
n><br><span> ASSERT(len <=3D src=2Ecapacity);</span><br><span> s=
rc=2Elen =3D len;</span><br><span style=3D"color: hsl(0, 100%, 40%);">- =
ASSERT(rand_bytes(BPTR(&src), BLEN(&src)));</span><br><span style=
=3D"color: hsl(120, 100%, 40%);">+ prng_bytes(BPTR(&src), BLEN(&=
src));</span><br><span> </span><br><span> /* copy source to input buf *=
/</span><br><span> buf =3D work;</span><br><span>@@ -453,10 +453,10 @@<=
/span><br><span> }</span><br><span> else</span><br><span> {</sp=
an><br><span style=3D"color: hsl(0, 100%, 40%);">- ASSERT(rand_bytes=
(key2=2Ekeys[0]=2Ecipher, sizeof(key2=2Ekeys[0]=2Ecipher)));</span><br><spa=
n style=3D"color: hsl(0, 100%, 40%);">- ASSERT(rand_bytes(key2=2Ekey=
s[0]=2Ehmac, sizeof(key2=2Ekeys[0]=2Ehmac)));</span><br><span style=3D"colo=
r: hsl(0, 100%, 40%);">- ASSERT(rand_bytes(key2=2Ekeys[1]=2Ecipher, =
sizeof(key2=2Ekeys[1]=2Ecipher)));</span><br><span style=3D"color: hsl(0, 1=
00%, 40%);">- ASSERT(rand_bytes(key2=2Ekeys[1]=2Ehmac, sizeof(key2=
=2Ekeys)[1]=2Ehmac));</span><br><span style=3D"color: hsl(120, 100%, 40%);"=
>+ prng_bytes(key2=2Ekeys[0]=2Ecipher, sizeof(key2=2Ekeys[0]=2Eciphe=
r));</span><br><span style=3D"color: hsl(120, 100%, 40%);">+ prng_by=
tes(key2=2Ekeys[0]=2Ehmac, sizeof(key2=2Ekeys[0]=2Ehmac));</span><br><span =
style=3D"color: hsl(120, 100%, 40%);">+ prng_bytes(key2=2Ekeys[1]=2E=
cipher, sizeof(key2=2Ekeys[1]=2Ecipher));</span><br><span style=3D"color: h=
sl(120, 100%, 40%);">+ prng_bytes(key2=2Ekeys[1]=2Ehmac, sizeof(key2=
=2Ekeys)[1]=2Ehmac);</span><br><span> }</span><br><span> </span><br><sp=
an> struct crypto_options co =3D { 0 };</span><br><span></span><br></pr=
e><p>To view, visit <a href=3D"http://gerrit=2Eopenvpn=2Enet/c/openvpn/+/18=
33?usp=3Demail">change 1833</a>=2E To unsubscribe, or for help writing mail=
filters, visit <a href=3D"http://gerrit=2Eopenvpn=2Enet/settings?usp=3Dema=
il">settings</a>=2E</p><div itemscope itemtype=3D"http://schema=2Eorg/Email=
Message"><div itemscope itemprop=3D"action" itemtype=3D"http://schema=2Eorg=
/ViewAction"><link itemprop=3D"url" href=3D"http://gerrit=2Eopenvpn=2Enet/c=
/openvpn/+/1833?usp=3Demail"/><meta itemprop=3D"name" content=3D"View Chang=
e"/></div></div>
<div style=3D"display:none"> Gerrit-MessageType: newchang=
e </div>
<div style=3D"display:none"> Gerrit-Project: openvpn </div>
<div s=
tyle=3D"display:none"> Gerrit-Branch: master </div>
<div style=3D"display:n=
one"> Gerrit-Change-Id: If458a3362e03630ce699bd122e957169601657a5 </div>
<d=
iv style=3D"display:none"> Gerrit-Change-Number: 1833 </div>
<div style=3D"=
display:none"> Gerrit-PatchSet: 1 </div>
<div style=3D"display:none"> Gerri=
t-Owner: plaisthos <arne-openvpn@rfc2549=2Eorg> </div>
<div style=3D"=
display:none"> Gerrit-CC: openvpn-devel <openvpn-devel@lists=2Esourcefor=
ge=2Enet> </div>
</body></html>
--UtVWWF5IJpo=--
--===============8188072366925085095==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
--===============8188072366925085095==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
--===============8188072366925085095==--