Merge pull request #21 from nut-tree/feature/13/deprecation_warnings

Feature/13/deprecation warnings

Author: s1hofmann

lib/decrypt.function.spec.ts

@@ -9,7 +9,7 @@ describe("secret", () => {
         const expected = "Can you keep a secret?";
 
         // THEN
-        expect(decrypt(input, key, Algorithm.AES128CBC)).resolves.toBe(expected);
+        await expect(decrypt(input, key, Algorithm.AES128CBC)).resolves.toBe(expected);
     });
 
     it("should throw an error when IV size is invalid", async () => {
@@ -18,7 +18,7 @@ describe("secret", () => {
         const input = "Zm9vCg==";
 
         // THEN
-        expect(decrypt(input, key, Algorithm.AES128CBC))
+        await expect(decrypt(input, key, Algorithm.AES128CBC))
             .rejects.toThrowError("Invalid IV size. Size of 16 byte required.");
     });
 });

lib/decrypt.function.ts

@@ -1,4 +1,4 @@
-import * as crypto from "crypto";
+import {createDecipher, createDecipheriv, Decipher} from "crypto";
 import {Algorithm} from "./algorithm.enum";
 import {base64EncodedBufferFromString} from "./buffer.function";
 import {CipherSpec, getCipherSpec} from "./get-cipher-spec.function";
@@ -27,19 +27,19 @@ export const decrypt = async (encrypted: string, secret: string, algorithm: Algo
         throw new Error(`Invalid IV size. Size of ${cipherSpec.blockSize} byte required.`);
     }
 
-    let decipher: crypto.Decipher;
+    let decipher: Decipher;
     let data: DecryptInput;
     if (useIV) {
         data = sliceInput(plainInput, cipherSpec);
 
-        decipher = crypto.createDecipheriv(
+        decipher = createDecipheriv(
             algorithm,
             key,
             data.iv
         );
     } else {
         data = {iv: Buffer.alloc(0), content: plainInput};
-        decipher = crypto.createDecipher(
+        decipher = createDecipher(
             algorithm,
             key
         );

lib/encrypt.function.ts

@@ -1,4 +1,4 @@
-import * as crypto from "crypto";
+import {createCipher, createCipheriv} from "crypto";
 import {Algorithm} from "./algorithm.enum";
 import {base64EncodedBufferFromString} from "./buffer.function";
 import {getCipherSpec} from "./get-cipher-spec.function";
@@ -16,11 +16,11 @@ export const encrypt = async (
         const iv = await generateRandom({
             byteLength: cipherSpec.blockSize,
         });
-        const cipher = crypto.createCipheriv(algorithm, key, iv);
+        const cipher = createCipheriv(algorithm, key, iv);
         const part = cipher.update(plainText);
         return Buffer.concat([iv, part, cipher.final()]).toString("base64");
     } else {
-        const cipher = crypto.createCipher(algorithm, key);
+        const cipher = createCipher(algorithm, key);
         const part = cipher.update(plainText);
         return Buffer.concat([part, cipher.final()]).toString("base64");
     }

lib/random.function.ts

@@ -1,10 +1,10 @@
-import * as crypto from "crypto";
+import {randomBytes} from "crypto";
 
 export const generateRandom = (params: { byteLength: number } = {
     byteLength: 16,
 }): Promise<Buffer> => {
     return new Promise((resolve, reject) => {
-        crypto.randomBytes(params.byteLength, (err, buffer) => {
+        randomBytes(params.byteLength, (err, buffer) => {
             if (err) {
                 reject(err);
             } else {