fixes for node v13

Author: glslang

src/aes.c

@@ -14,9 +14,10 @@ static bool is_valid_key_len(size_t key_len)
 }
 
 static bool are_valid_args(const unsigned char *key, size_t key_len,
-                           const unsigned char *bytes, uint32_t flags)
+                           const unsigned char *bytes, size_t bytes_len, uint32_t flags)
 {
-    return key && is_valid_key_len(key_len) && bytes &&
+    return key && is_valid_key_len(key_len) &&
+           (bytes != NULL || (bytes == NULL && bytes_len == 0 && (flags & AES_FLAG_ENCRYPT))) &&
            (flags & ALL_OPS) != ALL_OPS;
 }
 
@@ -77,7 +78,7 @@ int wally_aes(const unsigned char *key, size_t key_len,
 {
     AES256_ctx ctx;
 
-    if (!are_valid_args(key, key_len, bytes, flags) ||
+    if (!are_valid_args(key, key_len, bytes, bytes_len, flags) ||
         len % AES_BLOCK_LEN || !bytes_len || bytes_len % AES_BLOCK_LEN ||
         flags & ~ALL_OPS || !bytes_out || !len)
         return WALLY_EINVAL;
@@ -106,7 +107,7 @@ int wally_aes_cbc(const unsigned char *key, size_t key_len,
     if (written)
         *written = 0;
 
-    if (!are_valid_args(key, key_len, bytes, flags) ||
+    if (!are_valid_args(key, key_len, bytes, bytes_len, flags) ||
         ((flags & AES_FLAG_ENCRYPT) && (len % AES_BLOCK_LEN)) ||
         ((flags & AES_FLAG_DECRYPT) && (bytes_len % AES_BLOCK_LEN)) ||
         !iv || iv_len != AES_BLOCK_LEN || flags & ~ALL_OPS || !written)

src/internal.c

@@ -75,7 +75,7 @@ int wally_sha256(const unsigned char *bytes, size_t bytes_len,
     struct sha256 sha;
     bool aligned = alignment_ok(bytes_out, sizeof(sha.u.u32));
 
-    if (!bytes || !bytes_out || len != SHA256_LEN)
+    if ((!bytes && bytes_len != 0) || !bytes_out || len != SHA256_LEN)
         return WALLY_EINVAL;
 
     sha256(aligned ? (struct sha256 *)bytes_out : &sha, bytes, bytes_len);
@@ -102,7 +102,7 @@ int wally_sha256_midstate(const unsigned char *bytes, size_t bytes_len,
     struct sha256_ctx ctx;
     bool aligned = alignment_ok(bytes_out, sizeof(sha.u.u32));
 
-    if (!bytes || !bytes_out || len != SHA256_LEN)
+    if ((!bytes && bytes_len != 0) || !bytes_out || len != SHA256_LEN)
         return WALLY_EINVAL;
 
     sha256_init(&ctx);
@@ -123,7 +123,7 @@ int wally_sha256d(const unsigned char *bytes, size_t bytes_len,
     struct sha256 sha_1, sha_2;
     bool aligned = alignment_ok(bytes_out, sizeof(sha_1.u.u32));
 
-    if (!bytes || !bytes_out || len != SHA256_LEN)
+    if ((!bytes && bytes_len != 0) || !bytes_out || len != SHA256_LEN)
         return WALLY_EINVAL;
 
     sha256(&sha_1, bytes, bytes_len);
@@ -142,7 +142,7 @@ int wally_sha512(const unsigned char *bytes, size_t bytes_len,
     struct sha512 sha;
     bool aligned = alignment_ok(bytes_out, sizeof(sha.u.u64));
 
-    if (!bytes || !bytes_out || len != SHA512_LEN)
+    if ((!bytes && bytes_len != 0) || !bytes_out || len != SHA512_LEN)
         return WALLY_EINVAL;
 
     sha512(aligned ? (struct sha512 *)bytes_out : &sha, bytes, bytes_len);
@@ -160,7 +160,7 @@ int wally_hash160(const unsigned char *bytes, size_t bytes_len,
     struct ripemd160 ripemd;
     bool aligned = alignment_ok(bytes_out, sizeof(ripemd.u.u32));
 
-    if (!bytes || !bytes_out || len != HASH160_LEN)
+    if ((!bytes && bytes_len != 0) || !bytes_out || len != HASH160_LEN)
         return WALLY_EINVAL;
 
     BUILD_ASSERT(sizeof(ripemd) == HASH160_LEN);

src/swig_python/contrib/sha.py

@@ -50,11 +50,11 @@ def test_wrong_types(self):
             # Python3 raises TypeError
             self._test_wrong_types_py3()
 
+
     def test_pass_none(self):
-        for shaX in [sha256, sha256d, sha512]:
-            with self.assertRaises(ValueError) as cm:
-                shaX(None)
-            self.assertEqual(str(cm.exception), "Invalid argument")
+        self.assertEquals(b2h(sha256(None)), "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
+        self.assertEquals(b2h(sha256d(None)), "5df6e0e2761359d30a8275058e299fcc0381534545f55cf43e41983f5d4c9456")
+        self.assertEquals(b2h(sha512(None)), "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")
 
 
 if __name__ == '__main__':