Merge remote-tracking branch 'upstream/master'

1 files changed, 52 insertions, 0 deletions

diff --git a/library/cryptojs/components/format-hex.js b/library/cryptojs/components/format-hex.js
new file mode 100644
index 000000000..1af5da60e
--- /dev/null
+++ b/library/cryptojs/components/format-hex.js
@@ -0,0 +1,52 @@
+/*
+CryptoJS v3.1.2
+code.google.com/p/crypto-js
+(c) 2009-2013 by Jeff Mott. All rights reserved.
+code.google.com/p/crypto-js/wiki/License
+*/
+(function (undefined) {

+    // Shortcuts

+    var C = CryptoJS;

+    var C_lib = C.lib;

+    var CipherParams = C_lib.CipherParams;

+    var C_enc = C.enc;

+    var Hex = C_enc.Hex;

+    var C_format = C.format;

+

+    var HexFormatter = C_format.Hex = {

+        /**

+         * Converts the ciphertext of a cipher params object to a hexadecimally encoded string.

+         *

+         * @param {CipherParams} cipherParams The cipher params object.

+         *

+         * @return {string} The hexadecimally encoded string.

+         *

+         * @static

+         *

+         * @example

+         *

+         *     var hexString = CryptoJS.format.Hex.stringify(cipherParams);

+         */

+        stringify: function (cipherParams) {

+            return cipherParams.ciphertext.toString(Hex);

+        },

+

+        /**

+         * Converts a hexadecimally encoded ciphertext string to a cipher params object.

+         *

+         * @param {string} input The hexadecimally encoded string.

+         *

+         * @return {CipherParams} The cipher params object.

+         *

+         * @static

+         *

+         * @example

+         *

+         *     var cipherParams = CryptoJS.format.Hex.parse(hexString);

+         */

+        parse: function (input) {

+            var ciphertext = Hex.parse(input);

+            return CipherParams.create({ ciphertext: ciphertext });

+        }

+    };

+}());