Skip to content

Reduce WC_RNG allocations in WolfCryptCipher and WolfCryptDhParameterGenerator #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rlm2002 merged 3 commits into from
Apr 1, 2026
Merged

Reduce WC_RNG allocations in WolfCryptCipher and WolfCryptDhParameterGenerator #208

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4099e1
JCE: lazy-init Rng in WolfCryptCipher, only allocate for RSA
cconlon Mar 31, 2026
b96e992
JCE: hoist Rng out of DH param generation retry loop
cconlon Mar 31, 2026
3958625
JCE: remove redundant RSA struct allocation from InitializeNativeStru…
cconlon Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/main/java/com/wolfssl/provider/jce/WolfCryptCipher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,6 @@ private WolfCryptCipher(CipherType type, CipherMode mode,
initOaepParamsSha1();
}

this.rng = new Rng();
this.rng.init();

switch (cipherType) {
case WC_AES:
blockSize = Aes.BLOCK_SIZE;
Expand Down Expand Up @@ -420,6 +417,10 @@ else if (cipherMode == CipherMode.WC_CTS) {
rsa.releaseNativeStruct();
rsa = null;
}
if (this.rng == null) {
this.rng = new Rng();
this.rng.init();
}
rsa = new Rsa();
rsa.setRng(this.rng);
Comment thread
cconlon marked this conversation as resolved.
Outdated
break;
Expand Down Expand Up @@ -1021,6 +1022,10 @@ else if (cipherMode == CipherMode.WC_OFB) {
if (this.rsa != null)
this.rsa.releaseNativeStruct();

if (this.rng == null) {
this.rng = new Rng();
this.rng.init();
}
Comment thread
cconlon marked this conversation as resolved.
this.rsa = new Rsa();
this.rsa.setRng(this.rng);

Expand Down Expand Up @@ -2023,6 +2028,7 @@ protected void finalize() throws Throwable {
}

if (this.rng != null) {
this.rng.free();
this.rng.releaseNativeStruct();
this.rng = null;
}
Expand Down
57 changes: 30 additions & 27 deletions src/main/java/com/wolfssl/provider/jce/WolfCryptDhParameterGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,35 +161,38 @@ else if (size == 8192) {
* wolfCrypt may return PRIME_GEN_E (-251) if it fails to
* find a suitable prime after the NIST FIPS 186-4 mandated
* number of attempts. */
while (retryCount < MAX_PARAM_GEN_RETRIES) {
Rng rng = null;
try {
/* Create and initialize RNG. */
rng = new Rng();
rng.init();

/* Generate DH parameters, may throw exception with
* bad function arg if size not supported natively. */
params = Dh.generateDhParams(rng, size);

/* Success, exit retry loop */
break;

} catch (WolfCryptException e) {
/* Only retry on PRIME_GEN_E error */
if (e.getError() == WolfCryptError.PRIME_GEN_E) {
lastPrimeGenException = e;
retryCount++;
}
else {
throw e;
Rng rng = null;
try {
/* Create and initialize RNG once for all retries */
rng = new Rng();
rng.init();

while (retryCount < MAX_PARAM_GEN_RETRIES) {
try {
/* Generate DH parameters, may throw exception
* with bad function arg if size not supported
* natively. */
params = Dh.generateDhParams(rng, size);

/* Success, exit retry loop */
break;

} catch (WolfCryptException e) {
/* Only retry on PRIME_GEN_E error */
if (e.getError() == WolfCryptError.PRIME_GEN_E) {
lastPrimeGenException = e;
retryCount++;
}
else {
throw e;
}
}
}
finally {
if (rng != null) {
rng.free();
rng.releaseNativeStruct();
}
}
finally {
if (rng != null) {
rng.free();
rng.releaseNativeStruct();
}
}

Expand Down
Loading