kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-05-25 08:06:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow omit second key argument in crypto-js Hash functions

Browse Source 
* Fixes DefinitelyTyped/DefinitelyTyped#24425
This commit is contained in:
Michael Zabka
2018-03-22 21:17:22 +01:00
parent c807fa0ea9
commit dbb40c14f8
2 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
types/crypto-js/crypto-js-tests.ts
View File

@@ -4,9 +4,11 @@ import CryptoJS = require('crypto-js');
var wordArray: CryptoJS.WordArray;
wordArray = CryptoJS.MD5('some message');
wordArray = CryptoJS.MD5('some message', 'some key');
wordArray = CryptoJS.MD5('some message', { any: true });
wordArray = CryptoJS.SHA1('some message');
wordArray = CryptoJS.SHA1('some message', 'some key', { any: true });
wordArray = CryptoJS.SHA1('some message', { any: true });
wordArray = CryptoJS.format.OpenSSL('some message');
wordArray = CryptoJS.format.OpenSSL('some message', 'some key');

52
types/crypto-js/index.d.ts vendored
View File

@@ -8,7 +8,6 @@ export as namespace CryptoJS;
declare var CryptoJS: CryptoJS.Hashes;
declare namespace CryptoJS {
type Hash = (message: string | LibWordArray, key?: string | WordArray, ...options: any[]) => WordArray;
interface Cipher {
encrypt(message: string, secretPassphrase: string | WordArray, option?: CipherOption): WordArray;
decrypt(encryptedMessage: string | WordArray, secretPassphrase: string | WordArray, option?: CipherOption): DecryptedMessage;
@@ -54,23 +53,40 @@ declare namespace CryptoJS {
interface Padding {}
export interface Hashes {
MD5: Hash;
SHA1: Hash;
SHA256: Hash;
SHA224: Hash;
SHA512: Hash;
SHA384: Hash;
SHA3: Hash;
RIPEMD160: Hash;
HmacMD5: Hash;
HmacSHA1: Hash;
HmacSHA256: Hash;
HmacSHA224: Hash;
HmacSHA512: Hash;
HmacSHA384: Hash;
HmacSHA3: Hash;
HmacRIPEMD160: Hash;
PBKDF2: Hash;
MD5(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
MD5(message: string | LibWordArray, ...options: any[]): WordArray;
SHA1(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
SHA1(message: string | LibWordArray, ...options: any[]): WordArray;
SHA256(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
SHA256(message: string | LibWordArray, ...options: any[]): WordArray;
SHA224(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
SHA224(message: string | LibWordArray, ...options: any[]): WordArray;
SHA512(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
SHA512(message: string | LibWordArray, ...options: any[]): WordArray;
SHA384(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
SHA384(message: string | LibWordArray, ...options: any[]): WordArray;
SHA3(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
SHA3(message: string | LibWordArray, ...options: any[]): WordArray;
RIPEMD160(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
RIPEMD160(message: string | LibWordArray, ...options: any[]): WordArray;
HmacMD5(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
HmacMD5(message: string | LibWordArray, ...options: any[]): WordArray;
HmacSHA1(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
HmacSHA1(message: string | LibWordArray, ...options: any[]): WordArray;
HmacSHA256(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
HmacSHA256(message: string | LibWordArray, ...options: any[]): WordArray;
HmacSHA224(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
HmacSHA224(message: string | LibWordArray, ...options: any[]): WordArray;
HmacSHA512(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
HmacSHA512(message: string | LibWordArray, ...options: any[]): WordArray;
HmacSHA384(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
HmacSHA384(message: string | LibWordArray, ...options: any[]): WordArray;
HmacSHA3(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
HmacSHA3(message: string | LibWordArray, ...options: any[]): WordArray;
HmacRIPEMD160(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
HmacRIPEMD160(message: string | LibWordArray, ...options: any[]): WordArray;
PBKDF2(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
PBKDF2(message: string | LibWordArray, ...options: any[]): WordArray;
AES: Cipher;
DES: Cipher;
TripleDES: Cipher;