diff --git a/BUILD.bazel b/BUILD.bazel
index 822e7fa689cd..ed2077ed59b8 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -104,6 +104,7 @@ filegroup(
         "android/abi_gki_aarch64_db845c",
         "android/abi_gki_aarch64_exynos",
         "android/abi_gki_aarch64_exynosauto",
+        "android/abi_gki_aarch64_fips140",
         "android/abi_gki_aarch64_galaxy",
         "android/abi_gki_aarch64_honda",
         "android/abi_gki_aarch64_honor",
@@ -715,9 +716,16 @@ kernel_build(
     outs = [],
     base_kernel = ":kernel_aarch64",
     build_config = "build.config.gki.aarch64.fips140",
+    kmi_symbol_list = "android/abi_gki_aarch64_fips140",
     module_outs = ["crypto/fips140.ko"],
 )
 
+kernel_abi(
+    name = "fips140_abi",
+    kernel_build = ":fips140",
+    kmi_symbol_list_add_only = True,
+)
+
 copy_to_dist_dir(
     name = "fips140_dist",
     data = [
diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 6cb2bcdc5016..168e288b8108 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -3393,6 +3393,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1ae9d1bd
 }
+pointer_reference {
+  id: 0x0c2bd8e3
+  kind: POINTER
+  pointee_type_id: 0x1aef8512
+}
 pointer_reference {
   id: 0x0c2e195c
   kind: POINTER
@@ -4748,6 +4753,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1f0fd39d
 }
+pointer_reference {
+  id: 0x0d53f428
+  kind: POINTER
+  pointee_type_id: 0x1f0f363d
+}
 pointer_reference {
   id: 0x0d5547d5
   kind: POINTER
@@ -5538,6 +5548,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x1dad5a2a
 }
+pointer_reference {
+  id: 0x0dfbab12
+  kind: POINTER
+  pointee_type_id: 0x1dae4ad4
+}
 pointer_reference {
   id: 0x0dfd7a00
   kind: POINTER
@@ -7748,6 +7763,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x157aa231
 }
+pointer_reference {
+  id: 0x0fcecb94
+  kind: POINTER
+  pointee_type_id: 0x157bc8cc
+}
 pointer_reference {
   id: 0x0fd14d12
   kind: POINTER
@@ -13423,6 +13443,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x8d38c78e
 }
+pointer_reference {
+  id: 0x29df5204
+  kind: POINTER
+  pointee_type_id: 0x8d3dae8e
+}
 pointer_reference {
   id: 0x29e9cbd8
   kind: POINTER
@@ -24653,6 +24678,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xf91eb689
 }
+pointer_reference {
+  id: 0x34d86d1c
+  kind: POINTER
+  pointee_type_id: 0xf92152ec
+}
 pointer_reference {
   id: 0x34dbb6d7
   kind: POINTER
@@ -24813,6 +24843,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xfeeea03f
 }
+pointer_reference {
+  id: 0x352e53fa
+  kind: POINTER
+  pointee_type_id: 0xfef9a975
+}
 pointer_reference {
   id: 0x35304fb1
   kind: POINTER
@@ -27348,6 +27383,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xc0843ed1
 }
+pointer_reference {
+  id: 0x3ab2afcb
+  kind: POINTER
+  pointee_type_id: 0xc08a59b2
+}
 pointer_reference {
   id: 0x3ab47ff9
   kind: POINTER
@@ -28333,6 +28373,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xde0d753a
 }
+pointer_reference {
+  id: 0x3d14c96b
+  kind: POINTER
+  pointee_type_id: 0xde13c333
+}
 pointer_reference {
   id: 0x3d1ec847
   kind: POINTER
@@ -28903,6 +28948,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xd327a107
 }
+pointer_reference {
+  id: 0x3e5d9ebb
+  kind: POINTER
+  pointee_type_id: 0xd3369c71
+}
 pointer_reference {
   id: 0x3e600958
   kind: POINTER
@@ -36252,6 +36302,11 @@ array {
   number_of_elements: 2
   element_type_id: 0x92233392
 }
+array {
+  id: 0x489cdd32
+  number_of_elements: 192
+  element_type_id: 0x384f7d7c
+}
 array {
   id: 0x48aeeb39
   number_of_elements: 2
@@ -39460,6 +39515,21 @@ member {
   type_id: 0x4f2326f3
   offset: 1280
 }
+member {
+  id: 0x300b2096
+  type_id: 0x4f02de2a
+  offset: 512
+}
+member {
+  id: 0x300b20e1
+  type_id: 0x4f02dff7
+  offset: 512
+}
+member {
+  id: 0x300b2aaf
+  type_id: 0x4f02f6cc
+  offset: 512
+}
 member {
   id: 0x300b2d2f
   type_id: 0x4f02e8cc
@@ -45164,6 +45234,11 @@ member {
   type_id: 0x6720d32f
   offset: 576
 }
+member {
+  id: 0x270f3232
+  name: "alg"
+  type_id: 0xa2be2e87
+}
 member {
   id: 0x2777335c
   name: "alg"
@@ -45180,6 +45255,16 @@ member {
   type_id: 0x00defc2c
   offset: 128
 }
+member {
+  id: 0x27b1e24e
+  name: "alg"
+  type_id: 0x1c6e5215
+}
+member {
+  id: 0x27b6977d
+  name: "alg"
+  type_id: 0x1b1b6127
+}
 member {
   id: 0xc3ae1168
   name: "alg_icv_len"
@@ -52407,6 +52492,12 @@ member {
   name: "base"
   type_id: 0xed62338c
 }
+member {
+  id: 0x8544c80b
+  name: "base"
+  type_id: 0x9e2c67f2
+  offset: 1536
+}
 member {
   id: 0x8544c9f4
   name: "base"
@@ -52595,6 +52686,11 @@ member {
   name: "base"
   type_id: 0x27253e64
 }
+member {
+  id: 0x85fdf55a
+  name: "base"
+  type_id: 0x271bd1e1
+}
 member {
   id: 0xf93eb8d5
   name: "base_addr"
@@ -93160,6 +93256,11 @@ member {
   type_id: 0x0f7ddf45
   offset: 384
 }
+member {
+  id: 0xfeae230b
+  name: "free"
+  type_id: 0x0c2bd8e3
+}
 member {
   id: 0xfeae4b02
   name: "free"
@@ -93200,6 +93301,11 @@ member {
   type_id: 0x0d364e53
   offset: 320
 }
+member {
+  id: 0xfeaf5b27
+  name: "free"
+  type_id: 0x0d53f428
+}
 member {
   id: 0xfeafbaf6
   name: "free"
@@ -93211,6 +93317,11 @@ member {
   type_id: 0x0dcbeae6
   offset: 1664
 }
+member {
+  id: 0xfeaff378
+  name: "free"
+  type_id: 0x0dfbab12
+}
 member {
   id: 0xfbc061e4
   name: "free_area"
@@ -99934,6 +100045,11 @@ member {
   name: "head"
   type_id: 0x5fb59157
 }
+member {
+  id: 0xb51225dc
+  name: "head"
+  type_id: 0x489cdd32
+}
 member {
   id: 0xb51f3196
   name: "head"
@@ -170215,6 +170331,11 @@ member {
   name: "s"
   type_id: 0x3514d59f
 }
+member {
+  id: 0x67c7be4e
+  name: "s"
+  type_id: 0x35099c9e
+}
 member {
   id: 0x67c839a9
   name: "s"
@@ -212442,6 +212563,15 @@ struct_union {
     member_id: 0x8f0ea6b7
   }
 }
+struct_union {
+  id: 0x35099c9e
+  kind: STRUCT
+  definition {
+    bytesize: 640
+    member_id: 0xb51225dc
+    member_id: 0x8544c80b
+  }
+}
 struct_union {
   id: 0x3514d59f
   kind: STRUCT
@@ -213780,6 +213910,24 @@ struct_union {
     member_id: 0x8fed16f2
   }
 }
+struct_union {
+  id: 0x4f02de2a
+  kind: UNION
+  definition {
+    bytesize: 640
+    member_id: 0x67c7be4e
+    member_id: 0x27b1e24e
+  }
+}
+struct_union {
+  id: 0x4f02dff7
+  kind: UNION
+  definition {
+    bytesize: 640
+    member_id: 0x67c7be4e
+    member_id: 0x27b6977d
+  }
+}
 struct_union {
   id: 0x4f02e8cc
   kind: UNION
@@ -213789,6 +213937,15 @@ struct_union {
     member_id: 0x2777335c
   }
 }
+struct_union {
+  id: 0x4f02f6cc
+  kind: UNION
+  definition {
+    bytesize: 512
+    member_id: 0x67c7a307
+    member_id: 0x270f3232
+  }
+}
 struct_union {
   id: 0x4f03a6ae
   kind: UNION
@@ -216964,6 +217121,16 @@ struct_union {
     member_id: 0x85f3de85
   }
 }
+struct_union {
+  id: 0x8d3dae8e
+  kind: STRUCT
+  name: "aead_instance"
+  definition {
+    bytesize: 576
+    member_id: 0xfeae230b
+    member_id: 0x300b2aaf
+  }
+}
 struct_union {
   id: 0xe2a4c51e
   kind: STRUCT
@@ -217028,6 +217195,16 @@ struct_union {
     member_id: 0xae60b70a
   }
 }
+struct_union {
+  id: 0xd3369c71
+  kind: STRUCT
+  name: "ahash_instance"
+  definition {
+    bytesize: 704
+    member_id: 0xfeaf5b27
+    member_id: 0x300b2096
+  }
+}
 struct_union {
   id: 0xe316ef9b
   kind: STRUCT
@@ -222980,6 +223157,15 @@ struct_union {
     member_id: 0x8597b564
   }
 }
+struct_union {
+  id: 0xc08a59b2
+  kind: STRUCT
+  name: "crypto_aead_spawn"
+  definition {
+    bytesize: 48
+    member_id: 0x85fdf55a
+  }
+}
 struct_union {
   id: 0x7ebccaf7
   kind: STRUCT
@@ -223009,6 +223195,15 @@ struct_union {
     member_id: 0x8597b963
   }
 }
+struct_union {
+  id: 0xde13c333
+  kind: STRUCT
+  name: "crypto_ahash_spawn"
+  definition {
+    bytesize: 48
+    member_id: 0x85fdf55a
+  }
+}
 struct_union {
   id: 0x0f57eec7
   kind: STRUCT
@@ -223125,6 +223320,15 @@ struct_union {
     member_id: 0x8597b564
   }
 }
+struct_union {
+  id: 0xfef9a975
+  kind: STRUCT
+  name: "crypto_shash_spawn"
+  definition {
+    bytesize: 48
+    member_id: 0x85fdf55a
+  }
+}
 struct_union {
   id: 0x1b619644
   kind: STRUCT
@@ -223135,6 +223339,15 @@ struct_union {
     member_id: 0x8597b564
   }
 }
+struct_union {
+  id: 0x157bc8cc
+  kind: STRUCT
+  name: "crypto_skcipher_spawn"
+  definition {
+    bytesize: 48
+    member_id: 0x85fdf55a
+  }
+}
 struct_union {
   id: 0x271bd1e1
   kind: STRUCT
@@ -254727,6 +254940,16 @@ struct_union {
     member_id: 0x759069c8
   }
 }
+struct_union {
+  id: 0xf92152ec
+  kind: STRUCT
+  name: "shash_instance"
+  definition {
+    bytesize: 704
+    member_id: 0xfeaff378
+    member_id: 0x300b20e1
+  }
+}
 struct_union {
   id: 0x993d1b03
   kind: STRUCT
@@ -289485,6 +289708,11 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x0357d2dd
 }
+function {
+  id: 0x104de2e4
+  return_type_id: 0x48b5725f
+  parameter_id: 0x0356cddf
+}
 function {
   id: 0x104de9a9
   return_type_id: 0x48b5725f
@@ -289570,6 +289798,13 @@ function {
   parameter_id: 0x00c83ba6
   parameter_id: 0x3f1a5886
 }
+function {
+  id: 0x105651c0
+  return_type_id: 0x48b5725f
+  parameter_id: 0x00defc2c
+  parameter_id: 0x3e6239e1
+  parameter_id: 0x00defc2c
+}
 function {
   id: 0x10570899
   return_type_id: 0x48b5725f
@@ -291020,6 +291255,12 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x0a22a423
 }
+function {
+  id: 0x12116aa4
+  return_type_id: 0x48b5725f
+  parameter_id: 0x0c56e1ee
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x1213f72a
   return_type_id: 0x48b5725f
@@ -294436,6 +294677,12 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x19c40476
 }
+function {
+  id: 0x16ea4d90
+  return_type_id: 0x48b5725f
+  parameter_id: 0x1fba7d3d
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x16ebcbfa
   return_type_id: 0x48b5725f
@@ -296543,6 +296790,11 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x29d29128
 }
+function {
+  id: 0x1aef8512
+  return_type_id: 0x48b5725f
+  parameter_id: 0x29df5204
+}
 function {
   id: 0x1af18e52
   return_type_id: 0x48b5725f
@@ -298482,6 +298734,11 @@ function {
   parameter_id: 0x32a623d7
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x1dae4ad4
+  return_type_id: 0x48b5725f
+  parameter_id: 0x34d86d1c
+}
 function {
   id: 0x1db066c6
   return_type_id: 0x3411dbb1
@@ -298704,6 +298961,12 @@ function {
   parameter_id: 0x12e6ffae
   parameter_id: 0x6d7f5ff6
 }
+function {
+  id: 0x1e0b28b6
+  return_type_id: 0x48b5725f
+  parameter_id: 0x3c3fe9a7
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x1e0b6efe
   return_type_id: 0x48b5725f
@@ -299701,6 +299964,11 @@ function {
   parameter_id: 0xe276adef
   parameter_id: 0x6d7f5ff6
 }
+function {
+  id: 0x1f0f363d
+  return_type_id: 0x48b5725f
+  parameter_id: 0x3e5d9ebb
+}
 function {
   id: 0x1f0fd39d
   return_type_id: 0x48b5725f
@@ -301983,6 +302251,10 @@ function {
   return_type_id: 0x33756485
   parameter_id: 0x31675062
 }
+function {
+  id: 0x3e015618
+  return_type_id: 0x2fb495bb
+}
 function {
   id: 0x3e17424c
   return_type_id: 0x33756485
@@ -303275,6 +303547,11 @@ function {
   parameter_id: 0x052fac00
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x56430286
+  return_type_id: 0x18bd6530
+  parameter_id: 0x0356cddf
+}
 function {
   id: 0x5659e8fb
   return_type_id: 0x18bd6530
@@ -305422,6 +305699,13 @@ function {
   parameter_id: 0x3cb1656a
   parameter_id: 0x0b27dc43
 }
+function {
+  id: 0x7f0da6b7
+  return_type_id: 0x3c9ce28f
+  parameter_id: 0x3e10b518
+  parameter_id: 0xc9082b19
+  parameter_id: 0xc9082b19
+}
 function {
   id: 0x7f0f4bf3
   return_type_id: 0x1d19a9d5
@@ -306163,6 +306447,13 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0x0b553223
 }
+function {
+  id: 0x8a129bb5
+  return_type_id: 0x19c40476
+  parameter_id: 0x0356cddf
+  parameter_id: 0xc9082b19
+  parameter_id: 0xc9082b19
+}
 function {
   id: 0x8a23f6d7
   return_type_id: 0x1e2533ab
@@ -307033,6 +307324,15 @@ function {
   parameter_id: 0x914dbfdc
   parameter_id: 0x914dbfdc
 }
+function {
+  id: 0x9073891f
+  return_type_id: 0x6720d32f
+  parameter_id: 0x352e53fa
+  parameter_id: 0x2d1b205b
+  parameter_id: 0x3e10b518
+  parameter_id: 0xc9082b19
+  parameter_id: 0xc9082b19
+}
 function {
   id: 0x90738a48
   return_type_id: 0x6720d32f
@@ -310023,6 +310323,15 @@ function {
   parameter_id: 0x3c41c19b
   parameter_id: 0x3a9fa744
 }
+function {
+  id: 0x927d2fbb
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3d14c96b
+  parameter_id: 0x2d1b205b
+  parameter_id: 0x3e10b518
+  parameter_id: 0xc9082b19
+  parameter_id: 0xc9082b19
+}
 function {
   id: 0x927d452a
   return_type_id: 0x6720d32f
@@ -310824,6 +311133,12 @@ function {
   parameter_id: 0x173696bc
   parameter_id: 0x07dcdbe1
 }
+function {
+  id: 0x93139a0a
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3c3fe9a7
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x9313a933
   return_type_id: 0x6720d32f
@@ -311413,6 +311728,15 @@ function {
   parameter_id: 0x054f691a
   parameter_id: 0x1f73dead
 }
+function {
+  id: 0x9394b613
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3ab2afcb
+  parameter_id: 0x2d1b205b
+  parameter_id: 0x3e10b518
+  parameter_id: 0xc9082b19
+  parameter_id: 0xc9082b19
+}
 function {
   id: 0x9394f11e
   return_type_id: 0x6720d32f
@@ -312058,6 +312382,11 @@ function {
   parameter_id: 0x26ee682a
   parameter_id: 0x1eb29fb8
 }
+function {
+  id: 0x9442d510
+  return_type_id: 0x3e10b518
+  parameter_id: 0x181b0acd
+}
 function {
   id: 0x94435373
   return_type_id: 0x6720d32f
@@ -312337,6 +312666,12 @@ function {
   parameter_id: 0x29082583
   parameter_id: 0xd41e888f
 }
+function {
+  id: 0x94938ce2
+  return_type_id: 0x6720d32f
+  parameter_id: 0x223fb206
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x94964152
   return_type_id: 0x6720d32f
@@ -313568,6 +313903,13 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x2ef43f67
 }
+function {
+  id: 0x963e5e52
+  return_type_id: 0x6720d32f
+  parameter_id: 0x2d1b205b
+  parameter_id: 0x3e10b518
+  parameter_id: 0x00defc2c
+}
 function {
   id: 0x963ea445
   return_type_id: 0x6720d32f
@@ -318048,6 +318390,12 @@ function {
   parameter_id: 0x391f15ea
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x9a970a1a
+  return_type_id: 0x6720d32f
+  parameter_id: 0x1fba7d3d
+  parameter_id: 0x3e5d9ebb
+}
 function {
   id: 0x9a9d1e6d
   return_type_id: 0xf435685e
@@ -318325,6 +318673,12 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0x3e6239e1
 }
+function {
+  id: 0x9abd1dd4
+  return_type_id: 0x6720d32f
+  parameter_id: 0x1fba7d3d
+  parameter_id: 0x34d86d1c
+}
 function {
   id: 0x9abe486f
   return_type_id: 0x6720d32f
@@ -318402,6 +318756,12 @@ function {
   parameter_id: 0x3f0185ef
   parameter_id: 0x4585663f
 }
+function {
+  id: 0x9ac90128
+  return_type_id: 0x6720d32f
+  parameter_id: 0x1fba7d3d
+  parameter_id: 0x29df5204
+}
 function {
   id: 0x9ac9a7eb
   return_type_id: 0x2668e644
@@ -319331,6 +319691,15 @@ function {
   parameter_id: 0x387626d3
   parameter_id: 0x30650ba6
 }
+function {
+  id: 0x9b42dae7
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x3f0185ef
+  parameter_id: 0x4585663f
+  parameter_id: 0x00c72527
+  parameter_id: 0x13580d6c
+}
 function {
   id: 0x9b432d7a
   return_type_id: 0x6720d32f
@@ -319378,6 +319747,15 @@ function {
   parameter_id: 0x188b9e81
   parameter_id: 0x391f15ea
 }
+function {
+  id: 0x9b468d43
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x3a7f8e60
+  parameter_id: 0x00c72527
+  parameter_id: 0x3f0185ef
+  parameter_id: 0x13580d6c
+}
 function {
   id: 0x9b46c616
   return_type_id: 0x6720d32f
@@ -322609,6 +322987,12 @@ function {
   parameter_id: 0x11b57133
   parameter_id: 0x6d7f5ff6
 }
+function {
+  id: 0x9bf2ff2c
+  return_type_id: 0x6720d32f
+  parameter_id: 0x1fba7d3d
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x9bf37946
   return_type_id: 0x6720d32f
@@ -322634,6 +323018,15 @@ function {
   parameter_id: 0xf1a6dfed
   parameter_id: 0x2170d06d
 }
+function {
+  id: 0x9bf594ed
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x153f0b1a
+  parameter_id: 0x3f0185ef
+  parameter_id: 0x4585663f
+  parameter_id: 0x13580d6c
+}
 function {
   id: 0x9bf6c118
   return_type_id: 0x6720d32f
@@ -322973,6 +323366,12 @@ function {
   parameter_id: 0x06835e9c
   parameter_id: 0x469ea43a
 }
+function {
+  id: 0x9c2bdf68
+  return_type_id: 0x6720d32f
+  parameter_id: 0x00defc2c
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x9c2c04fd
   return_type_id: 0x6720d32f
@@ -323736,6 +324135,13 @@ function {
   parameter_id: 0x09626b7f
   parameter_id: 0xda0bfa94
 }
+function {
+  id: 0x9cb54d89
+  return_type_id: 0x6720d32f
+  parameter_id: 0x076327a3
+  parameter_id: 0x3f0185ef
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x9cb5c182
   return_type_id: 0x6720d32f
@@ -325250,6 +325656,13 @@ function {
   parameter_id: 0x1bb6a471
   parameter_id: 0x4585663f
 }
+function {
+  id: 0x9d8f49ca
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0c96fb14
+  parameter_id: 0xc9082b19
+  parameter_id: 0x38d23361
+}
 function {
   id: 0x9d8f9d80
   return_type_id: 0x6720d32f
@@ -326109,6 +326522,15 @@ function {
   parameter_id: 0x00c72527
   parameter_id: 0xf435685e
 }
+function {
+  id: 0x9dedae96
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0356cddf
+  parameter_id: 0x2d1b205b
+  parameter_id: 0x3e10b518
+  parameter_id: 0xc9082b19
+  parameter_id: 0xc9082b19
+}
 function {
   id: 0x9dee9fa0
   return_type_id: 0x6720d32f
@@ -327242,6 +327664,15 @@ function {
   parameter_id: 0x0ca27481
   parameter_id: 0x18bd6530
 }
+function {
+  id: 0x9ecbaf04
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0fcecb94
+  parameter_id: 0x2d1b205b
+  parameter_id: 0x3e10b518
+  parameter_id: 0xc9082b19
+  parameter_id: 0xc9082b19
+}
 function {
   id: 0x9ecc55aa
   return_type_id: 0x6720d32f
@@ -327597,6 +328028,12 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x0a1edf98
 }
+function {
+  id: 0x9f09d818
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0c56e1ee
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x9f0d3989
   return_type_id: 0x6720d32f
@@ -328115,6 +328552,12 @@ function {
   parameter_id: 0x3e10b518
   parameter_id: 0xa52a0930
 }
+function {
+  id: 0x9f7e8b2b
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0d8bad22
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x9f7fc723
   return_type_id: 0x6720d32f
@@ -333664,6 +334107,11 @@ function {
   parameter_id: 0x39d1288c
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0xfdb1e37f
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x0c56e1ee
+}
 function {
   id: 0xfdb2dd0c
   return_type_id: 0x6d7f5ff6
@@ -338498,6 +338946,33 @@ elf_symbol {
   type_id: 0x9ab41198
   full_name: "__traceiter_android_vh_adjust_kvmalloc_flags"
 }
+elf_symbol {
+  id: 0x0556c9b1
+  name: "__traceiter_android_vh_aes_decrypt"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xb0d1574b
+  type_id: 0x9b468d43
+  full_name: "__traceiter_android_vh_aes_decrypt"
+}
+elf_symbol {
+  id: 0xa3ddabd2
+  name: "__traceiter_android_vh_aes_encrypt"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x6160ff0c
+  type_id: 0x9b468d43
+  full_name: "__traceiter_android_vh_aes_encrypt"
+}
+elf_symbol {
+  id: 0xf78be1c5
+  name: "__traceiter_android_vh_aes_expandkey"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xdc004b58
+  type_id: 0x9bf594ed
+  full_name: "__traceiter_android_vh_aes_expandkey"
+}
 elf_symbol {
   id: 0xd0b4a794
   name: "__traceiter_android_vh_alloc_oem_binder_struct"
@@ -340316,6 +340791,15 @@ elf_symbol {
   type_id: 0x9bc302e5
   full_name: "__traceiter_android_vh_setscheduler_uclamp"
 }
+elf_symbol {
+  id: 0x98a943de
+  name: "__traceiter_android_vh_sha256"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x88fe3e25
+  type_id: 0x9b42dae7
+  full_name: "__traceiter_android_vh_sha256"
+}
 elf_symbol {
   id: 0x53263f73
   name: "__traceiter_android_vh_should_alloc_pages_retry"
@@ -342629,6 +343113,33 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_adjust_kvmalloc_flags"
 }
+elf_symbol {
+  id: 0x58e7634f
+  name: "__tracepoint_android_vh_aes_decrypt"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x64eaf879
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_aes_decrypt"
+}
+elf_symbol {
+  id: 0x3a519484
+  name: "__tracepoint_android_vh_aes_encrypt"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x85db9ebb
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_aes_encrypt"
+}
+elf_symbol {
+  id: 0x7ea1f05b
+  name: "__tracepoint_android_vh_aes_expandkey"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x71396455
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_aes_expandkey"
+}
 elf_symbol {
   id: 0xd7f9868e
   name: "__tracepoint_android_vh_alloc_oem_binder_struct"
@@ -344447,6 +344958,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_setscheduler_uclamp"
 }
+elf_symbol {
+  id: 0x5cfdecb8
+  name: "__tracepoint_android_vh_sha256"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x8848ed50
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_sha256"
+}
 elf_symbol {
   id: 0xd860c719
   name: "__tracepoint_android_vh_should_alloc_pages_retry"
@@ -346517,6 +347037,15 @@ elf_symbol {
   type_id: 0x12c8be42
   full_name: "adjust_managed_page_count"
 }
+elf_symbol {
+  id: 0xd8a7188c
+  name: "aead_register_instance"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x84356a92
+  type_id: 0x9ac90128
+  full_name: "aead_register_instance"
+}
 elf_symbol {
   id: 0x294249c0
   name: "aes_encrypt"
@@ -346535,6 +347064,15 @@ elf_symbol {
   type_id: 0x982246a7
   full_name: "aes_expandkey"
 }
+elf_symbol {
+  id: 0x178de6db
+  name: "ahash_register_instance"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1787bb48
+  type_id: 0x9a970a1a
+  full_name: "ahash_register_instance"
+}
 elf_symbol {
   id: 0x510c7445
   name: "alarm_cancel"
@@ -352067,6 +352605,24 @@ elf_symbol {
   type_id: 0x9ac8451b
   full_name: "crypto_ahash_setkey"
 }
+elf_symbol {
+  id: 0x5bcc3288
+  name: "crypto_alg_list"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x457594fa
+  type_id: 0xd3c80119
+  full_name: "crypto_alg_list"
+}
+elf_symbol {
+  id: 0x6be7b839
+  name: "crypto_alg_sem"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xedac5f42
+  type_id: 0x28b9ec9a
+  full_name: "crypto_alg_sem"
+}
 elf_symbol {
   id: 0xc81e9eb3
   name: "crypto_alloc_aead"
@@ -352112,6 +352668,15 @@ elf_symbol {
   type_id: 0xf66dfeca
   full_name: "crypto_alloc_kpp"
 }
+elf_symbol {
+  id: 0xccb689ba
+  name: "crypto_alloc_rng"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x440e70bc
+  type_id: 0x7f0da6b7
+  full_name: "crypto_alloc_rng"
+}
 elf_symbol {
   id: 0xef67fe16
   name: "crypto_alloc_shash"
@@ -352139,6 +352704,24 @@ elf_symbol {
   type_id: 0x329319f8
   full_name: "crypto_alloc_sync_skcipher"
 }
+elf_symbol {
+  id: 0x54908709
+  name: "crypto_attr_alg_name"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x9a11a0fc
+  type_id: 0x9442d510
+  full_name: "crypto_attr_alg_name"
+}
+elf_symbol {
+  id: 0x274ca92d
+  name: "crypto_check_attr_type"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x4934bdd0
+  type_id: 0x9d8f49ca
+  full_name: "crypto_check_attr_type"
+}
 elf_symbol {
   id: 0xa3db58f1
   name: "crypto_cipher_encrypt_one"
@@ -352149,6 +352732,16 @@ elf_symbol {
   type_id: 0x114c448e
   full_name: "crypto_cipher_encrypt_one"
 }
+elf_symbol {
+  id: 0xcbd0db1f
+  name: "crypto_cipher_setkey"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x5e752574
+  namespace: "CRYPTO_INTERNAL"
+  type_id: 0x9cb54d89
+  full_name: "crypto_cipher_setkey"
+}
 elf_symbol {
   id: 0x1257590d
   name: "crypto_comp_compress"
@@ -352194,6 +352787,15 @@ elf_symbol {
   type_id: 0x16d018ce
   full_name: "crypto_destroy_tfm"
 }
+elf_symbol {
+  id: 0xf7cc32dd
+  name: "crypto_drop_spawn"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x64cf94b4
+  type_id: 0x104de2e4
+  full_name: "crypto_drop_spawn"
+}
 elf_symbol {
   id: 0xd04a0a9e
   name: "crypto_ecdh_encode_key"
@@ -352221,6 +352823,15 @@ elf_symbol {
   type_id: 0x9a78591e
   full_name: "crypto_enqueue_request"
 }
+elf_symbol {
+  id: 0x807f2b6e
+  name: "crypto_get_default_null_skcipher"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x9b19163b
+  type_id: 0x3e015618
+  full_name: "crypto_get_default_null_skcipher"
+}
 elf_symbol {
   id: 0xbf39e9a5
   name: "crypto_get_default_rng"
@@ -352230,6 +352841,51 @@ elf_symbol {
   type_id: 0x9d80e32f
   full_name: "crypto_get_default_rng"
 }
+elf_symbol {
+  id: 0xa07184ca
+  name: "crypto_grab_aead"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xc704e06c
+  type_id: 0x9394b613
+  full_name: "crypto_grab_aead"
+}
+elf_symbol {
+  id: 0x08a3daa7
+  name: "crypto_grab_ahash"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x815c2a4d
+  type_id: 0x927d2fbb
+  full_name: "crypto_grab_ahash"
+}
+elf_symbol {
+  id: 0xf83dbc28
+  name: "crypto_grab_shash"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x8abafd8b
+  type_id: 0x9073891f
+  full_name: "crypto_grab_shash"
+}
+elf_symbol {
+  id: 0x224d9b3e
+  name: "crypto_grab_skcipher"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xfa3b917d
+  type_id: 0x9ecbaf04
+  full_name: "crypto_grab_skcipher"
+}
+elf_symbol {
+  id: 0xcb442450
+  name: "crypto_grab_spawn"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x8fdd4639
+  type_id: 0x9dedae96
+  full_name: "crypto_grab_spawn"
+}
 elf_symbol {
   id: 0x4d4a15b0
   name: "crypto_has_ahash"
@@ -352266,6 +352922,24 @@ elf_symbol {
   type_id: 0x1667b3d4
   full_name: "crypto_init_queue"
 }
+elf_symbol {
+  id: 0x33ee5483
+  name: "crypto_inst_setname"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xfa76cf97
+  type_id: 0x963e5e52
+  full_name: "crypto_inst_setname"
+}
+elf_symbol {
+  id: 0xaca5602a
+  name: "crypto_put_default_null_skcipher"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x21cd536a
+  type_id: 0x10985193
+  full_name: "crypto_put_default_null_skcipher"
+}
 elf_symbol {
   id: 0x053cd2eb
   name: "crypto_put_default_rng"
@@ -352284,6 +352958,15 @@ elf_symbol {
   type_id: 0x950f0fae
   full_name: "crypto_register_aead"
 }
+elf_symbol {
+  id: 0x7283d4fc
+  name: "crypto_register_aeads"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe7bb04d1
+  type_id: 0x94938ce2
+  full_name: "crypto_register_aeads"
+}
 elf_symbol {
   id: 0x3359f049
   name: "crypto_register_ahash"
@@ -352293,6 +352976,15 @@ elf_symbol {
   type_id: 0x9ee20867
   full_name: "crypto_register_ahash"
 }
+elf_symbol {
+  id: 0xc8a04eec
+  name: "crypto_register_ahashes"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1ad832bb
+  type_id: 0x9f7e8b2b
+  full_name: "crypto_register_ahashes"
+}
 elf_symbol {
   id: 0xc60881ee
   name: "crypto_register_akcipher"
@@ -352311,6 +353003,15 @@ elf_symbol {
   type_id: 0x9db75c24
   full_name: "crypto_register_alg"
 }
+elf_symbol {
+  id: 0xf18d5670
+  name: "crypto_register_algs"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xb028a93c
+  type_id: 0x9c2bdf68
+  full_name: "crypto_register_algs"
+}
 elf_symbol {
   id: 0xcb0ffe5b
   name: "crypto_register_notifier"
@@ -352347,6 +353048,15 @@ elf_symbol {
   type_id: 0x9e955b54
   full_name: "crypto_register_shash"
 }
+elf_symbol {
+  id: 0x414b50db
+  name: "crypto_register_shashes"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x4579a957
+  type_id: 0x9f09d818
+  full_name: "crypto_register_shashes"
+}
 elf_symbol {
   id: 0xfca661a6
   name: "crypto_register_skcipher"
@@ -352356,6 +353066,15 @@ elf_symbol {
   type_id: 0x928f1946
   full_name: "crypto_register_skcipher"
 }
+elf_symbol {
+  id: 0x8a2f0da1
+  name: "crypto_register_skciphers"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1e086325
+  type_id: 0x93139a0a
+  full_name: "crypto_register_skciphers"
+}
 elf_symbol {
   id: 0x8e0112d7
   name: "crypto_register_template"
@@ -352365,6 +353084,24 @@ elf_symbol {
   type_id: 0x9a6e7c60
   full_name: "crypto_register_template"
 }
+elf_symbol {
+  id: 0x41c9668c
+  name: "crypto_register_templates"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x887cfd9b
+  type_id: 0x9bf2ff2c
+  full_name: "crypto_register_templates"
+}
+elf_symbol {
+  id: 0x205447ca
+  name: "crypto_remove_spawns"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x02da53a2
+  type_id: 0x105651c0
+  full_name: "crypto_remove_spawns"
+}
 elf_symbol {
   id: 0x0e52d725
   name: "crypto_req_done"
@@ -352374,6 +353111,15 @@ elf_symbol {
   type_id: 0x10100c3c
   full_name: "crypto_req_done"
 }
+elf_symbol {
+  id: 0xc6344bab
+  name: "crypto_rng_reset"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x9bf39d8d
+  type_id: 0x924abcc2
+  full_name: "crypto_rng_reset"
+}
 elf_symbol {
   id: 0x162a73f7
   name: "crypto_sha1_finup"
@@ -352392,6 +353138,15 @@ elf_symbol {
   type_id: 0x9fb1df6d
   full_name: "crypto_sha1_update"
 }
+elf_symbol {
+  id: 0x4ec5fd55
+  name: "crypto_shash_alg_has_setkey"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x9bfa0162
+  type_id: 0xfdb1e37f
+  full_name: "crypto_shash_alg_has_setkey"
+}
 elf_symbol {
   id: 0x91309df9
   name: "crypto_shash_digest"
@@ -352473,6 +353228,24 @@ elf_symbol {
   type_id: 0x9e7f936c
   full_name: "crypto_skcipher_setkey"
 }
+elf_symbol {
+  id: 0x8f449b37
+  name: "crypto_spawn_tfm"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa7ebc330
+  type_id: 0x8a129bb5
+  full_name: "crypto_spawn_tfm"
+}
+elf_symbol {
+  id: 0x77cf6687
+  name: "crypto_spawn_tfm2"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x9d1482f0
+  type_id: 0x56430286
+  full_name: "crypto_spawn_tfm2"
+}
 elf_symbol {
   id: 0x81600265
   name: "crypto_unregister_aead"
@@ -352545,6 +353318,15 @@ elf_symbol {
   type_id: 0x138de9e8
   full_name: "crypto_unregister_shash"
 }
+elf_symbol {
+  id: 0xc4f46672
+  name: "crypto_unregister_shashes"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x60168197
+  type_id: 0x12116aa4
+  full_name: "crypto_unregister_shashes"
+}
 elf_symbol {
   id: 0x9f75c77b
   name: "crypto_unregister_skcipher"
@@ -352554,6 +353336,15 @@ elf_symbol {
   type_id: 0x1f97abfa
   full_name: "crypto_unregister_skcipher"
 }
+elf_symbol {
+  id: 0xef41eff1
+  name: "crypto_unregister_skciphers"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x625ccc14
+  type_id: 0x1e0b28b6
+  full_name: "crypto_unregister_skciphers"
+}
 elf_symbol {
   id: 0x801e3d5d
   name: "crypto_unregister_template"
@@ -352563,6 +353354,15 @@ elf_symbol {
   type_id: 0x1776cedc
   full_name: "crypto_unregister_template"
 }
+elf_symbol {
+  id: 0x9b2d60fa
+  name: "crypto_unregister_templates"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd45dcc00
+  type_id: 0x16ea4d90
+  full_name: "crypto_unregister_templates"
+}
 elf_symbol {
   id: 0xd36400de
   name: "css_next_child"
@@ -385013,6 +385813,15 @@ elf_symbol {
   type_id: 0x9fce093a
   full_name: "rht_bucket_nested_insert"
 }
+elf_symbol {
+  id: 0x42dfffbc
+  name: "rng_is_initialized"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x3a4f9d28
+  type_id: 0xfea45b04
+  full_name: "rng_is_initialized"
+}
 elf_symbol {
   id: 0x93ee7a0f
   name: "root_device_unregister"
@@ -387857,6 +388666,24 @@ elf_symbol {
   type_id: 0x1caa303b
   full_name: "sha1_transform"
 }
+elf_symbol {
+  id: 0x84e1c494
+  name: "shash_free_singlespawn_instance"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x4a31048c
+  type_id: 0x1dae4ad4
+  full_name: "shash_free_singlespawn_instance"
+}
+elf_symbol {
+  id: 0xc2e7cb56
+  name: "shash_register_instance"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xbb0c990d
+  type_id: 0x9abd1dd4
+  full_name: "shash_register_instance"
+}
 elf_symbol {
   id: 0x7f3b48aa
   name: "shmem_file_setup"
@@ -403158,6 +403985,9 @@ interface {
   symbol_id: 0x86527a4e
   symbol_id: 0xf71b3e6c
   symbol_id: 0xc9756e19
+  symbol_id: 0x0556c9b1
+  symbol_id: 0xa3ddabd2
+  symbol_id: 0xf78be1c5
   symbol_id: 0xd0b4a794
   symbol_id: 0x33f9278c
   symbol_id: 0x2e343246
@@ -403360,6 +404190,7 @@ interface {
   symbol_id: 0xe4ec133d
   symbol_id: 0xaa3f6a65
   symbol_id: 0xa2fe718f
+  symbol_id: 0x98a943de
   symbol_id: 0x53263f73
   symbol_id: 0xe828d15b
   symbol_id: 0x4d31a413
@@ -403617,6 +404448,9 @@ interface {
   symbol_id: 0xe1489e0c
   symbol_id: 0x8f23a62a
   symbol_id: 0xf3cd7eeb
+  symbol_id: 0x58e7634f
+  symbol_id: 0x3a519484
+  symbol_id: 0x7ea1f05b
   symbol_id: 0xd7f9868e
   symbol_id: 0x37776872
   symbol_id: 0xfc735654
@@ -403819,6 +404653,7 @@ interface {
   symbol_id: 0xcfab6e83
   symbol_id: 0xd7ceb15f
   symbol_id: 0x923147c1
+  symbol_id: 0x5cfdecb8
   symbol_id: 0xd860c719
   symbol_id: 0x5b6bc3a9
   symbol_id: 0x823654f5
@@ -404049,8 +404884,10 @@ interface {
   symbol_id: 0x60b70858
   symbol_id: 0x7f488498
   symbol_id: 0x09cd7a68
+  symbol_id: 0xd8a7188c
   symbol_id: 0x294249c0
   symbol_id: 0x6a3cf7b4
+  symbol_id: 0x178de6db
   symbol_id: 0x510c7445
   symbol_id: 0xe4af6f7e
   symbol_id: 0x49029965
@@ -404667,42 +405504,66 @@ interface {
   symbol_id: 0xf8751b15
   symbol_id: 0xdd9947d5
   symbol_id: 0xff08526f
+  symbol_id: 0x5bcc3288
+  symbol_id: 0x6be7b839
   symbol_id: 0xc81e9eb3
   symbol_id: 0x237a3562
   symbol_id: 0x5d9de9a7
   symbol_id: 0x1d1f6717
   symbol_id: 0x20c19184
+  symbol_id: 0xccb689ba
   symbol_id: 0xef67fe16
   symbol_id: 0x9eca665b
   symbol_id: 0x3ea8bbd7
+  symbol_id: 0x54908709
+  symbol_id: 0x274ca92d
   symbol_id: 0xa3db58f1
+  symbol_id: 0xcbd0db1f
   symbol_id: 0x1257590d
   symbol_id: 0x833374c8
   symbol_id: 0x717034d4
   symbol_id: 0xc27e8b2f
   symbol_id: 0x3464cb44
+  symbol_id: 0xf7cc32dd
   symbol_id: 0xd04a0a9e
   symbol_id: 0x7c49856a
   symbol_id: 0xcf0e0e01
+  symbol_id: 0x807f2b6e
   symbol_id: 0xbf39e9a5
+  symbol_id: 0xa07184ca
+  symbol_id: 0x08a3daa7
+  symbol_id: 0xf83dbc28
+  symbol_id: 0x224d9b3e
+  symbol_id: 0xcb442450
   symbol_id: 0x4d4a15b0
   symbol_id: 0xfc625698
   symbol_id: 0x80e1f666
   symbol_id: 0x62173925
+  symbol_id: 0x33ee5483
+  symbol_id: 0xaca5602a
   symbol_id: 0x053cd2eb
   symbol_id: 0xd1471c13
+  symbol_id: 0x7283d4fc
   symbol_id: 0x3359f049
+  symbol_id: 0xc8a04eec
   symbol_id: 0xc60881ee
   symbol_id: 0xd9005076
+  symbol_id: 0xf18d5670
   symbol_id: 0xcb0ffe5b
   symbol_id: 0xa79ba8cc
   symbol_id: 0x23b67585
   symbol_id: 0x1e81ded9
+  symbol_id: 0x414b50db
   symbol_id: 0xfca661a6
+  symbol_id: 0x8a2f0da1
   symbol_id: 0x8e0112d7
+  symbol_id: 0x41c9668c
+  symbol_id: 0x205447ca
   symbol_id: 0x0e52d725
+  symbol_id: 0xc6344bab
   symbol_id: 0x162a73f7
   symbol_id: 0x7dcc32e4
+  symbol_id: 0x4ec5fd55
   symbol_id: 0x91309df9
   symbol_id: 0xfdca589d
   symbol_id: 0xb50ff8bd
@@ -404712,6 +405573,8 @@ interface {
   symbol_id: 0x15691536
   symbol_id: 0x403155fc
   symbol_id: 0xbb92068e
+  symbol_id: 0x8f449b37
+  symbol_id: 0x77cf6687
   symbol_id: 0x81600265
   symbol_id: 0x57a4fa38
   symbol_id: 0xdb6ddedf
@@ -404720,8 +405583,11 @@ interface {
   symbol_id: 0xeb9b8f1f
   symbol_id: 0x4d669c6d
   symbol_id: 0x6715c595
+  symbol_id: 0xc4f46672
   symbol_id: 0x9f75c77b
+  symbol_id: 0xef41eff1
   symbol_id: 0x801e3d5d
+  symbol_id: 0x9b2d60fa
   symbol_id: 0xd36400de
   symbol_id: 0x2c08983d
   symbol_id: 0x81bdacc5
@@ -408325,6 +409191,7 @@ interface {
   symbol_id: 0x7b08b3df
   symbol_id: 0x6af2dc93
   symbol_id: 0x56f4af9c
+  symbol_id: 0x42dfffbc
   symbol_id: 0x93ee7a0f
   symbol_id: 0xbd83c333
   symbol_id: 0x7d858174
@@ -408641,6 +409508,8 @@ interface {
   symbol_id: 0x12402fa7
   symbol_id: 0x0b4df89e
   symbol_id: 0x7996527c
+  symbol_id: 0x84e1c494
+  symbol_id: 0xc2e7cb56
   symbol_id: 0x7f3b48aa
   symbol_id: 0xf47010e0
   symbol_id: 0x436ee92c
diff --git a/android/abi_gki_aarch64_fips140 b/android/abi_gki_aarch64_fips140
new file mode 100644
index 000000000000..4b9e2f0ed38e
--- /dev/null
+++ b/android/abi_gki_aarch64_fips140
@@ -0,0 +1,145 @@
+[abi_symbol_list]
+# commonly used symbols
+  module_layout
+  __put_task_struct
+
+# required by fips140.ko
+  aead_register_instance
+  ahash_register_instance
+  arch_timer_read_counter
+  bcmp
+  complete_all
+  completion_done
+  cpu_have_feature
+  crypto_aead_decrypt
+  crypto_aead_encrypt
+  crypto_aead_setauthsize
+  crypto_aead_setkey
+  crypto_ahash_finup
+  crypto_ahash_setkey
+  crypto_alg_list
+  crypto_alg_sem
+  crypto_alloc_aead
+  crypto_alloc_base
+  crypto_alloc_rng
+  crypto_alloc_shash
+  crypto_alloc_skcipher
+  crypto_attr_alg_name
+  crypto_check_attr_type
+  crypto_cipher_encrypt_one
+  crypto_cipher_setkey
+  crypto_destroy_tfm
+  crypto_drop_spawn
+  crypto_get_default_null_skcipher
+  crypto_grab_aead
+  crypto_grab_ahash
+  crypto_grab_shash
+  crypto_grab_skcipher
+  crypto_grab_spawn
+  crypto_inst_setname
+  crypto_put_default_null_skcipher
+  crypto_register_aead
+  crypto_register_aeads
+  crypto_register_ahash
+  crypto_register_ahashes
+  crypto_register_alg
+  crypto_register_algs
+  crypto_register_rng
+  crypto_register_rngs
+  crypto_register_shash
+  crypto_register_shashes
+  crypto_register_skcipher
+  crypto_register_skciphers
+  crypto_register_template
+  crypto_register_templates
+  crypto_remove_spawns
+  crypto_req_done
+  crypto_rng_reset
+  crypto_shash_alg_has_setkey
+  crypto_shash_digest
+  crypto_shash_final
+  crypto_shash_finup
+  crypto_shash_setkey
+  crypto_shash_tfm_digest
+  crypto_shash_update
+  crypto_skcipher_decrypt
+  crypto_skcipher_encrypt
+  crypto_skcipher_setkey
+  crypto_spawn_tfm
+  crypto_spawn_tfm2
+  crypto_unregister_aead
+  crypto_unregister_alg
+  crypto_unregister_rng
+  crypto_unregister_rngs
+  crypto_unregister_shash
+  crypto_unregister_shashes
+  crypto_unregister_skciphers
+  crypto_unregister_template
+  crypto_unregister_templates
+  down_write
+  fortify_panic
+  fpsimd_context_busy
+  get_random_bytes
+  __init_swait_queue_head
+  irq_stat
+  jiffies
+  kasan_flag_enabled
+  kernel_neon_begin
+  kernel_neon_end
+  kfree
+  kfree_sensitive
+  __kmalloc
+  kmalloc_caches
+  kmalloc_trace
+  kmemdup
+  ktime_get
+  __list_add_valid
+  __list_del_entry_valid
+  memcpy
+  memset
+  __mutex_init
+  mutex_lock
+  mutex_unlock
+  panic
+  preempt_schedule
+  preempt_schedule_notrace
+  _printk
+  ___ratelimit
+  _raw_spin_lock
+  _raw_spin_unlock
+  refcount_warn_saturate
+  rng_is_initialized
+  scatterwalk_ffwd
+  scatterwalk_map_and_copy
+  sg_init_one
+  sg_init_table
+  sg_next
+  shash_free_singlespawn_instance
+  shash_register_instance
+  skcipher_alloc_instance_simple
+  skcipher_register_instance
+  skcipher_walk_aead_decrypt
+  skcipher_walk_aead_encrypt
+  skcipher_walk_done
+  skcipher_walk_virt
+  snprintf
+  __stack_chk_fail
+  strcmp
+  strlcat
+  strlen
+  strncmp
+  strnlen
+  strscpy
+  __traceiter_android_vh_aes_decrypt
+  __traceiter_android_vh_aes_encrypt
+  __traceiter_android_vh_aes_expandkey
+  __traceiter_android_vh_sha256
+  __tracepoint_android_vh_aes_decrypt
+  __tracepoint_android_vh_aes_encrypt
+  __tracepoint_android_vh_aes_expandkey
+  __tracepoint_android_vh_sha256
+  tracepoint_probe_register
+  up_write
+  wait_for_completion
+  xa_load
+  xa_store