|
1 | 1 | import { Base64 } from "js-base64"; |
2 | 2 | import { Button, Card, Form, Modal } from "react-bootstrap"; |
3 | 3 | import { AppState, concat_salts, fetchClient, generate_hash, generate_random_bytes, get_salt, loggedIn } from "../utils"; |
4 | | -import { crypto_box_keypair, crypto_secretbox_KEYBYTES, crypto_secretbox_NONCEBYTES, crypto_secretbox_easy } from "libsodium-wrappers"; |
| 4 | +import sodium from "libsodium-wrappers"; |
5 | 5 | import { showAlert } from "../components/Alert"; |
6 | 6 | import { useTranslation } from "react-i18next"; |
7 | 7 | import { PasswordComponent } from "../components/PasswordComponent"; |
@@ -72,24 +72,24 @@ export function Recovery() { |
72 | 72 | const executeRecovery = async () => { |
73 | 73 | const salt1 = await get_salt(); |
74 | 74 | const secret_salt = concat_salts(salt1); |
75 | | - const secret_key = await generate_hash(state.new_password, secret_salt, crypto_secretbox_KEYBYTES); |
| 75 | + const secret_key = await generate_hash(state.new_password, secret_salt, sodium.crypto_secretbox_KEYBYTES); |
76 | 76 |
|
77 | 77 | const salt3 = await get_salt(); |
78 | 78 | const login_salt = concat_salts(salt3); |
79 | 79 | const login_key = await generate_hash(state.new_password, login_salt); |
80 | 80 |
|
81 | | - const secret_nonce = generate_random_bytes(crypto_secretbox_NONCEBYTES); |
| 81 | + const secret_nonce = generate_random_bytes(sodium.crypto_secretbox_NONCEBYTES); |
82 | 82 |
|
83 | 83 | let secret_reuse: boolean; |
84 | 84 | let encrypted_secret: Uint8Array; |
85 | 85 | if (secret.value.length === 0) { |
86 | | - const key_pair = crypto_box_keypair(); |
| 86 | + const key_pair = sodium.crypto_box_keypair(); |
87 | 87 | const new_secret = key_pair.privateKey; |
88 | 88 | secret.value = new Uint8Array(new_secret); |
89 | | - encrypted_secret = crypto_secretbox_easy(new_secret, secret_nonce, secret_key); |
| 89 | + encrypted_secret = sodium.crypto_secretbox_easy(new_secret, secret_nonce, secret_key); |
90 | 90 | secret_reuse = false; |
91 | 91 | } else { |
92 | | - encrypted_secret = crypto_secretbox_easy(secret.value as Uint8Array, secret_nonce, secret_key); |
| 92 | + encrypted_secret = sodium.crypto_secretbox_easy(secret.value as Uint8Array, secret_nonce, secret_key); |
93 | 93 | secret_reuse = true; |
94 | 94 | } |
95 | 95 |
|
|
0 commit comments