diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-06-12 00:58:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 00:58:35 +0200 |
| commit | b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387 (patch) | |
| tree | 40d946c5ff23b3c0c09558f478cc68e87cc71448 /security/nss/lib/freebl/det_rng.c | |
| parent | b1d82a62259c6888ea6f3f71f3e0973ea4b4e85e (diff) | |
| parent | 505a561549b5226fd3c7905eaa61fe787dfad243 (diff) | |
| download | UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.tar UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.tar.gz UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.tar.lz UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.tar.xz UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.zip | |
Merge pull request #477 from JustOff/PR_nss-3.36
Update NSS/NSPR to 3.36.4/4.19
Diffstat (limited to 'security/nss/lib/freebl/det_rng.c')
| -rw-r--r-- | security/nss/lib/freebl/det_rng.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/nss/lib/freebl/det_rng.c b/security/nss/lib/freebl/det_rng.c index 53d48bc7c..56be2d356 100644 --- a/security/nss/lib/freebl/det_rng.c +++ b/security/nss/lib/freebl/det_rng.c @@ -4,7 +4,7 @@ #include "blapi.h" #include "blapit.h" -#include "chacha20.h" +#include "Hacl_Chacha20.h" #include "nssilock.h" #include "seccomon.h" #include "secerr.h" @@ -99,7 +99,7 @@ RNG_GenerateGlobalRandomBytes(void *dest, size_t len) memset(dest, 0, len); memcpy(dest, globalBytes, PR_MIN(len, GLOBAL_BYTES_SIZE)); - ChaCha20XOR(dest, dest, len, key, nonce, 0); + Hacl_Chacha20_chacha20(dest, (uint8_t *)dest, len, (uint8_t *)key, nonce, 0); ChaCha20Poly1305_DestroyContext(cx, PR_TRUE); PZ_Unlock(rng_lock); |