Merge branch 'rewrite' of https://github.com/Alanscut/crypto-js into rewrite

Author: Alanscut

src/a.js

@@ -12,6 +12,8 @@ import {
   EvpKDFAlgo
 } from '../encryption/evpkdf.js';
 import { isString } from '../utils';
+import { Pkcs7 } from '../pad/pad-pkcs7';
+
 
 /**
  * Abstract base cipher template.
@@ -357,68 +359,6 @@ CBC.Decryptor = class extends CBC {
   }
 };
 
-/**
- * PKCS #5/7 padding strategy.
- */
-export const Pkcs7 = {
-  /**
-   * Pads data using the algorithm defined in PKCS #5/7.
-   *
-   * @param {WordArray} data The data to pad.
-   * @param {number} blockSize The multiple that the data should be padded to.
-   *
-   * @static
-   *
-   * @example
-   *
-   *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);
-   */
-  pad(data, blockSize) {
-    // Shortcut
-    const blockSizeBytes = blockSize * 4;
-
-    // Count padding bytes
-    const nPaddingBytes = blockSizeBytes - (data.sigBytes % blockSizeBytes);
-
-    // Create padding word
-    const paddingWord = (nPaddingBytes << 24) |
-      (nPaddingBytes << 16) |
-      (nPaddingBytes << 8) |
-      nPaddingBytes;
-
-    // Create padding
-    const paddingWords = [];
-    for (let i = 0; i < nPaddingBytes; i += 4) {
-      paddingWords.push(paddingWord);
-    }
-    const padding = new WordArray(paddingWords, nPaddingBytes);
-
-    // Add padding
-    data.concat(padding);
-  },
-
-  /**
-   * Unpads data that had been padded using the algorithm defined in PKCS #5/7.
-   *
-   * @param {WordArray} data The data to unpad.
-   *
-   * @static
-   *
-   * @example
-   *
-   *     CryptoJS.pad.Pkcs7.unpad(wordArray);
-   */
-  unpad(data) {
-    const _data = data;
-
-    // Get number of padding bytes from last byte
-    const nPaddingBytes = _data.words[(_data.sigBytes - 1) >>> 2] & 0xff;
-
-    // Remove padding
-    _data.sigBytes -= nPaddingBytes;
-  }
-};
-
 /**
  * Abstract base block cipher template.
  *

src/core/cipher-core.js

@@ -13,7 +13,6 @@ import {
   StreamCipher,
   BlockCipherMode,
   CBC,
-  Pkcs7,
   BlockCipher,
   CipherParams,
   OpenSSLFormatter,
@@ -58,6 +57,7 @@ import { CTR } from './mode/mode-ctr.js';
 import { CTRGladman } from './mode/mode-ctr-gladman.js';
 import { ECB } from './mode/mode-ecb.js';
 import { OFB } from './mode/mode-ofb.js';
+import { Pkcs7 } from './pad/pad-pkcs7.js';
 import { AnsiX923 } from './pad/pad-ansix923.js';
 import { Iso10126 } from './pad/pad-iso10126.js';
 import { Iso97971 } from './pad/pad-iso97971.js';

src/index.js

@@ -0,0 +1,63 @@
+import { WordArray } from '../core/core';
+
+/**
+ * PKCS #5/7 padding strategy.
+ */
+export const Pkcs7 = {
+  /**
+   * Pads data using the algorithm defined in PKCS #5/7.
+   *
+   * @param {WordArray} data The data to pad.
+   * @param {number} blockSize The multiple that the data should be padded to.
+   *
+   * @static
+   *
+   * @example
+   *
+   *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);
+   */
+  pad(data, blockSize) {
+    // Shortcut
+    const blockSizeBytes = blockSize * 4;
+
+    // Count padding bytes
+    const nPaddingBytes = blockSizeBytes - (data.sigBytes % blockSizeBytes);
+
+    // Create padding word
+    const paddingWord = (nPaddingBytes << 24) |
+      (nPaddingBytes << 16) |
+      (nPaddingBytes << 8) |
+      nPaddingBytes;
+
+    // Create padding
+    const paddingWords = [];
+    for (let i = 0; i < nPaddingBytes; i += 4) {
+      paddingWords.push(paddingWord);
+    }
+    const padding = new WordArray(paddingWords, nPaddingBytes);
+
+    // Add padding
+    data.concat(padding);
+  },
+
+  /**
+   * Unpads data that had been padded using the algorithm defined in PKCS #5/7.
+   *
+   * @param {WordArray} data The data to unpad.
+   *
+   * @static
+   *
+   * @example
+   *
+   *     CryptoJS.pad.Pkcs7.unpad(wordArray);
+   */
+  unpad(data) {
+    const _data = data;
+
+    // Get number of padding bytes from last byte
+    const nPaddingBytes = _data.words[(_data.sigBytes - 1) >>> 2] & 0xff;
+
+    // Remove padding
+    _data.sigBytes -= nPaddingBytes;
+  }
+};