aboutsummaryrefslogtreecommitdiff
path: root/src/crypto/primitives
diff options
context:
space:
mode:
Diffstat (limited to 'src/crypto/primitives')
-rw-r--r--src/crypto/primitives/kdf.ts2
-rw-r--r--src/crypto/primitives/nacl-fast.ts6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/crypto/primitives/kdf.ts b/src/crypto/primitives/kdf.ts
index e1baed408..03deb3727 100644
--- a/src/crypto/primitives/kdf.ts
+++ b/src/crypto/primitives/kdf.ts
@@ -14,7 +14,7 @@
GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-import nacl = require("./nacl-fast");
+import * as nacl from "./nacl-fast";
import { sha256 } from "./sha256";
export function sha512(data: Uint8Array): Uint8Array {
diff --git a/src/crypto/primitives/nacl-fast.ts b/src/crypto/primitives/nacl-fast.ts
index 14cf569db..23d8378b4 100644
--- a/src/crypto/primitives/nacl-fast.ts
+++ b/src/crypto/primitives/nacl-fast.ts
@@ -3078,16 +3078,16 @@ export function sign_ed25519_pk_to_curve25519(
(function () {
// Initialize PRNG if environment provides CSPRNG.
// If not, methods calling randombytes will throw.
- const crypto =
+ const cr =
typeof self !== "undefined" ? self.crypto || (self as any).msCrypto : null;
- if (crypto && crypto.getRandomValues) {
+ if (cr && cr.getRandomValues) {
// Browsers.
var QUOTA = 65536;
setPRNG(function (x: Uint8Array, n: number) {
var i,
v = new Uint8Array(n);
for (i = 0; i < n; i += QUOTA) {
- crypto.getRandomValues(v.subarray(i, i + Math.min(n - i, QUOTA)));
+ cr.getRandomValues(v.subarray(i, i + Math.min(n - i, QUOTA)));
}
for (i = 0; i < n; i++) x[i] = v[i];
cleanup(v);