Crypto: added Hash.copy() method.

This closes #625 issue on Github.

diff --git a/external/njs_crypto_module.c b/external/njs_crypto_module.c
index 1e0e20156a52acaa6be114bfa0f293e3c295050a..6a11c8a4b6e07706f991ee2568491782acb02100 100644 (file)
--- a/external/njs_crypto_module.c
+++ b/external/njs_crypto_module.c
@@ -67,6 +67,8 @@ static njs_int_t njs_hash_prototype_update(njs_vm_t *vm, njs_value_t *args,
     njs_uint_t nargs, njs_index_t hmac);
 static njs_int_t njs_hash_prototype_digest(njs_vm_t *vm, njs_value_t *args,
     njs_uint_t nargs, njs_index_t hmac);
+static njs_int_t njs_hash_prototype_copy(njs_vm_t *vm, njs_value_t *args,
+    njs_uint_t nargs, njs_index_t hmac);
 static njs_int_t njs_crypto_create_hmac(njs_vm_t *vm, njs_value_t *args,
     njs_uint_t nargs, njs_index_t unused);
 
@@ -171,6 +173,16 @@ static njs_external_t  njs_ext_crypto_hash[] = {
         }
     },
 
+    {
+        .flags = NJS_EXTERN_METHOD,
+        .name.string = njs_str("copy"),
+        .writable = 1,
+        .configurable = 1,
+        .u.method = {
+            .native = njs_hash_prototype_copy,
+        }
+    },
+
     {
         .flags = NJS_EXTERN_METHOD,
         .name.string = njs_str("constructor"),
@@ -470,6 +482,36 @@ exception:
 }
 
 
+static njs_int_t
+njs_hash_prototype_copy(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
+    njs_index_t unused)
+{
+    njs_digest_t  *dgst, *copy;
+
+    dgst = njs_vm_external(vm, njs_crypto_hash_proto_id, njs_argument(args, 0));
+    if (njs_slow_path(dgst == NULL)) {
+        njs_type_error(vm, "\"this\" is not a hash object");
+        return NJS_ERROR;
+    }
+
+    if (njs_slow_path(dgst->alg == NULL)) {
+        njs_error(vm, "Digest already called");
+        return NJS_ERROR;
+    }
+
+    copy = njs_mp_alloc(njs_vm_memory_pool(vm), sizeof(njs_digest_t));
+    if (njs_slow_path(copy == NULL)) {
+        njs_memory_error(vm);
+        return NJS_ERROR;
+    }
+
+    memcpy(copy, dgst, sizeof(njs_digest_t));
+
+    return njs_vm_external_create(vm, njs_vm_retval(vm),
+                                  njs_crypto_hash_proto_id, copy, 0);
+}
+
+
 static njs_int_t
 njs_crypto_create_hmac(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
     njs_index_t unused)

diff --git a/src/test/njs_unit_test.c b/src/test/njs_unit_test.c
index be982ec84fd8f5d564ca697a809a4933948aa208..1f1b3a1e7fa34dbde849835d3a8c73a26bad77e2 100644 (file)
--- a/src/test/njs_unit_test.c
+++ b/src/test/njs_unit_test.c
@@ -20360,6 +20360,26 @@ static njs_unit_test_t  njs_crypto_module_test[] =
               "OBZPvRdgPXP2lri01yZk1zW7anyIV3aH/SrjP9aWQVM=,"
               "OBZPvRdgPXP2lri01yZk1zW7anyIV3aH_SrjP9aWQVM") },
 
+    { njs_str("const crypto = require('crypto');"
+              "let hash = crypto.createHash('sha256');"
+              "let digests = [];"
+              "hash.update('one');"
+              "digests.push(hash.copy().digest('hex'));"
+              "hash.update('two');"
+              "digests.push(hash.copy().digest('hex'));"
+              "hash.update('three');"
+              "digests.push(hash.copy().digest('hex'));"
+              "digests"),
+      njs_str("7692c3ad3540bb803c020b3aee66cd8887123234ea0c6e7143c0add73ff431ed,"
+              "25b6746d5172ed6352966a013d93ac846e1110d5a25e8f183b5931f4688842a1,"
+              "4592092e1061c7ea85af2aed194621cc17a2762bae33a79bf8ce33fd0168b801") },
+
+    { njs_str("const crypto = require('crypto');"
+              "let hash = crypto.createHash('sha256');"
+              "hash.update('one').digest();"
+              "hash.copy()"),
+      njs_str("Error: Digest already called") },
+
     { njs_str("var hash = require('crypto').createHash;"
               "njs.dump(['', 'abc'.repeat(100)].map(v => {"
               "    return ['md5', 'sha1', 'sha256'].map(h => {"