diff --git a/33/64/arm/source-based/libcrypto.so.lsdump b/33/64/arm/source-based/libcrypto.so.lsdump
index 3a80c42..d38f947 100644
--- a/33/64/arm/source-based/libcrypto.so.lsdump
+++ b/33/64/arm/source-based/libcrypto.so.lsdump
@@ -3668,12 +3668,21 @@
    "name" : "FIPS_mode_set"
   },
   {
+   "name" : "FIPS_module_name"
+  },
+  {
    "name" : "FIPS_query_algorithm_status"
   },
   {
    "name" : "FIPS_read_counter"
   },
   {
+   "name" : "FIPS_service_indicator_after_call"
+  },
+  {
+   "name" : "FIPS_service_indicator_before_call"
+  },
+  {
    "name" : "FIPS_version"
   },
   {
@@ -5099,12 +5108,6 @@
    "name" : "X509_CRL_INFO_new"
   },
   {
-   "name" : "X509_CRL_METHOD_free"
-  },
-  {
-   "name" : "X509_CRL_METHOD_new"
-  },
-  {
    "name" : "X509_CRL_add0_revoked"
   },
   {
@@ -5180,9 +5183,6 @@
    "name" : "X509_CRL_get_lastUpdate"
   },
   {
-   "name" : "X509_CRL_get_meth_data"
-  },
-  {
    "name" : "X509_CRL_get_nextUpdate"
   },
   {
@@ -5216,15 +5216,9 @@
    "name" : "X509_CRL_set1_signature_value"
   },
   {
-   "name" : "X509_CRL_set_default_method"
-  },
-  {
    "name" : "X509_CRL_set_issuer_name"
   },
   {
-   "name" : "X509_CRL_set_meth_data"
-  },
-  {
    "name" : "X509_CRL_set_version"
   },
   {
@@ -6392,9 +6386,6 @@
    "name" : "X509_time_adj_ex"
   },
   {
-   "name" : "X509_to_X509_REQ"
-  },
-  {
    "name" : "X509_trust_clear"
   },
   {
@@ -8221,63 +8212,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stE",
-   "name" : "int (X509_crl_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (X509_crl_st *, evp_pkey_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPP15x509_revoked_st"
-    },
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIP12X509_name_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP13x509_trust_stP7x509_stiE",
    "name" : "int (x509_trust_st *, x509_st *, int)",
    "parameters" :
@@ -9546,30 +9480,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "AES_CMAC",
-   "linker_set_key" : "AES_CMAC",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "ASN1_BIT_STRING_check",
    "linker_set_key" : "ASN1_BIT_STRING_check",
    "parameters" :
@@ -14490,111 +14400,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "CMAC_CTX_copy",
-   "linker_set_key" : "CMAC_CTX_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_free",
-   "linker_set_key" : "CMAC_CTX_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_new",
-   "linker_set_key" : "CMAC_CTX_new",
-   "return_type" : "_ZTIP11cmac_ctx_st",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Final",
-   "linker_set_key" : "CMAC_Final",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Init",
-   "linker_set_key" : "CMAC_Init",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK13evp_cipher_st"
-    },
-    {
-     "referenced_type" : "_ZTIP9engine_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Reset",
-   "linker_set_key" : "CMAC_Reset",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Update",
-   "linker_set_key" : "CMAC_Update",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "CONF_modules_free",
    "linker_set_key" : "CONF_modules_free",
    "return_type" : "_ZTIv",
@@ -18314,7 +18119,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -18581,7 +18386,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18629,7 +18434,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18917,7 +18722,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -19287,18 +19092,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -25533,39 +25326,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_METHOD_free",
-   "linker_set_key" : "X509_CRL_METHOD_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "function_name" : "X509_CRL_METHOD_new",
-   "linker_set_key" : "X509_CRL_METHOD_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE"
-    }
-   ],
-   "return_type" : "_ZTIP18x509_crl_method_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_add0_revoked",
    "linker_set_key" : "X509_CRL_add0_revoked",
    "parameters" :
@@ -25968,18 +25728,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_get_meth_data",
-   "linker_set_key" : "X509_CRL_get_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_get_nextUpdate",
    "linker_set_key" : "X509_CRL_get_nextUpdate",
    "parameters" :
@@ -26130,18 +25878,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_default_method",
-   "linker_set_key" : "X509_CRL_set_default_method",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_issuer_name",
    "linker_set_key" : "X509_CRL_set_issuer_name",
    "parameters" :
@@ -26157,21 +25893,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_meth_data",
-   "linker_set_key" : "X509_CRL_set_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_version",
    "linker_set_key" : "X509_CRL_set_version",
    "parameters" :
@@ -31788,24 +31509,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_to_X509_REQ",
-   "linker_set_key" : "X509_to_X509_REQ",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7x509_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK9env_md_st"
-    }
-   ],
-   "return_type" : "_ZTIP11X509_req_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_trust_clear",
    "linker_set_key" : "X509_trust_clear",
    "parameters" :
@@ -37331,15 +37034,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP11cmac_ctx_st",
-   "name" : "cmac_ctx_st *",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIP11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP11ec_group_st",
    "name" : "ec_group_st *",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -37979,15 +37673,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -38452,7 +38137,7 @@
    "referenced_type" : "_ZTI9engine_st",
    "self_type" : "_ZTIP9engine_st",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
+   "source_file" : "external/boringssl/src/include/openssl/engine.h"
   },
   {
    "alignment" : 4,
@@ -38609,33 +38294,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stE",
-   "name" : "int (*)(X509_crl_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (*)(X509_crl_st *, evp_pkey_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (*)(X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP13x509_trust_stP7x509_stiE",
    "name" : "int (*)(x509_trust_st *, x509_st *, int)",
    "referenced_type" : "_ZTIFiP13x509_trust_stP7x509_stiE",
@@ -39212,15 +38870,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st *",
-   "referenced_type" : "_ZTIK11cmac_ctx_st",
-   "self_type" : "_ZTIPK11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK11ec_group_st",
    "name" : "const ec_group_st *",
    "referenced_type" : "_ZTIK11ec_group_st",
@@ -39277,24 +38926,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/asn1/a_mbstr.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/asn1/tasn_dec.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st",
    "size" : 4,
@@ -39313,6 +38944,33 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509/x509_ext.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv7-a-neon_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
    "size" : 4,
@@ -39698,15 +39356,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st *",
-   "referenced_type" : "_ZTIK18x509_crl_method_st",
-   "self_type" : "_ZTIPK18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st *",
    "referenced_type" : "_ZTIK19X509_POLICY_NODE_st",
@@ -40787,7 +40436,7 @@
    "name" : "const X509_crl_st",
    "referenced_type" : "_ZTI11X509_crl_st",
    "self_type" : "_ZTIK11X509_crl_st",
-   "size" : 88,
+   "size" : 80,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
@@ -40813,16 +40462,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIK11cmac_ctx_st",
-   "size" : 184,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK11ec_group_st",
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -41279,16 +40918,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIK18x509_crl_method_st",
-   "size" : 20,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st",
    "referenced_type" : "_ZTI19X509_POLICY_NODE_st",
@@ -41842,47 +41471,6 @@
    "fields" :
    [
     {
-     "field_name" : "valid",
-     "referenced_type" : "_ZTIc"
-    },
-    {
-     "field_name" : "ret",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "plen",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "field_name" : "ptag",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "pclass",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "hdrlen",
-     "field_offset" : 160,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_TLC_st",
-   "name" : "ASN1_TLC_st",
-   "referenced_type" : "_ZTI11ASN1_TLC_st",
-   "self_type" : "_ZTI11ASN1_TLC_st",
-   "size" : 24,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "arg",
      "referenced_type" : "_ZTIPv"
     },
diff --git a/33/64/arm/source-based/libssl.so.lsdump b/33/64/arm/source-based/libssl.so.lsdump
index bfd411e..ff6f8eb 100644
--- a/33/64/arm/source-based/libssl.so.lsdump
+++ b/33/64/arm/source-based/libssl.so.lsdump
@@ -893,6 +893,9 @@
    "name" : "SSL_CTX_set_next_protos_advertised_cb"
   },
   {
+   "name" : "SSL_CTX_set_num_tickets"
+  },
+  {
    "name" : "SSL_CTX_set_ocsp_response"
   },
   {
@@ -8103,6 +8106,21 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CTX_set_num_tickets",
+   "linker_set_key" : "SSL_CTX_set_num_tickets",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10ssl_ctx_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CTX_set_ocsp_response",
    "linker_set_key" : "SSL_CTX_set_ocsp_response",
    "parameters" :
@@ -14810,15 +14828,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -19322,7 +19331,7 @@
    "name" : "const ssl_ctx_st",
    "referenced_type" : "_ZTI10ssl_ctx_st",
    "self_type" : "_ZTIK10ssl_ctx_st",
-   "size" : 332,
+   "size" : 336,
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
@@ -24691,20 +24700,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "name" : "bssl::internal::DeleterImpl<X509_CRL_METHOD>",
-   "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "self_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h",
-   "template_args" :
-   [
-    "_ZTI18x509_crl_method_st",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
    "name" : "bssl::internal::DeleterImpl<NAME_CONSTRAINTS>",
    "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
diff --git a/33/64/arm64/source-based/libcrypto.so.lsdump b/33/64/arm64/source-based/libcrypto.so.lsdump
index ee07b39..777777a 100644
--- a/33/64/arm64/source-based/libcrypto.so.lsdump
+++ b/33/64/arm64/source-based/libcrypto.so.lsdump
@@ -3690,12 +3690,21 @@
    "name" : "FIPS_mode_set"
   },
   {
+   "name" : "FIPS_module_name"
+  },
+  {
    "name" : "FIPS_query_algorithm_status"
   },
   {
    "name" : "FIPS_read_counter"
   },
   {
+   "name" : "FIPS_service_indicator_after_call"
+  },
+  {
+   "name" : "FIPS_service_indicator_before_call"
+  },
+  {
    "name" : "FIPS_version"
   },
   {
@@ -5121,12 +5130,6 @@
    "name" : "X509_CRL_INFO_new"
   },
   {
-   "name" : "X509_CRL_METHOD_free"
-  },
-  {
-   "name" : "X509_CRL_METHOD_new"
-  },
-  {
    "name" : "X509_CRL_add0_revoked"
   },
   {
@@ -5202,9 +5205,6 @@
    "name" : "X509_CRL_get_lastUpdate"
   },
   {
-   "name" : "X509_CRL_get_meth_data"
-  },
-  {
    "name" : "X509_CRL_get_nextUpdate"
   },
   {
@@ -5238,15 +5238,9 @@
    "name" : "X509_CRL_set1_signature_value"
   },
   {
-   "name" : "X509_CRL_set_default_method"
-  },
-  {
    "name" : "X509_CRL_set_issuer_name"
   },
   {
-   "name" : "X509_CRL_set_meth_data"
-  },
-  {
    "name" : "X509_CRL_set_version"
   },
   {
@@ -6414,9 +6408,6 @@
    "name" : "X509_time_adj_ex"
   },
   {
-   "name" : "X509_to_X509_REQ"
-  },
-  {
    "name" : "X509_trust_clear"
   },
   {
@@ -8243,63 +8234,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stE",
-   "name" : "int (X509_crl_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (X509_crl_st *, evp_pkey_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPP15x509_revoked_st"
-    },
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIP12X509_name_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP13x509_trust_stP7x509_stiE",
    "name" : "int (x509_trust_st *, x509_st *, int)",
    "parameters" :
@@ -9568,30 +9502,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "AES_CMAC",
-   "linker_set_key" : "AES_CMAC",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "ASN1_BIT_STRING_check",
    "linker_set_key" : "ASN1_BIT_STRING_check",
    "parameters" :
@@ -14512,111 +14422,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "CMAC_CTX_copy",
-   "linker_set_key" : "CMAC_CTX_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_free",
-   "linker_set_key" : "CMAC_CTX_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_new",
-   "linker_set_key" : "CMAC_CTX_new",
-   "return_type" : "_ZTIP11cmac_ctx_st",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Final",
-   "linker_set_key" : "CMAC_Final",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Init",
-   "linker_set_key" : "CMAC_Init",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPK13evp_cipher_st"
-    },
-    {
-     "referenced_type" : "_ZTIP9engine_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Reset",
-   "linker_set_key" : "CMAC_Reset",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Update",
-   "linker_set_key" : "CMAC_Update",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "CONF_modules_free",
    "linker_set_key" : "CONF_modules_free",
    "return_type" : "_ZTIv",
@@ -18324,7 +18129,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -18591,7 +18396,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18639,7 +18444,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18927,7 +18732,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -19297,18 +19102,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -25543,39 +25336,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_METHOD_free",
-   "linker_set_key" : "X509_CRL_METHOD_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "function_name" : "X509_CRL_METHOD_new",
-   "linker_set_key" : "X509_CRL_METHOD_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE"
-    }
-   ],
-   "return_type" : "_ZTIP18x509_crl_method_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_add0_revoked",
    "linker_set_key" : "X509_CRL_add0_revoked",
    "parameters" :
@@ -25978,18 +25738,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_get_meth_data",
-   "linker_set_key" : "X509_CRL_get_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_get_nextUpdate",
    "linker_set_key" : "X509_CRL_get_nextUpdate",
    "parameters" :
@@ -26140,18 +25888,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_default_method",
-   "linker_set_key" : "X509_CRL_set_default_method",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_issuer_name",
    "linker_set_key" : "X509_CRL_set_issuer_name",
    "parameters" :
@@ -26167,21 +25903,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_meth_data",
-   "linker_set_key" : "X509_CRL_set_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_version",
    "linker_set_key" : "X509_CRL_set_version",
    "parameters" :
@@ -31798,24 +31519,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_to_X509_REQ",
-   "linker_set_key" : "X509_to_X509_REQ",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7x509_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK9env_md_st"
-    }
-   ],
-   "return_type" : "_ZTIP11X509_req_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_trust_clear",
    "linker_set_key" : "X509_trust_clear",
    "parameters" :
@@ -37341,15 +37044,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP11cmac_ctx_st",
-   "name" : "cmac_ctx_st *",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIP11cmac_ctx_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP11ec_group_st",
    "name" : "ec_group_st *",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -37989,15 +37683,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -38462,7 +38147,7 @@
    "referenced_type" : "_ZTI9engine_st",
    "self_type" : "_ZTIP9engine_st",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
+   "source_file" : "external/boringssl/src/include/openssl/engine.h"
   },
   {
    "alignment" : 8,
@@ -38619,33 +38304,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stE",
-   "name" : "int (*)(X509_crl_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (*)(X509_crl_st *, evp_pkey_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (*)(X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP13x509_trust_stP7x509_stiE",
    "name" : "int (*)(x509_trust_st *, x509_st *, int)",
    "referenced_type" : "_ZTIFiP13x509_trust_stP7x509_stiE",
@@ -39222,15 +38880,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st *",
-   "referenced_type" : "_ZTIK11cmac_ctx_st",
-   "self_type" : "_ZTIPK11cmac_ctx_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK11ec_group_st",
    "name" : "const ec_group_st *",
    "referenced_type" : "_ZTIK11ec_group_st",
@@ -39287,24 +38936,6 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/asn1/a_mbstr.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/asn1/tasn_dec.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st",
    "size" : 8,
@@ -39323,6 +38954,33 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509/x509_ext.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm64_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
    "size" : 8,
@@ -39708,15 +39366,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st *",
-   "referenced_type" : "_ZTIK18x509_crl_method_st",
-   "self_type" : "_ZTIPK18x509_crl_method_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st *",
    "referenced_type" : "_ZTIK19X509_POLICY_NODE_st",
@@ -40779,7 +40428,7 @@
    "name" : "const X509_crl_st",
    "referenced_type" : "_ZTI11X509_crl_st",
    "self_type" : "_ZTIK11X509_crl_st",
-   "size" : 128,
+   "size" : 112,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
@@ -40805,16 +40454,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIK11cmac_ctx_st",
-   "size" : 200,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK11ec_group_st",
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -41271,16 +40910,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIK18x509_crl_method_st",
-   "size" : 40,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st",
    "referenced_type" : "_ZTI19X509_POLICY_NODE_st",
@@ -41834,47 +41463,6 @@
    "fields" :
    [
     {
-     "field_name" : "valid",
-     "referenced_type" : "_ZTIc"
-    },
-    {
-     "field_name" : "ret",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "plen",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "field_name" : "ptag",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "pclass",
-     "field_offset" : 160,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "hdrlen",
-     "field_offset" : 192,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_TLC_st",
-   "name" : "ASN1_TLC_st",
-   "referenced_type" : "_ZTI11ASN1_TLC_st",
-   "self_type" : "_ZTI11ASN1_TLC_st",
-   "size" : 32,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
      "field_name" : "arg",
      "referenced_type" : "_ZTIPv"
     },
diff --git a/33/64/arm64/source-based/libssl.so.lsdump b/33/64/arm64/source-based/libssl.so.lsdump
index ad9e653..2e47e28 100644
--- a/33/64/arm64/source-based/libssl.so.lsdump
+++ b/33/64/arm64/source-based/libssl.so.lsdump
@@ -912,6 +912,9 @@
    "name" : "SSL_CTX_set_next_protos_advertised_cb"
   },
   {
+   "name" : "SSL_CTX_set_num_tickets"
+  },
+  {
    "name" : "SSL_CTX_set_ocsp_response"
   },
   {
@@ -8122,6 +8125,21 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CTX_set_num_tickets",
+   "linker_set_key" : "SSL_CTX_set_num_tickets",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10ssl_ctx_st"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CTX_set_ocsp_response",
    "linker_set_key" : "SSL_CTX_set_ocsp_response",
    "parameters" :
@@ -14829,15 +14847,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -24719,20 +24728,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "name" : "bssl::internal::DeleterImpl<X509_CRL_METHOD>",
-   "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "self_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h",
-   "template_args" :
-   [
-    "_ZTI18x509_crl_method_st",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
    "name" : "bssl::internal::DeleterImpl<NAME_CONSTRAINTS>",
    "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
diff --git a/33/64/arm_arm64/source-based/libcrypto.so.lsdump b/33/64/arm_arm64/source-based/libcrypto.so.lsdump
index 8e4bc56..51c6329 100644
--- a/33/64/arm_arm64/source-based/libcrypto.so.lsdump
+++ b/33/64/arm_arm64/source-based/libcrypto.so.lsdump
@@ -3668,12 +3668,21 @@
    "name" : "FIPS_mode_set"
   },
   {
+   "name" : "FIPS_module_name"
+  },
+  {
    "name" : "FIPS_query_algorithm_status"
   },
   {
    "name" : "FIPS_read_counter"
   },
   {
+   "name" : "FIPS_service_indicator_after_call"
+  },
+  {
+   "name" : "FIPS_service_indicator_before_call"
+  },
+  {
    "name" : "FIPS_version"
   },
   {
@@ -5099,12 +5108,6 @@
    "name" : "X509_CRL_INFO_new"
   },
   {
-   "name" : "X509_CRL_METHOD_free"
-  },
-  {
-   "name" : "X509_CRL_METHOD_new"
-  },
-  {
    "name" : "X509_CRL_add0_revoked"
   },
   {
@@ -5180,9 +5183,6 @@
    "name" : "X509_CRL_get_lastUpdate"
   },
   {
-   "name" : "X509_CRL_get_meth_data"
-  },
-  {
    "name" : "X509_CRL_get_nextUpdate"
   },
   {
@@ -5216,15 +5216,9 @@
    "name" : "X509_CRL_set1_signature_value"
   },
   {
-   "name" : "X509_CRL_set_default_method"
-  },
-  {
    "name" : "X509_CRL_set_issuer_name"
   },
   {
-   "name" : "X509_CRL_set_meth_data"
-  },
-  {
    "name" : "X509_CRL_set_version"
   },
   {
@@ -6392,9 +6386,6 @@
    "name" : "X509_time_adj_ex"
   },
   {
-   "name" : "X509_to_X509_REQ"
-  },
-  {
    "name" : "X509_trust_clear"
   },
   {
@@ -8221,63 +8212,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stE",
-   "name" : "int (X509_crl_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (X509_crl_st *, evp_pkey_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPP15x509_revoked_st"
-    },
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIP12X509_name_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP13x509_trust_stP7x509_stiE",
    "name" : "int (x509_trust_st *, x509_st *, int)",
    "parameters" :
@@ -9546,30 +9480,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "AES_CMAC",
-   "linker_set_key" : "AES_CMAC",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "ASN1_BIT_STRING_check",
    "linker_set_key" : "ASN1_BIT_STRING_check",
    "parameters" :
@@ -14490,111 +14400,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "CMAC_CTX_copy",
-   "linker_set_key" : "CMAC_CTX_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_free",
-   "linker_set_key" : "CMAC_CTX_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_new",
-   "linker_set_key" : "CMAC_CTX_new",
-   "return_type" : "_ZTIP11cmac_ctx_st",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Final",
-   "linker_set_key" : "CMAC_Final",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Init",
-   "linker_set_key" : "CMAC_Init",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK13evp_cipher_st"
-    },
-    {
-     "referenced_type" : "_ZTIP9engine_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Reset",
-   "linker_set_key" : "CMAC_Reset",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Update",
-   "linker_set_key" : "CMAC_Update",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "CONF_modules_free",
    "linker_set_key" : "CONF_modules_free",
    "return_type" : "_ZTIv",
@@ -18314,7 +18119,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -18581,7 +18386,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18629,7 +18434,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18917,7 +18722,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -19287,18 +19092,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -25533,39 +25326,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_METHOD_free",
-   "linker_set_key" : "X509_CRL_METHOD_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "function_name" : "X509_CRL_METHOD_new",
-   "linker_set_key" : "X509_CRL_METHOD_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE"
-    }
-   ],
-   "return_type" : "_ZTIP18x509_crl_method_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_add0_revoked",
    "linker_set_key" : "X509_CRL_add0_revoked",
    "parameters" :
@@ -25968,18 +25728,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_get_meth_data",
-   "linker_set_key" : "X509_CRL_get_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_get_nextUpdate",
    "linker_set_key" : "X509_CRL_get_nextUpdate",
    "parameters" :
@@ -26130,18 +25878,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_default_method",
-   "linker_set_key" : "X509_CRL_set_default_method",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_issuer_name",
    "linker_set_key" : "X509_CRL_set_issuer_name",
    "parameters" :
@@ -26157,21 +25893,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_meth_data",
-   "linker_set_key" : "X509_CRL_set_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_version",
    "linker_set_key" : "X509_CRL_set_version",
    "parameters" :
@@ -31788,24 +31509,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_to_X509_REQ",
-   "linker_set_key" : "X509_to_X509_REQ",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7x509_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK9env_md_st"
-    }
-   ],
-   "return_type" : "_ZTIP11X509_req_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_trust_clear",
    "linker_set_key" : "X509_trust_clear",
    "parameters" :
@@ -37331,15 +37034,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP11cmac_ctx_st",
-   "name" : "cmac_ctx_st *",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIP11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP11ec_group_st",
    "name" : "ec_group_st *",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -37979,15 +37673,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -38452,7 +38137,7 @@
    "referenced_type" : "_ZTI9engine_st",
    "self_type" : "_ZTIP9engine_st",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
+   "source_file" : "external/boringssl/src/include/openssl/engine.h"
   },
   {
    "alignment" : 4,
@@ -38609,33 +38294,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stE",
-   "name" : "int (*)(X509_crl_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (*)(X509_crl_st *, evp_pkey_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (*)(X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP13x509_trust_stP7x509_stiE",
    "name" : "int (*)(x509_trust_st *, x509_st *, int)",
    "referenced_type" : "_ZTIFiP13x509_trust_stP7x509_stiE",
@@ -39212,15 +38870,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st *",
-   "referenced_type" : "_ZTIK11cmac_ctx_st",
-   "self_type" : "_ZTIPK11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK11ec_group_st",
    "name" : "const ec_group_st *",
    "referenced_type" : "_ZTIK11ec_group_st",
@@ -39277,24 +38926,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/asn1/a_mbstr.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/asn1/tasn_dec.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st",
    "size" : 4,
@@ -39313,6 +38944,33 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509/x509_ext.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_arm_armv8-a_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
    "size" : 4,
@@ -39698,15 +39356,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st *",
-   "referenced_type" : "_ZTIK18x509_crl_method_st",
-   "self_type" : "_ZTIPK18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st *",
    "referenced_type" : "_ZTIK19X509_POLICY_NODE_st",
@@ -40787,7 +40436,7 @@
    "name" : "const X509_crl_st",
    "referenced_type" : "_ZTI11X509_crl_st",
    "self_type" : "_ZTIK11X509_crl_st",
-   "size" : 88,
+   "size" : 80,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
@@ -40813,16 +40462,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIK11cmac_ctx_st",
-   "size" : 184,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK11ec_group_st",
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -41279,16 +40918,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIK18x509_crl_method_st",
-   "size" : 20,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st",
    "referenced_type" : "_ZTI19X509_POLICY_NODE_st",
@@ -41842,47 +41471,6 @@
    "fields" :
    [
     {
-     "field_name" : "valid",
-     "referenced_type" : "_ZTIc"
-    },
-    {
-     "field_name" : "ret",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "plen",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "field_name" : "ptag",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "pclass",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "hdrlen",
-     "field_offset" : 160,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_TLC_st",
-   "name" : "ASN1_TLC_st",
-   "referenced_type" : "_ZTI11ASN1_TLC_st",
-   "self_type" : "_ZTI11ASN1_TLC_st",
-   "size" : 24,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "arg",
      "referenced_type" : "_ZTIPv"
     },
diff --git a/33/64/arm_arm64/source-based/libssl.so.lsdump b/33/64/arm_arm64/source-based/libssl.so.lsdump
index bfd411e..ff6f8eb 100644
--- a/33/64/arm_arm64/source-based/libssl.so.lsdump
+++ b/33/64/arm_arm64/source-based/libssl.so.lsdump
@@ -893,6 +893,9 @@
    "name" : "SSL_CTX_set_next_protos_advertised_cb"
   },
   {
+   "name" : "SSL_CTX_set_num_tickets"
+  },
+  {
    "name" : "SSL_CTX_set_ocsp_response"
   },
   {
@@ -8103,6 +8106,21 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CTX_set_num_tickets",
+   "linker_set_key" : "SSL_CTX_set_num_tickets",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10ssl_ctx_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CTX_set_ocsp_response",
    "linker_set_key" : "SSL_CTX_set_ocsp_response",
    "parameters" :
@@ -14810,15 +14828,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -19322,7 +19331,7 @@
    "name" : "const ssl_ctx_st",
    "referenced_type" : "_ZTI10ssl_ctx_st",
    "self_type" : "_ZTIK10ssl_ctx_st",
-   "size" : 332,
+   "size" : 336,
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
@@ -24691,20 +24700,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "name" : "bssl::internal::DeleterImpl<X509_CRL_METHOD>",
-   "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "self_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h",
-   "template_args" :
-   [
-    "_ZTI18x509_crl_method_st",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
    "name" : "bssl::internal::DeleterImpl<NAME_CONSTRAINTS>",
    "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
diff --git a/33/64/x86/source-based/libcrypto.so.lsdump b/33/64/x86/source-based/libcrypto.so.lsdump
index 4029c68..898ac65 100644
--- a/33/64/x86/source-based/libcrypto.so.lsdump
+++ b/33/64/x86/source-based/libcrypto.so.lsdump
@@ -3657,12 +3657,21 @@
    "name" : "FIPS_mode_set"
   },
   {
+   "name" : "FIPS_module_name"
+  },
+  {
    "name" : "FIPS_query_algorithm_status"
   },
   {
    "name" : "FIPS_read_counter"
   },
   {
+   "name" : "FIPS_service_indicator_after_call"
+  },
+  {
+   "name" : "FIPS_service_indicator_before_call"
+  },
+  {
    "name" : "FIPS_version"
   },
   {
@@ -5085,12 +5094,6 @@
    "name" : "X509_CRL_INFO_new"
   },
   {
-   "name" : "X509_CRL_METHOD_free"
-  },
-  {
-   "name" : "X509_CRL_METHOD_new"
-  },
-  {
    "name" : "X509_CRL_add0_revoked"
   },
   {
@@ -5166,9 +5169,6 @@
    "name" : "X509_CRL_get_lastUpdate"
   },
   {
-   "name" : "X509_CRL_get_meth_data"
-  },
-  {
    "name" : "X509_CRL_get_nextUpdate"
   },
   {
@@ -5202,15 +5202,9 @@
    "name" : "X509_CRL_set1_signature_value"
   },
   {
-   "name" : "X509_CRL_set_default_method"
-  },
-  {
    "name" : "X509_CRL_set_issuer_name"
   },
   {
-   "name" : "X509_CRL_set_meth_data"
-  },
-  {
    "name" : "X509_CRL_set_version"
   },
   {
@@ -6378,9 +6372,6 @@
    "name" : "X509_time_adj_ex"
   },
   {
-   "name" : "X509_to_X509_REQ"
-  },
-  {
    "name" : "X509_trust_clear"
   },
   {
@@ -8207,63 +8198,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stE",
-   "name" : "int (X509_crl_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (X509_crl_st *, evp_pkey_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPP15x509_revoked_st"
-    },
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIP12X509_name_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP13x509_trust_stP7x509_stiE",
    "name" : "int (x509_trust_st *, x509_st *, int)",
    "parameters" :
@@ -9532,30 +9466,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "AES_CMAC",
-   "linker_set_key" : "AES_CMAC",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "ASN1_BIT_STRING_check",
    "linker_set_key" : "ASN1_BIT_STRING_check",
    "parameters" :
@@ -14476,111 +14386,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "CMAC_CTX_copy",
-   "linker_set_key" : "CMAC_CTX_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_free",
-   "linker_set_key" : "CMAC_CTX_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_new",
-   "linker_set_key" : "CMAC_CTX_new",
-   "return_type" : "_ZTIP11cmac_ctx_st",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Final",
-   "linker_set_key" : "CMAC_Final",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Init",
-   "linker_set_key" : "CMAC_Init",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK13evp_cipher_st"
-    },
-    {
-     "referenced_type" : "_ZTIP9engine_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Reset",
-   "linker_set_key" : "CMAC_Reset",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Update",
-   "linker_set_key" : "CMAC_Update",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "CONF_modules_free",
    "linker_set_key" : "CONF_modules_free",
    "return_type" : "_ZTIv",
@@ -18288,7 +18093,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -18555,7 +18360,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18603,7 +18408,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18891,7 +18696,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -19261,18 +19066,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -25507,39 +25300,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_METHOD_free",
-   "linker_set_key" : "X509_CRL_METHOD_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "function_name" : "X509_CRL_METHOD_new",
-   "linker_set_key" : "X509_CRL_METHOD_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE"
-    }
-   ],
-   "return_type" : "_ZTIP18x509_crl_method_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_add0_revoked",
    "linker_set_key" : "X509_CRL_add0_revoked",
    "parameters" :
@@ -25942,18 +25702,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_get_meth_data",
-   "linker_set_key" : "X509_CRL_get_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_get_nextUpdate",
    "linker_set_key" : "X509_CRL_get_nextUpdate",
    "parameters" :
@@ -26104,18 +25852,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_default_method",
-   "linker_set_key" : "X509_CRL_set_default_method",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_issuer_name",
    "linker_set_key" : "X509_CRL_set_issuer_name",
    "parameters" :
@@ -26131,21 +25867,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_meth_data",
-   "linker_set_key" : "X509_CRL_set_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_version",
    "linker_set_key" : "X509_CRL_set_version",
    "parameters" :
@@ -31762,24 +31483,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_to_X509_REQ",
-   "linker_set_key" : "X509_to_X509_REQ",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7x509_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK9env_md_st"
-    }
-   ],
-   "return_type" : "_ZTIP11X509_req_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_trust_clear",
    "linker_set_key" : "X509_trust_clear",
    "parameters" :
@@ -37305,15 +37008,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP11cmac_ctx_st",
-   "name" : "cmac_ctx_st *",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIP11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP11ec_group_st",
    "name" : "ec_group_st *",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -37953,15 +37647,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -38426,7 +38111,7 @@
    "referenced_type" : "_ZTI9engine_st",
    "self_type" : "_ZTIP9engine_st",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
+   "source_file" : "external/boringssl/src/include/openssl/engine.h"
   },
   {
    "alignment" : 4,
@@ -38583,33 +38268,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stE",
-   "name" : "int (*)(X509_crl_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (*)(X509_crl_st *, evp_pkey_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (*)(X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP13x509_trust_stP7x509_stiE",
    "name" : "int (*)(x509_trust_st *, x509_st *, int)",
    "referenced_type" : "_ZTIFiP13x509_trust_stP7x509_stiE",
@@ -39186,15 +38844,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st *",
-   "referenced_type" : "_ZTIK11cmac_ctx_st",
-   "self_type" : "_ZTIPK11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK11ec_group_st",
    "name" : "const ec_group_st *",
    "referenced_type" : "_ZTIK11ec_group_st",
@@ -39251,24 +38900,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/asn1/a_mbstr.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/asn1/tasn_dec.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st",
    "size" : 4,
@@ -39287,6 +38918,33 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509/x509_ext.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
    "size" : 4,
@@ -39672,15 +39330,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st *",
-   "referenced_type" : "_ZTIK18x509_crl_method_st",
-   "self_type" : "_ZTIPK18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st *",
    "referenced_type" : "_ZTIK19X509_POLICY_NODE_st",
@@ -40761,7 +40410,7 @@
    "name" : "const X509_crl_st",
    "referenced_type" : "_ZTI11X509_crl_st",
    "self_type" : "_ZTIK11X509_crl_st",
-   "size" : 88,
+   "size" : 80,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
@@ -40787,16 +40436,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIK11cmac_ctx_st",
-   "size" : 184,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK11ec_group_st",
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -41253,16 +40892,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIK18x509_crl_method_st",
-   "size" : 20,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st",
    "referenced_type" : "_ZTI19X509_POLICY_NODE_st",
@@ -41816,47 +41445,6 @@
    "fields" :
    [
     {
-     "field_name" : "valid",
-     "referenced_type" : "_ZTIc"
-    },
-    {
-     "field_name" : "ret",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "plen",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "field_name" : "ptag",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "pclass",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "hdrlen",
-     "field_offset" : 160,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_TLC_st",
-   "name" : "ASN1_TLC_st",
-   "referenced_type" : "_ZTI11ASN1_TLC_st",
-   "self_type" : "_ZTI11ASN1_TLC_st",
-   "size" : 24,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "arg",
      "referenced_type" : "_ZTIPv"
     },
diff --git a/33/64/x86/source-based/libssl.so.lsdump b/33/64/x86/source-based/libssl.so.lsdump
index 0502d83..b30c1de 100644
--- a/33/64/x86/source-based/libssl.so.lsdump
+++ b/33/64/x86/source-based/libssl.so.lsdump
@@ -891,6 +891,9 @@
    "name" : "SSL_CTX_set_next_protos_advertised_cb"
   },
   {
+   "name" : "SSL_CTX_set_num_tickets"
+  },
+  {
    "name" : "SSL_CTX_set_ocsp_response"
   },
   {
@@ -8101,6 +8104,21 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CTX_set_num_tickets",
+   "linker_set_key" : "SSL_CTX_set_num_tickets",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10ssl_ctx_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CTX_set_ocsp_response",
    "linker_set_key" : "SSL_CTX_set_ocsp_response",
    "parameters" :
@@ -14808,15 +14826,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -19320,7 +19329,7 @@
    "name" : "const ssl_ctx_st",
    "referenced_type" : "_ZTI10ssl_ctx_st",
    "self_type" : "_ZTIK10ssl_ctx_st",
-   "size" : 332,
+   "size" : 336,
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
@@ -24689,20 +24698,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "name" : "bssl::internal::DeleterImpl<X509_CRL_METHOD>",
-   "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "self_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h",
-   "template_args" :
-   [
-    "_ZTI18x509_crl_method_st",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
    "name" : "bssl::internal::DeleterImpl<NAME_CONSTRAINTS>",
    "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
diff --git a/33/64/x86_64/source-based/libcrypto.so.lsdump b/33/64/x86_64/source-based/libcrypto.so.lsdump
index e3a36e8..2f1eb61 100644
--- a/33/64/x86_64/source-based/libcrypto.so.lsdump
+++ b/33/64/x86_64/source-based/libcrypto.so.lsdump
@@ -3685,12 +3685,21 @@
    "name" : "FIPS_mode_set"
   },
   {
+   "name" : "FIPS_module_name"
+  },
+  {
    "name" : "FIPS_query_algorithm_status"
   },
   {
    "name" : "FIPS_read_counter"
   },
   {
+   "name" : "FIPS_service_indicator_after_call"
+  },
+  {
+   "name" : "FIPS_service_indicator_before_call"
+  },
+  {
    "name" : "FIPS_version"
   },
   {
@@ -5113,12 +5122,6 @@
    "name" : "X509_CRL_INFO_new"
   },
   {
-   "name" : "X509_CRL_METHOD_free"
-  },
-  {
-   "name" : "X509_CRL_METHOD_new"
-  },
-  {
    "name" : "X509_CRL_add0_revoked"
   },
   {
@@ -5194,9 +5197,6 @@
    "name" : "X509_CRL_get_lastUpdate"
   },
   {
-   "name" : "X509_CRL_get_meth_data"
-  },
-  {
    "name" : "X509_CRL_get_nextUpdate"
   },
   {
@@ -5230,15 +5230,9 @@
    "name" : "X509_CRL_set1_signature_value"
   },
   {
-   "name" : "X509_CRL_set_default_method"
-  },
-  {
    "name" : "X509_CRL_set_issuer_name"
   },
   {
-   "name" : "X509_CRL_set_meth_data"
-  },
-  {
    "name" : "X509_CRL_set_version"
   },
   {
@@ -6406,9 +6400,6 @@
    "name" : "X509_time_adj_ex"
   },
   {
-   "name" : "X509_to_X509_REQ"
-  },
-  {
    "name" : "X509_trust_clear"
   },
   {
@@ -8235,63 +8226,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stE",
-   "name" : "int (X509_crl_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (X509_crl_st *, evp_pkey_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPP15x509_revoked_st"
-    },
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIP12X509_name_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP13x509_trust_stP7x509_stiE",
    "name" : "int (x509_trust_st *, x509_st *, int)",
    "parameters" :
@@ -9560,30 +9494,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "AES_CMAC",
-   "linker_set_key" : "AES_CMAC",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "ASN1_BIT_STRING_check",
    "linker_set_key" : "ASN1_BIT_STRING_check",
    "parameters" :
@@ -14504,111 +14414,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "CMAC_CTX_copy",
-   "linker_set_key" : "CMAC_CTX_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_free",
-   "linker_set_key" : "CMAC_CTX_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_new",
-   "linker_set_key" : "CMAC_CTX_new",
-   "return_type" : "_ZTIP11cmac_ctx_st",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Final",
-   "linker_set_key" : "CMAC_Final",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Init",
-   "linker_set_key" : "CMAC_Init",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPK13evp_cipher_st"
-    },
-    {
-     "referenced_type" : "_ZTIP9engine_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Reset",
-   "linker_set_key" : "CMAC_Reset",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Update",
-   "linker_set_key" : "CMAC_Update",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "CONF_modules_free",
    "linker_set_key" : "CONF_modules_free",
    "return_type" : "_ZTIv",
@@ -18316,7 +18121,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -18583,7 +18388,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18631,7 +18436,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18919,7 +18724,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -19289,18 +19094,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -25535,39 +25328,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_METHOD_free",
-   "linker_set_key" : "X509_CRL_METHOD_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "function_name" : "X509_CRL_METHOD_new",
-   "linker_set_key" : "X509_CRL_METHOD_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE"
-    }
-   ],
-   "return_type" : "_ZTIP18x509_crl_method_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_add0_revoked",
    "linker_set_key" : "X509_CRL_add0_revoked",
    "parameters" :
@@ -25970,18 +25730,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_get_meth_data",
-   "linker_set_key" : "X509_CRL_get_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_get_nextUpdate",
    "linker_set_key" : "X509_CRL_get_nextUpdate",
    "parameters" :
@@ -26132,18 +25880,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_default_method",
-   "linker_set_key" : "X509_CRL_set_default_method",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_issuer_name",
    "linker_set_key" : "X509_CRL_set_issuer_name",
    "parameters" :
@@ -26159,21 +25895,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_meth_data",
-   "linker_set_key" : "X509_CRL_set_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_version",
    "linker_set_key" : "X509_CRL_set_version",
    "parameters" :
@@ -31790,24 +31511,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_to_X509_REQ",
-   "linker_set_key" : "X509_to_X509_REQ",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7x509_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK9env_md_st"
-    }
-   ],
-   "return_type" : "_ZTIP11X509_req_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_trust_clear",
    "linker_set_key" : "X509_trust_clear",
    "parameters" :
@@ -37333,15 +37036,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP11cmac_ctx_st",
-   "name" : "cmac_ctx_st *",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIP11cmac_ctx_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP11ec_group_st",
    "name" : "ec_group_st *",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -37990,15 +37684,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -38463,7 +38148,7 @@
    "referenced_type" : "_ZTI9engine_st",
    "self_type" : "_ZTIP9engine_st",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
+   "source_file" : "external/boringssl/src/include/openssl/engine.h"
   },
   {
    "alignment" : 8,
@@ -38620,33 +38305,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stE",
-   "name" : "int (*)(X509_crl_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (*)(X509_crl_st *, evp_pkey_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (*)(X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPFiP13x509_trust_stP7x509_stiE",
    "name" : "int (*)(x509_trust_st *, x509_st *, int)",
    "referenced_type" : "_ZTIFiP13x509_trust_stP7x509_stiE",
@@ -39223,15 +38881,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st *",
-   "referenced_type" : "_ZTIK11cmac_ctx_st",
-   "self_type" : "_ZTIPK11cmac_ctx_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK11ec_group_st",
    "name" : "const ec_group_st *",
    "referenced_type" : "_ZTIK11ec_group_st",
@@ -39288,24 +38937,6 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/asn1/a_mbstr.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/asn1/tasn_dec.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st",
    "size" : 8,
@@ -39324,6 +38955,33 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509/x509_ext.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
    "size" : 8,
@@ -39709,15 +39367,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st *",
-   "referenced_type" : "_ZTIK18x509_crl_method_st",
-   "self_type" : "_ZTIPK18x509_crl_method_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIPK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st *",
    "referenced_type" : "_ZTIK19X509_POLICY_NODE_st",
@@ -40780,7 +40429,7 @@
    "name" : "const X509_crl_st",
    "referenced_type" : "_ZTI11X509_crl_st",
    "self_type" : "_ZTIK11X509_crl_st",
-   "size" : 128,
+   "size" : 112,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
@@ -40806,16 +40455,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIK11cmac_ctx_st",
-   "size" : 200,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK11ec_group_st",
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -41272,16 +40911,6 @@
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIK18x509_crl_method_st",
-   "size" : 40,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st",
    "referenced_type" : "_ZTI19X509_POLICY_NODE_st",
@@ -41835,47 +41464,6 @@
    "fields" :
    [
     {
-     "field_name" : "valid",
-     "referenced_type" : "_ZTIc"
-    },
-    {
-     "field_name" : "ret",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "plen",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "field_name" : "ptag",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "pclass",
-     "field_offset" : 160,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "hdrlen",
-     "field_offset" : 192,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_TLC_st",
-   "name" : "ASN1_TLC_st",
-   "referenced_type" : "_ZTI11ASN1_TLC_st",
-   "self_type" : "_ZTI11ASN1_TLC_st",
-   "size" : 32,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
      "field_name" : "arg",
      "referenced_type" : "_ZTIPv"
     },
diff --git a/33/64/x86_64/source-based/libssl.so.lsdump b/33/64/x86_64/source-based/libssl.so.lsdump
index 075d7a5..aee6d91 100644
--- a/33/64/x86_64/source-based/libssl.so.lsdump
+++ b/33/64/x86_64/source-based/libssl.so.lsdump
@@ -910,6 +910,9 @@
    "name" : "SSL_CTX_set_next_protos_advertised_cb"
   },
   {
+   "name" : "SSL_CTX_set_num_tickets"
+  },
+  {
    "name" : "SSL_CTX_set_ocsp_response"
   },
   {
@@ -8120,6 +8123,21 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CTX_set_num_tickets",
+   "linker_set_key" : "SSL_CTX_set_num_tickets",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10ssl_ctx_st"
+    },
+    {
+     "referenced_type" : "_ZTIm"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CTX_set_ocsp_response",
    "linker_set_key" : "SSL_CTX_set_ocsp_response",
    "parameters" :
@@ -14827,15 +14845,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -24717,20 +24726,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "name" : "bssl::internal::DeleterImpl<X509_CRL_METHOD>",
-   "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "self_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h",
-   "template_args" :
-   [
-    "_ZTI18x509_crl_method_st",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
    "name" : "bssl::internal::DeleterImpl<NAME_CONSTRAINTS>",
    "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
diff --git a/33/64/x86_x86_64/source-based/libcrypto.so.lsdump b/33/64/x86_x86_64/source-based/libcrypto.so.lsdump
index b314b6b..c9757d2 100644
--- a/33/64/x86_x86_64/source-based/libcrypto.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libcrypto.so.lsdump
@@ -3657,12 +3657,21 @@
    "name" : "FIPS_mode_set"
   },
   {
+   "name" : "FIPS_module_name"
+  },
+  {
    "name" : "FIPS_query_algorithm_status"
   },
   {
    "name" : "FIPS_read_counter"
   },
   {
+   "name" : "FIPS_service_indicator_after_call"
+  },
+  {
+   "name" : "FIPS_service_indicator_before_call"
+  },
+  {
    "name" : "FIPS_version"
   },
   {
@@ -5085,12 +5094,6 @@
    "name" : "X509_CRL_INFO_new"
   },
   {
-   "name" : "X509_CRL_METHOD_free"
-  },
-  {
-   "name" : "X509_CRL_METHOD_new"
-  },
-  {
    "name" : "X509_CRL_add0_revoked"
   },
   {
@@ -5166,9 +5169,6 @@
    "name" : "X509_CRL_get_lastUpdate"
   },
   {
-   "name" : "X509_CRL_get_meth_data"
-  },
-  {
    "name" : "X509_CRL_get_nextUpdate"
   },
   {
@@ -5202,15 +5202,9 @@
    "name" : "X509_CRL_set1_signature_value"
   },
   {
-   "name" : "X509_CRL_set_default_method"
-  },
-  {
    "name" : "X509_CRL_set_issuer_name"
   },
   {
-   "name" : "X509_CRL_set_meth_data"
-  },
-  {
    "name" : "X509_CRL_set_version"
   },
   {
@@ -6378,9 +6372,6 @@
    "name" : "X509_time_adj_ex"
   },
   {
-   "name" : "X509_to_X509_REQ"
-  },
-  {
    "name" : "X509_trust_clear"
   },
   {
@@ -8207,63 +8198,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stE",
-   "name" : "int (X509_crl_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (X509_crl_st *, evp_pkey_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPP15x509_revoked_st"
-    },
-    {
-     "referenced_type" : "_ZTIP14asn1_string_st"
-    },
-    {
-     "referenced_type" : "_ZTIP12X509_name_st"
-    }
-   ],
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIFiP13x509_trust_stP7x509_stiE",
    "name" : "int (x509_trust_st *, x509_st *, int)",
    "parameters" :
@@ -9532,30 +9466,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "AES_CMAC",
-   "linker_set_key" : "AES_CMAC",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "ASN1_BIT_STRING_check",
    "linker_set_key" : "ASN1_BIT_STRING_check",
    "parameters" :
@@ -14476,111 +14386,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
   },
   {
-   "function_name" : "CMAC_CTX_copy",
-   "linker_set_key" : "CMAC_CTX_copy",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_free",
-   "linker_set_key" : "CMAC_CTX_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_CTX_new",
-   "linker_set_key" : "CMAC_CTX_new",
-   "return_type" : "_ZTIP11cmac_ctx_st",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Final",
-   "linker_set_key" : "CMAC_Final",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPh"
-    },
-    {
-     "referenced_type" : "_ZTIPj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Init",
-   "linker_set_key" : "CMAC_Init",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKv"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "referenced_type" : "_ZTIPK13evp_cipher_st"
-    },
-    {
-     "referenced_type" : "_ZTIP9engine_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Reset",
-   "linker_set_key" : "CMAC_Reset",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "function_name" : "CMAC_Update",
-   "linker_set_key" : "CMAC_Update",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11cmac_ctx_st"
-    },
-    {
-     "referenced_type" : "_ZTIPKh"
-    },
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
    "function_name" : "CONF_modules_free",
    "linker_set_key" : "CONF_modules_free",
    "return_type" : "_ZTIv",
@@ -18288,7 +18093,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -18555,7 +18360,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18603,7 +18408,7 @@
      "referenced_type" : "_ZTIPK11evp_pkey_st"
     }
    ],
-   "return_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump",
+   "return_type" : "_ZTIP6dsa_st",
    "source_file" : "external/boringssl/src/include/openssl/evp.h"
   },
   {
@@ -18891,7 +18696,7 @@
      "referenced_type" : "_ZTIP11evp_pkey_st"
     },
     {
-     "referenced_type" : "_ZTIP6dsa_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/evp/evp.sdump"
+     "referenced_type" : "_ZTIP6dsa_st"
     }
    ],
    "return_type" : "_ZTIi",
@@ -19261,18 +19066,6 @@
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
-   "function_name" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "linker_set_key" : "EVP_aead_aes_128_ccm_bluetooth_8",
-   "return_type" : "_ZTIPK11evp_aead_st",
-   "source_file" : "external/boringssl/src/include/openssl/aead.h"
-  },
-  {
    "function_name" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "linker_set_key" : "EVP_aead_aes_128_ctr_hmac_sha256",
    "return_type" : "_ZTIPK11evp_aead_st",
@@ -25507,39 +25300,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_METHOD_free",
-   "linker_set_key" : "X509_CRL_METHOD_free",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "function_name" : "X509_CRL_METHOD_new",
-   "linker_set_key" : "X509_CRL_METHOD_new",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE"
-    },
-    {
-     "referenced_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE"
-    }
-   ],
-   "return_type" : "_ZTIP18x509_crl_method_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_add0_revoked",
    "linker_set_key" : "X509_CRL_add0_revoked",
    "parameters" :
@@ -25942,18 +25702,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_get_meth_data",
-   "linker_set_key" : "X509_CRL_get_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_get_nextUpdate",
    "linker_set_key" : "X509_CRL_get_nextUpdate",
    "parameters" :
@@ -26104,18 +25852,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_default_method",
-   "linker_set_key" : "X509_CRL_set_default_method",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK18x509_crl_method_st"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_issuer_name",
    "linker_set_key" : "X509_CRL_set_issuer_name",
    "parameters" :
@@ -26131,21 +25867,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_CRL_set_meth_data",
-   "linker_set_key" : "X509_CRL_set_meth_data",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP11X509_crl_st"
-    },
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_CRL_set_version",
    "linker_set_key" : "X509_CRL_set_version",
    "parameters" :
@@ -31762,24 +31483,6 @@
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
-   "function_name" : "X509_to_X509_REQ",
-   "linker_set_key" : "X509_to_X509_REQ",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7x509_st"
-    },
-    {
-     "referenced_type" : "_ZTIP11evp_pkey_st"
-    },
-    {
-     "referenced_type" : "_ZTIPK9env_md_st"
-    }
-   ],
-   "return_type" : "_ZTIP11X509_req_st",
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
    "function_name" : "X509_trust_clear",
    "linker_set_key" : "X509_trust_clear",
    "parameters" :
@@ -37305,15 +37008,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP11cmac_ctx_st",
-   "name" : "cmac_ctx_st *",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIP11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP11ec_group_st",
    "name" : "ec_group_st *",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -37953,15 +37647,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -38426,7 +38111,7 @@
    "referenced_type" : "_ZTI9engine_st",
    "self_type" : "_ZTIP9engine_st",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
+   "source_file" : "external/boringssl/src/include/openssl/engine.h"
   },
   {
    "alignment" : 4,
@@ -38583,33 +38268,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stE",
-   "name" : "int (*)(X509_crl_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "name" : "int (*)(X509_crl_st *, evp_pkey_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stP11evp_pkey_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stP11evp_pkey_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "name" : "int (*)(X509_crl_st *, x509_revoked_st **, asn1_string_st *, X509_name_st *)",
-   "referenced_type" : "_ZTIFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "self_type" : "_ZTIPFiP11X509_crl_stPP15x509_revoked_stP14asn1_string_stP12X509_name_stE",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPFiP13x509_trust_stP7x509_stiE",
    "name" : "int (*)(x509_trust_st *, x509_st *, int)",
    "referenced_type" : "_ZTIFiP13x509_trust_stP7x509_stiE",
@@ -39186,15 +38844,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st *",
-   "referenced_type" : "_ZTIK11cmac_ctx_st",
-   "self_type" : "_ZTIPK11cmac_ctx_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK11ec_group_st",
    "name" : "const ec_group_st *",
    "referenced_type" : "_ZTIK11ec_group_st",
@@ -39251,24 +38900,6 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/asn1/a_mbstr.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
-   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/asn1/tasn_dec.sdump",
-   "self_type" : "_ZTIPK12ASN1_ITEM_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/asn1.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
-   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st",
    "size" : 4,
@@ -39287,6 +38918,33 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
    "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/t_req.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/x509_ext.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
+   "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/pcy_map.sdump",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/x509v3.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.33_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509v3/v3_conf.sdump",
    "size" : 4,
@@ -39672,15 +39330,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st *",
-   "referenced_type" : "_ZTIK18x509_crl_method_st",
-   "self_type" : "_ZTIPK18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIPK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st *",
    "referenced_type" : "_ZTIK19X509_POLICY_NODE_st",
@@ -40761,7 +40410,7 @@
    "name" : "const X509_crl_st",
    "referenced_type" : "_ZTI11X509_crl_st",
    "self_type" : "_ZTIK11X509_crl_st",
-   "size" : 88,
+   "size" : 80,
    "source_file" : "external/boringssl/src/include/openssl/x509.h"
   },
   {
@@ -40787,16 +40436,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK11cmac_ctx_st",
-   "name" : "const cmac_ctx_st",
-   "referenced_type" : "_ZTI11cmac_ctx_st",
-   "self_type" : "_ZTIK11cmac_ctx_st",
-   "size" : 184,
-   "source_file" : "external/boringssl/src/include/openssl/cmac.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK11ec_group_st",
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
@@ -41253,16 +40892,6 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIK18x509_crl_method_st",
-   "name" : "const x509_crl_method_st",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIK18x509_crl_method_st",
-   "size" : 20,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "_ZTIK19X509_POLICY_NODE_st",
    "name" : "const X509_POLICY_NODE_st",
    "referenced_type" : "_ZTI19X509_POLICY_NODE_st",
@@ -41816,47 +41445,6 @@
    "fields" :
    [
     {
-     "field_name" : "valid",
-     "referenced_type" : "_ZTIc"
-    },
-    {
-     "field_name" : "ret",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "plen",
-     "field_offset" : 64,
-     "referenced_type" : "_ZTIl"
-    },
-    {
-     "field_name" : "ptag",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "pclass",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "field_name" : "hdrlen",
-     "field_offset" : 160,
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "linker_set_key" : "_ZTI11ASN1_TLC_st",
-   "name" : "ASN1_TLC_st",
-   "referenced_type" : "_ZTI11ASN1_TLC_st",
-   "self_type" : "_ZTI11ASN1_TLC_st",
-   "size" : 24,
-   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "arg",
      "referenced_type" : "_ZTIPv"
     },
diff --git a/33/64/x86_x86_64/source-based/libssl.so.lsdump b/33/64/x86_x86_64/source-based/libssl.so.lsdump
index 0502d83..b30c1de 100644
--- a/33/64/x86_x86_64/source-based/libssl.so.lsdump
+++ b/33/64/x86_x86_64/source-based/libssl.so.lsdump
@@ -891,6 +891,9 @@
    "name" : "SSL_CTX_set_next_protos_advertised_cb"
   },
   {
+   "name" : "SSL_CTX_set_num_tickets"
+  },
+  {
    "name" : "SSL_CTX_set_ocsp_response"
   },
   {
@@ -8101,6 +8104,21 @@
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
+   "function_name" : "SSL_CTX_set_num_tickets",
+   "linker_set_key" : "SSL_CTX_set_num_tickets",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIP10ssl_ctx_st"
+    },
+    {
+     "referenced_type" : "_ZTIj"
+    }
+   ],
+   "return_type" : "_ZTIi",
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+  },
+  {
    "function_name" : "SSL_CTX_set_ocsp_response",
    "linker_set_key" : "SSL_CTX_set_ocsp_response",
    "parameters" :
@@ -14808,15 +14826,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIP18x509_crl_method_st",
-   "name" : "x509_crl_method_st *",
-   "referenced_type" : "_ZTI18x509_crl_method_st",
-   "self_type" : "_ZTIP18x509_crl_method_st",
-   "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "_ZTIP19NAME_CONSTRAINTS_st",
    "name" : "NAME_CONSTRAINTS_st *",
    "referenced_type" : "_ZTI19NAME_CONSTRAINTS_st",
@@ -19320,7 +19329,7 @@
    "name" : "const ssl_ctx_st",
    "referenced_type" : "_ZTI10ssl_ctx_st",
    "self_type" : "_ZTIK10ssl_ctx_st",
-   "size" : 332,
+   "size" : 336,
    "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
@@ -24689,20 +24698,6 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "name" : "bssl::internal::DeleterImpl<X509_CRL_METHOD>",
-   "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "self_type" : "_ZTIN4bssl8internal11DeleterImplI18x509_crl_method_stvEE",
-   "size" : 1,
-   "source_file" : "external/boringssl/src/include/openssl/x509.h",
-   "template_args" :
-   [
-    "_ZTI18x509_crl_method_st",
-    "_ZTIv"
-   ]
-  },
-  {
-   "alignment" : 1,
    "linker_set_key" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",
    "name" : "bssl::internal::DeleterImpl<NAME_CONSTRAINTS>",
    "referenced_type" : "_ZTIN4bssl8internal11DeleterImplI19NAME_CONSTRAINTS_stvEE",