Upgrade ahash to 0.8.6 am: 1eff2ab44e

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ahash/+/2846336

Change-Id: I630a91a7374a12a390f722af99297b6d3690a68c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6 files changed, 32 insertions, 32 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index a2a6019..bf3f890 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "7bbbd833cb48c6f8e64bd94c196a700c09bb97e4"
+    "sha1": "6be06a691c859b3a5243adf774dc71ef68baab25"
   },
   "path_in_vcs": ""
 }
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index ae462e7..12a7863 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,7 +42,7 @@ rust_library {
     host_supported: true,
     crate_name: "ahash",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.8.5",
+    cargo_pkg_version: "0.8.6",
     srcs: ["src/lib.rs"],
     edition: "2018",
     arch: {
diff --git a/Cargo.toml b/Cargo.toml
index e87124f..934051d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2018"
 name = "ahash"
-version = "0.8.5"
+version = "0.8.6"
 authors = ["Tom Kaitchuck <Tom.Kaitchuck@gmail.com>"]
 build = "./build.rs"
 exclude = [
@@ -104,7 +104,7 @@ version = "1.0.117"
 optional = true
 
 [dependencies.zerocopy]
-version = "0.7.0"
+version = "0.7.14"
 features = ["simd"]
 default-features = false
 
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index b340522..aea0d44 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "ahash"
-version = "0.8.5"
+version = "0.8.6"
 authors = ["Tom Kaitchuck <Tom.Kaitchuck@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "A non-cryptographic hash function using AES-NI for high performance"
@@ -80,7 +80,7 @@ serde = { version = "1.0.117", optional = true }
 cfg-if = "1.0"
 atomic-polyfill = { version="1.0.1", optional=true}
 getrandom = { version = "0.2.7", optional = true }
-zerocopy = { version = "0.7.0", default-features = false, features = ["simd"] }
+zerocopy = { version = "0.7.14", default-features = false, features = ["simd"] }
 
 [target.'cfg(not(all(target_arch = "arm", target_os = "none")))'.dependencies]
 once_cell = { version = "1.13.1", default-features = false, features = ["unstable", "alloc"] }
diff --git a/METADATA b/METADATA
index 5d390c2..e60e706 100644
--- a/METADATA
+++ b/METADATA
@@ -5,19 +5,19 @@
 name: "ahash"
 description: "A non-cryptographic hash function using AES-NI for high performance"
 third_party {
-  url {
-    type: HOMEPAGE
-    value: "https://crates.io/crates/ahash"
-  }
-  url {
-    type: ARCHIVE
-    value: "https://static.crates.io/crates/ahash/ahash-0.8.5.crate"
-  }
-  version: "0.8.5"
   license_type: NOTICE
   last_upgrade_date {
     year: 2023
-    month: 10
+    month: 11
     day: 24
   }
+  identifier {
+    type: "HOMEPAGE"
+    value: "https://crates.io/crates/ahash"
+  }
+  identifier {
+    type: "ARCHIVE"
+    value: "https://static.crates.io/crates/ahash/ahash-0.8.6.crate"
+    version: "0.8.6"
+  }
 }
diff --git a/src/aes_hash.rs b/src/aes_hash.rs
index d3b673f..0b9a1d4 100644
--- a/src/aes_hash.rs
+++ b/src/aes_hash.rs
@@ -81,23 +81,23 @@ impl AHasher {
 
     #[inline(always)]
     fn hash_in(&mut self, new_value: u128) {
-        self.enc = aesenc(self.enc, new_value);
+        self.enc = aesdec(self.enc, new_value);
         self.sum = shuffle_and_add(self.sum, new_value);
     }
 
     #[inline(always)]
     fn hash_in_2(&mut self, v1: u128, v2: u128) {
-        self.enc = aesenc(self.enc, v1);
+        self.enc = aesdec(self.enc, v1);
         self.sum = shuffle_and_add(self.sum, v1);
-        self.enc = aesenc(self.enc, v2);
+        self.enc = aesdec(self.enc, v2);
         self.sum = shuffle_and_add(self.sum, v2);
     }
 
     #[inline]
     #[cfg(feature = "specialize")]
     fn short_finish(&self) -> u64 {
-        let combined = aesdec(self.sum, self.enc);
-        let result: [u64; 2] = aesenc(combined, combined).convert();
+        let combined = aesenc(self.sum, self.enc);
+        let result: [u64; 2] = aesdec(combined, combined).convert();
         result[0]
     }
 }
@@ -174,10 +174,10 @@ impl Hasher for AHasher {
                     sum[1] = shuffle_and_add(sum[1], tail[3]);
                     while data.len() > 64 {
                         let (blocks, rest) = data.read_u128x4();
-                        current[0] = aesenc(current[0], blocks[0]);
-                        current[1] = aesenc(current[1], blocks[1]);
-                        current[2] = aesenc(current[2], blocks[2]);
-                        current[3] = aesenc(current[3], blocks[3]);
+                        current[0] = aesdec(current[0], blocks[0]);
+                        current[1] = aesdec(current[1], blocks[1]);
+                        current[2] = aesdec(current[2], blocks[2]);
+                        current[3] = aesdec(current[3], blocks[3]);
                         sum[0] = shuffle_and_add(sum[0], blocks[0]);
                         sum[1] = shuffle_and_add(sum[1], blocks[1]);
                         sum[0] = shuffle_and_add(sum[0], blocks[2]);
@@ -208,9 +208,9 @@ impl Hasher for AHasher {
     }
     #[inline]
     fn finish(&self) -> u64 {
-        let combined = aesdec(self.sum, self.enc);
-        let result: [u64; 2] = aesenc(aesenc(combined, self.key), combined).convert();
-        result[1]
+        let combined = aesenc(self.sum, self.enc);
+        let result: [u64; 2] = aesdec(aesdec(combined, self.key), combined).convert();
+        result[0]
     }
 }
 
@@ -329,15 +329,15 @@ impl Hasher for AHasherStr {
     fn write(&mut self, bytes: &[u8]) {
         if bytes.len() > 8 {
             self.0.write(bytes);
-            self.0.enc = aesdec(self.0.sum, self.0.enc);
-            self.0.enc = aesenc(aesenc(self.0.enc, self.0.key), self.0.enc);
+            self.0.enc = aesenc(self.0.sum, self.0.enc);
+            self.0.enc = aesdec(aesdec(self.0.enc, self.0.key), self.0.enc);
         } else {
             add_in_length(&mut self.0.enc, bytes.len() as u64);
 
             let value = read_small(bytes).convert();
             self.0.sum = shuffle_and_add(self.0.sum, value);
-            self.0.enc = aesdec(self.0.sum, self.0.enc);
-            self.0.enc = aesenc(aesenc(self.0.enc, self.0.key), self.0.enc);
+            self.0.enc = aesenc(self.0.sum, self.0.enc);
+            self.0.enc = aesdec(aesdec(self.0.enc, self.0.key), self.0.enc);
         }
     }