vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-08-16 23:10:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add pbkdf2 function definitions with optional parameters (#34190)

Browse Source
This commit is contained in:
Andrea
2019-03-26 14:56:05 -07:00
committed by Ron Buckton
parent 4a295b5fc2
commit 962c5bd3ca
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
types/node-forge/index.d.ts
Vendored
+3
View File
@@ -584,6 +584,9 @@ declare module "node-forge" {
namespace pkcs5 {
function pbkdf2(password: string, salt: string, iterations: number, keySize: number): string;
function pbkdf2(password: string, salt: string, iterations: number, keySize: number, messageDigest: md.MessageDigest): string;
function pbkdf2(password: string, salt: string, iterations: number, keySize: number, callback: (err: Error | null, dk: string | null) => any): void;
function pbkdf2(password: string, salt: string, iterations: number, keySize: number, messageDigest?: md.MessageDigest, callback?: (err: Error | null, dk: string | null) => any): void;
}
namespace md {
types/node-forge/node-forge-tests.ts
+21 -1
View File
@@ -224,7 +224,27 @@ if (forge.util.fillString('1', 5) !== '11111') throw Error('forge.util.fillStrin
}
{
const key: string = forge.pkcs5.pbkdf2("password", "salt", 1000, 32);
let md: forge.md.MessageDigest;
md = forge.md.sha256.create();
const key1: string = forge.pkcs5.pbkdf2("password", "salt", 1000, 32);
const key2: string = forge.pkcs5.pbkdf2("password", "salt", 1000, 32, md);
let key3: string;
forge.pkcs5.pbkdf2("password", "salt", 1000, 32, function(err: Error | null, dk: null | string) {
if (err === null)
key3 = dk;
else
throw Error("pbkdf2 key derivation fail");
});
let key4: string;
forge.pkcs5.pbkdf2("password", "salt", 1000, 32, md, function(err: Error | null, dk: null | string) {
if (err === null)
key4 = dk;
else
throw Error("pbkdf2 key derivation fail");
});
}
{