refactor!: generic block cipher modes

README.md

@@ -18,13 +18,14 @@ A collection of useful crypto algorithms written in Typescript.
 ## Examples
 
 ```ts
-import { AesEcb } from "https://deno.land/x/crypto/aes.ts";
+import { Aes } from "https://deno.land/x/crypto/aes.ts";
+import { Ecb } from "https://deno.land/x/crypto/block-modes.ts";
 import { assertEquals } from "https://deno.land/std/testing/asserts.ts";
 
 //deno-fmt-ignore
 const key = new Uint8Array([1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]);
 
-const cipher = new AesEcb(key);
+const cipher = new Ecb(Aes, key);
 
 //deno-fmt-ignore
 const data = new Uint8Array([1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]);

aes.ts

@@ -1,2 +1,2 @@
-export { AesCbc, AesCfb, AesEcb, AesOfb } from "./src/aes/mod.ts";
-export { Padding } from "./src/utils/padding.ts";
+export { Aes } from "./src/aes/mod.ts";
+export type { BlockCipher } from "./src/block-modes/mod.ts";

benchmarks/aes.ts

@@ -1,5 +1,6 @@
 import { bench, runBenchmarks } from "../dev_deps.ts";
-import { AesCbc, AesCfb, AesEcb, AesOfb } from "../src/aes/mod.ts";
+import { Aes } from "../aes.ts";
+import { Cbc, Cfb, Ecb, Ofb } from "../block-modes.ts";
 import { AES as GodCryptoAES } from "https://deno.land/x/god_crypto@v1.4.9/aes.ts";
 import { args } from "./utils/benchmarkArgs.ts";
 
@@ -15,7 +16,7 @@ bench({
   name: "AES-128-ECB 2MiB Encrypt",
   runs,
   func(b) {
-    const cipher = new AesEcb(key);
+    const cipher = new Ecb(Aes, key);
     b.start();
     cipher.encrypt(data);
     b.stop();
@@ -26,7 +27,7 @@ bench({
   name: "AES-128-ECB 2MiB Decrypt",
   runs,
   func(b) {
-    const cipher = new AesEcb(key);
+    const cipher = new Ecb(Aes, key);
     b.start();
     cipher.decrypt(data);
     b.stop();
@@ -37,7 +38,7 @@ bench({
   name: "AES-128-CBC 2MiB Encrypt",
   runs,
   func(b) {
-    const cipher = new AesCbc(key, iv);
+    const cipher = new Cbc(Aes, key, iv);
     b.start();
     cipher.encrypt(data);
     b.stop();
@@ -48,7 +49,7 @@ bench({
   name: "AES-128-CBC 2MiB Decrypt",
   runs,
   func(b) {
-    const cipher = new AesCbc(key, iv);
+    const cipher = new Cbc(Aes, key, iv);
     b.start();
     cipher.decrypt(data);
     b.stop();
@@ -59,7 +60,7 @@ bench({
   name: "AES-128-CFB 2MiB Encrypt",
   runs,
   func(b) {
-    const cipher = new AesCfb(key, iv);
+    const cipher = new Cfb(Aes, key, iv);
     b.start();
     cipher.encrypt(data);
     b.stop();
@@ -70,35 +71,24 @@ bench({
   name: "AES-128-CFB 2MiB Decrypt",
   runs,
   func(b) {
-    const cipher = new AesCfb(key, iv);
+    const cipher = new Cfb(Aes, key, iv);
     b.start();
     cipher.decrypt(data);
     b.stop();
   },
 });
 
 bench({
-  name: "AES-128-OFB 2MiB Encrypt",
+  name: "AES-128-OFB 2MiB Encrypt/Decrypt",
   runs,
   func(b) {
-    const cipher = new AesOfb(key, iv);
+    const cipher = new Ofb(Aes, key, iv);
     b.start();
     cipher.encrypt(data);
     b.stop();
   },
 });
 
-bench({
-  name: "AES-128-OFB 2MiB Decrypt",
-  runs,
-  func(b) {
-    const cipher = new AesOfb(key, iv);
-    b.start();
-    cipher.decrypt(data);
-    b.stop();
-  },
-});
-
 bench({
   name: "AES-128-ECB (GodCrypto) 2MiB Encrypt",
   runs,

benchmarks/blowfish.ts

@@ -1,10 +1,6 @@
 import { bench, runBenchmarks } from "../dev_deps.ts";
-import {
-  BlowfishCbc,
-  BlowfishCfb,
-  BlowfishEcb,
-  BlowfishOfb,
-} from "../src/blowfish/mod.ts";
+import { Blowfish } from "../blowfish.ts";
+import { Cbc, Cfb, Ecb, Ofb } from "../block-modes.ts";
 import { args } from "./utils/benchmarkArgs.ts";
 
 const { runs: _runs, ...opts } = args;
@@ -18,7 +14,18 @@ bench({
   name: "Blowfish-ECB 2MiB Encrypt",
   runs,
   func(b) {
-    const cipher = new BlowfishEcb(key);
+    const cipher = new Ecb(Blowfish, key);
+    b.start();
+    cipher.encrypt(data);
+    b.stop();
+  },
+});
+
+bench({
+  name: "Blowfish-ECB 2MiB Encrypt",
+  runs,
+  func(b) {
+    const cipher = new Ecb(Blowfish, key);
     b.start();
     cipher.encrypt(data);
     b.stop();
@@ -29,7 +36,7 @@ bench({
   name: "Blowfish-ECB 2MiB Decrypt",
   runs,
   func(b) {
-    const cipher = new BlowfishEcb(key);
+    const cipher = new Ecb(Blowfish, key);
     b.start();
     cipher.decrypt(data);
     b.stop();
@@ -40,7 +47,7 @@ bench({
   name: "Blowfish-CBC 2MiB Encrypt",
   runs,
   func(b) {
-    const cipher = new BlowfishCbc(key, iv);
+    const cipher = new Cbc(Blowfish, key, iv);
 
     b.start();
     cipher.encrypt(data);
@@ -52,7 +59,7 @@ bench({
   name: "Blowfish-CBC 2MiB Decrypt",
   runs,
   func(b) {
-    const bf = new BlowfishCbc(key, iv);
+    const bf = new Cbc(Blowfish, key, iv);
     b.start();
     bf.decrypt(data);
     b.stop();
@@ -63,7 +70,7 @@ bench({
   name: "Blowfish-CFB 2MiB Encrypt",
   runs,
   func(b) {
-    const cipher = new BlowfishCfb(key, iv);
+    const cipher = new Cfb(Blowfish, key, iv);
 
     b.start();
     cipher.encrypt(data);
@@ -75,7 +82,7 @@ bench({
   name: "Blowfish-CFB 2MiB Decrypt",
   runs,
   func(b) {
-    const bf = new BlowfishCfb(key, iv);
+    const bf = new Cfb(Blowfish, key, iv);
     b.start();
     bf.decrypt(data);
     b.stop();
@@ -87,7 +94,7 @@ bench({
   name: "Blowfish-OFB 2MiB Encrypt/Decrypt",
   runs,
   func(b) {
-    const cipher = new BlowfishOfb(key, iv);
+    const cipher = new Ofb(Blowfish, key, iv);
 
     b.start();
     cipher.encrypt(data);

block-modes.ts

@@ -0,0 +1,3 @@
+export { BlockCipherMode, Cbc, Cfb, Ecb, Ofb } from "./src/block-modes/mod.ts";
+export type { BlockCipher, BlockCipherClass } from "./src/block-modes/mod.ts";
+export { Padding } from "./src/utils/padding.ts";

blowfish.ts

@@ -1,7 +1,2 @@
-export {
-  BlowfishCbc,
-  BlowfishCfb,
-  BlowfishEcb,
-  BlowfishOfb,
-} from "./src/blowfish/mod.ts";
-export { Padding } from "./src/utils/padding.ts";
+export { Blowfish } from "./src/blowfish/mod.ts";
+export type { BlockCipher } from "./src/block-modes/mod.ts";