From adaf3d73130abfb807c5632dd4a30b6ca7f8d3ea Mon Sep 17 00:00:00 2001
From: Roberto Sebestyen <roberto@sebestyen.ca>
Date: Thu, 17 Aug 2017 01:31:49 -0400
Subject: [PATCH] Add toString Definition for WordArray and WordArray return
 type for Hash

---
 types/crypto-js/crypto-js-tests.ts      | 14 +++++++-------
 types/crypto-js/index.d.ts              |  5 +++--
 types/crypto-js/test/submodule-tests.ts | 14 +++++++-------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/types/crypto-js/crypto-js-tests.ts b/types/crypto-js/crypto-js-tests.ts
index c0c23bcc79..c36def9f90 100644
--- a/types/crypto-js/crypto-js-tests.ts
+++ b/types/crypto-js/crypto-js-tests.ts
@@ -1,15 +1,15 @@
 import CryptoJS = require('crypto-js');
 
 // Hashers
-var str: string;
-str = CryptoJS.MD5('some message');
-str = CryptoJS.MD5('some message', 'some key');
+var wordArray: CryptoJS.WordArray;
+wordArray = CryptoJS.MD5('some message');
+wordArray = CryptoJS.MD5('some message', 'some key');
 
-str = CryptoJS.SHA1('some message');
-str = CryptoJS.SHA1('some message', 'some key', { any: true });
+wordArray = CryptoJS.SHA1('some message');
+wordArray = CryptoJS.SHA1('some message', 'some key', { any: true });
 
-str = CryptoJS.format.OpenSSL('some message');
-str = CryptoJS.format.OpenSSL('some message', 'some key');
+wordArray = CryptoJS.format.OpenSSL('some message');
+wordArray = CryptoJS.format.OpenSSL('some message', 'some key');
 
 
 // Ciphers
diff --git a/types/crypto-js/index.d.ts b/types/crypto-js/index.d.ts
index 07a8d18dfc..38a5693359 100644
--- a/types/crypto-js/index.d.ts
+++ b/types/crypto-js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for crypto-js v3.1.4
+// Type definitions for crypto-js v3.1.8
 // Project: https://github.com/evanvosberg/crypto-js
 // Definitions by: Michael Zabka <https://github.com/misak113/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -8,7 +8,7 @@ export as namespace CryptoJS;
 
 declare var CryptoJS: CryptoJS.Hashes;
 declare namespace CryptoJS {
-	type Hash = (message: string, key?: string, ...options: any[]) => string;
+	type Hash = (message: string, key?: string, ...options: any[]) => WordArray;
 	interface Cipher {
 		encrypt(message: string, secretPassphrase: string, option?: CipherOption): WordArray;
 		decrypt(encryptedMessage: string | WordArray, secretPassphrase: string, option?: CipherOption): DecryptedMessage;
@@ -30,6 +30,7 @@ declare namespace CryptoJS {
 		salt: string;
 		ciphertext: string;
 		key?: string;
+        toString(encoder?: Encoder): string;
 	}
 	export type DecryptedMessage = {
 		toString(encoder?: Encoder): string;
diff --git a/types/crypto-js/test/submodule-tests.ts b/types/crypto-js/test/submodule-tests.ts
index 0cfd8cd83f..423d094143 100644
--- a/types/crypto-js/test/submodule-tests.ts
+++ b/types/crypto-js/test/submodule-tests.ts
@@ -52,15 +52,15 @@ import PadZeroPadding = require('../pad-zeropadding');
 import PadNoPadding = require('../pad-nopadding');
 
 // Hashers
-var str: string;
-str = MD5('some message');
-str = MD5('some message', 'some key');
+var wordArray: CryptoJS.WordArray;
+wordArray = MD5('some message');
+wordArray = MD5('some message', 'some key');
 
-str = SHA1('some message');
-str = SHA1('some message', 'some key', { any: true });
+wordArray = SHA1('some message');
+wordArray = SHA1('some message', 'some key', { any: true });
 
-str = FormatOpenSSL('some message');
-str = FormatOpenSSL('some message', 'some key');
+wordArray = FormatOpenSSL('some message');
+wordArray = FormatOpenSSL('some message', 'some key');
 
 
 // Ciphers