Test case for #125, along with periodic updates

- kotlin: 1.9.0
 - gradle: 8.2.1
 - helper: update crypto helper
 - capex: partial update

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "src/integrationTest/resources_2"]
 	path = src/integrationTest/resources_2
 	url = https://gitee.com/cfig/android_image_res2.git
+[submodule "src/integrationTest/resources_3"]
+	path = src/integrationTest/resources_3
+	url = https://github.com/cfig/android_image_res3.git

aosp/avb/test/vts-testcase/security/avb/data/Android.bp

@@ -0,0 +1,45 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+filegroup {
+    name: "q-gsi_avbpubkey",
+    srcs: [
+        "q-gsi.avbpubkey",
+    ],
+}
+
+filegroup {
+    name: "r-gsi_avbpubkey",
+    srcs: [
+        "r-gsi.avbpubkey",
+    ],
+}
+
+filegroup {
+    name: "s-gsi_avbpubkey",
+    srcs: [
+        "s-gsi.avbpubkey",
+    ],
+}
+
+filegroup {
+    name: "t-gsi_avbpubkey",
+    srcs: [
+        "t-gsi.avbpubkey",
+    ],
+}
+
+filegroup {
+    name: "qcar-gsi_avbpubkey",
+    srcs: [
+        "qcar-gsi.avbpubkey",
+    ],
+}
+
+filegroup {
+    name: "kernel_version_matrix.textproto",
+    srcs: [
+        "kernel_version_matrix.textproto"
+    ],
+}

aosp/avb/test/vts-testcase/security/avb/data/kernel_version_matrix.textproto

@@ -0,0 +1,91 @@
+# Copyright (C) 2023 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# https://source.android.com/docs/core/architecture/kernel/android-common#compatibility-matrix
+release_requirements: [
+  {
+    # Android 13
+    # This is the minimum SDK level where we start enforcing the matrix.
+    key: 33
+    value {
+      upgrade: [
+        # -q, -stable are dropped from non-GKI kernel release formats because the kernel branch
+        # cannot be looked up anywhere.
+        "android-4.9",
+        "android-4.14",
+        "android-4.19",
+        "android11-5.4",
+        "android12-5.4",
+        "android12-5.10",
+        "android13-5.10",
+        "android13-5.15"
+      ]
+      launch: [
+        "android11-5.4",
+        "android12-5.4",
+        "android12-5.10",
+        "android13-5.10",
+        "android13-5.15"
+      ]
+      launch_grf: [
+        # -q, -stable are dropped from non-GKI kernel release formats because the kernel branch
+        # cannot be looked up anywhere.
+        "android-4.19",
+        "android11-5.4",
+        "android12-5.4",
+        "android12-5.10",
+        "android13-5.10",
+        "android13-5.15"
+      ]
+    }
+  },
+  {
+    # Android 14
+    key: 34
+    value {
+      upgrade: [
+        # -q, -stable are dropped from non-GKI kernel release formats because the kernel branch
+        # cannot be looked up anywhere.
+        "android-4.14",
+        "android-4.19",
+        "android11-5.4",
+        "android12-5.4",
+        "android12-5.10",
+        "android13-5.10",
+        "android13-5.15",
+        "android14-5.15",
+        "android14-6.1"
+      ]
+      launch: [
+        "android12-5.10",
+        "android13-5.10",
+        "android13-5.15",
+        "android14-5.15",
+        "android14-6.1"
+      ]
+      launch_grf: [
+        # -q, -stable are dropped from non-GKI kernel release formats because the kernel branch
+        # cannot be looked up anywhere.
+        "android-4.19",
+        "android11-5.4",
+        "android12-5.4",
+        "android12-5.10",
+        "android13-5.10",
+        "android13-5.15",
+        "android14-5.15",
+        "android14-6.1"
+      ]
+    }
+  }
+]

bbootimg/build.gradle.kts

@@ -15,7 +15,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.8.0"
+    kotlin("jvm") version "1.9.0"
     application
 }
 

bbootimg/src/main/resources/known_keys.json

@@ -1,138 +1,121 @@
-[{
+[ {
   "device" : "ADT-3",
   "manufacturer" : "amlogic",
   "algorithm" : "SHA256_RSA2048",
   "pubk" : "AAAIAJHD1q2K7QEFh5MBfReSuk2oQ9vQLC1/kdSBfizd0iFTyNiVd57KUIjCzfN2uMJWiLtNUYa7gK+1TxMt8wkFZq61Mob563hmPl8FbNn2qb4+/g/DsaeZstuptD9L9pBVuIyUskl8hZ3GFO3Xn9BXW19NAhXYdi5qUxGsWsInRSqqASLxmV/zEQGFhhEVh9ZlCEyYukqaVaUunEDdkcAABRpcaT61QOww5QbZe8T8K/FgVxz1Mz4eF1plphSaah94TCG5Wc+RFeZ5QYATuBqsKPU7t9BAmnxXBbhAGiSkKUpI9Ln9N42MLvR9R+NBAiCZCoUOKPYBirqcyp48TZJiLuY4MgLbYr0mJ3OKgxUF6Q0MLPPrdKca/KagLkojDnshDTFmejPEWJS1b5snCI0lH3mr7HRVNfst4e8l4IfS5AxX2YLuAhWvjHql7Yvhdysy7toGZapQw6REjOgvleIUwI6QGBSHlr2PQ8zCgJFFk3dAo2EYuk3hjNEWRGkW8DB4l4ij2yMYI8w4vFVg5iacdfVL4lfgItQb6OYSJJZADOcCrHhqR+OWOLftyjFP/oSZC3T6I30F/PIBAb+i0FSm+np2yycv7T0GgxZQD3ESx1Vsm4QtXIy5E1ToLumXWUN2++yi30XM+wfqpargU0vNdG5pgWg2DR7SGcKjIkWqJ+LJ2B283A==",
   "sha1" : "294dbb09016c013c57750edce0df0187409d56ce"
-},
-{
+}, {
   "device" : "GKI",
   "manufacturer" : "google",
   "algorithm" : "SHA256_RSA4096",
   "pubk" : "AAAQAN3haYGQPHFa9yJAviIpp5Feoyn9fr9IEOXPfDzY+SzDr0drrCjO5gY59btYOt/RbVhiXRZK3uSwN3OSiQ98CtECYG9AxUu+3m7o0W+y/UiQkvbbLN+gnbZjiAqWWBIdT0RUTdIf98eMBdgzbdpbDn7uzmwDjLvCkrc/rsWcYYeD6VuS0qKiw/Bzm/8hp7lqqtW0fgn4Y7OBPXRfckyNExjkSvktZZKDFFKp/Xcio5coGLBqXc+1g0Lmo2osbx4bSP4cwJSxKtEeSfH51DLPSc8w+tba/8Jmp+j0KAf5jowNzRKyxyjxavzs0c0Us087MkHN4MaBeLIRH4twUtBRUVKNwacmC3vkFjgnVhpATzXHQa6OYQdV6I8Hu1GyKJ1mr85vEOroNB710Kr7r4Y6YhkW4TpYJQzQ0YZGVQXgp0q00qAQGa9BANrsBaPHFLfLMt/oxGWmIIEeJPKMJ20VTojJqC0XJp39Ujbn0UXC/5V9lU94BQYwog84FOVh2THwcMYsDFb/WlJkF6ERKDYjQwEcIPwR18E1oM3nBM3x5TJpeCV929gxBKYVdf3uoPwiq/tJmM6m+HcHrqjnwN17i1SyG54Hg5rXRQG98Zx+jh4mam1j6dD9dnm0UYNbU24Bca5QhfSR9gwTXxj+9owvyNhKFF41/LcEeaIl+4W0azzj0Mcpf45+UlP0vG5mxKpzlasQthS8m6nPdkYrKrSTClWueuZRhiW0lnPF7PCj8n9jccJ2xYoqcdKRja3hQuBp5u6cRjZi0ACimdTwAMjw7IVkyNlJsTEHPCcQCMknWp5sncJtqady+BbO4W4AfGqSdi6zEZQc3bP5QdQsrnT3rocNHoX3gNwh+hDaED5Rj3MzPXFclb0xfLf1yMSIVuGCePKAcOqwlVbQIeoo2yfHPWX02EvS1JbBrkBCAJ6HRw3e5t/JQXm+faSBaTWGrSBwqaG/ykXgEDzjdeTsGnVr5g9vazd3Z3Lr6F7HqTIYvMZ+ovkIwiBC6dapTX0Ow35m+NjYSTUd15igmaqxjxq4zq2wxE5T5DQhF5ria8cp+0AJhWkfl35oxPWPnLworlDjvu2BdEb0RtfkHM8/po1BBlHzYqqTyV1NqkQq9nO6gVCyGW/X8XufeXKg1CDUiGfjn3IhIIXVcmjW4NxAgdCZdAjGNqIyaYR/LOksw0uaB1IFh0VQNjj300LOXUbJMXdaxzx1sQpw+nFSNYtTX6Uck/XfeBJDSiae5kbVQcey0hhbj1CDWT/u05hVvtxbmmcqVcS+pXk3wjJ/nnWJNga+DYtzK678/u9Fcj0dC+fsWXlEgRen9i4hDynaB7nkOFsnrweA014TLwuSSOmdEDnO0NMnxeQH",
   "sha1" : "144820003f9d46c96e9090dcf0e4feb84ca84810"
-},
-{
+}, {
   "device" : "Pixel 3",
   "manufacturer" : "google",
   "algorithm" : "SHA256_RSA2048",
   "pubk" : "AAAIAH0QbcWadnydcrOvnaY8DvH/VQVZ4o2h/uUahVy2SY+E8krdSWU9Wcg0CZl/AvHPPL2rD1i6KoLDzqgS9cyybSJYH2LA+J7MIlBTV7+z0tMT+rYT7NkxcC+5AZjkQsmL+fbS1q0VIEtCM/ugPnOY1Imympq3rOxrGee8I/bNm5GxCT//2xUIjQn5D/1oQ6eCtBGBMgY4B2/r6ooUM8Dhp+xiuwxSs6iEoZuh5Ba/xWh6neRe7AHT54axGdXz50B8aQx3DXlvVjuz8LA9aUrlD9o6qYftNgg4hfaKPx5Vi0zw4teIL86F6Plte1F7HDgyjPDxYyAKsEk+PJPGexGJHeEPg3bzgRR3+ss18VcmMgL9Dk2afbuf2VANcxfNA5J7e4J3YGapPwILLMLlojIACk0b1gBclH1hffkQZ4O/SYC0AGsMJDI45kauUWJmYglONmqxgh+rDI5xQP1KiDkRDtBWjocGcf7mHlxvI0E7X+oK7V+cEFEbAK5sEvSs4QDGlb+bjFS+WRYpodO/HzF5M0Cinbn7izvek3uP+LMogj6ELEnZqe9u7ubmgKv/BIhQY/RiRx0goLkwXzVwaAp7y6vh/Vi6YB2pzR6IiItRCkoPK6U1xnVJY/oElv0icqDA2ynXbxZcc6D6OXqTcueKEmeuSGe7jan0y4oDnMLd3k5MaYn5iQ==",
   "sha1" : "ad8569837cc06521720a35357475f87283b59234"
-},
-{
+}, {
   "device" : "Pixel 4",
   "manufacturer" : "google",
   "algorithm" : "SHA256_RSA4096",
   "pubk" : "AAAQANeIn3+J2UI8Yc4LIB5gWoLlw4d/OHXZv0M5zfchR9JB/RNaGhW1ffN4AgsdQJ4vLBSdf4i5QNlzMTC7sQ5eFjKCGrAp20cht69eDM94UTmTEizWDTH3tGRNL0Z7qyQUA4p21QY0GCcsMYt/r3XY6OSpbSz9iqu6bByX6u1mZzv/Tbd4C5SyA8hHHuTth6/PqAUhKvkfzg8MhVfGYx2hVTvZlun5jnXJyZXX4tqbzE2hZbpSSdTG2LvvJ9fBCuqeTs9UQTVaRZsp07l4OKReIlHDZrcyt01Gq+HrvWtpnX8JxgBLSMtO88BAfS8sgTQjtE/OC5jcRbrr7b7WYVpwUjeUa5hxgEnMJbcWn3fE2RxWWTQUFJM99UTUuSQm6xygc2u7cBcphdnQdqHyrT+DL6WQHFxGo9wbhXuq4MChvOsilqyWmml3tjUYlfv8CqP88ltb56bFD3Igk1cyaLrIE01sPs7tdfrKQf8t4ljW6cAPSwf16VKKCR5dBx250S5ru76+dqdVk3h2XY3eAp2EjiSSSfFVW+ZyOy22+4b10pZCe1ruqdc6sUE0Y4QzgRGBy6Ek9MjXEijVjc+5X9ALS8ED6N0cgmWaclk/cw8AHQKCcBP3HlnccjK4dQXBOw97YolYSYNJFWljJUpm69TgFfyf2RyWeN2kCHqzRBDS105UOsjfgUf9yf8ubHKFITlyqhvMzl6dCBfUDgQgcMFccnMxXPEZy3g24m/kjyB9WiBI2KBn6SbC4BkiAOqjLB9f/pb1nn/6aILeY+iqirs77ucWkMz/H3Xlk5lCNos57g70r5gCBtjnTbWMFHs1m6X43v9iOsr3I4zPq4/QdEwpXnz9gBLz63n+kR/IT54ugiliYMdFRSyrTNyGd1L2mCczdxk5AapxVVZTQHdl3bMU1/Mu1YjGLh1F/ipug35VvlIfL+Y1Wded3vdFB0DAciG/8m0na6mQyfHYxEurt4Fq4ifkxMOP2NVh5CXOHCSbnHyqTDj5XvMT6fcnEEHE+Z25ALC4GI4kkHsMfoejdINmiJePTYDjCSgSBAoFCCul0HVeTH/VUBMotlf3LPhRuWGWuT3/Tk/yIR0JASSeCc03YUR0lsf1rCZEyWhPc1n1e6Rwlp8fCEa3J/Q7i/pHNXSWE5EJKlU8Jm4VH8J/oetSa+7NKgCeSUFtBcg00zg2YBfuam/dd53LM1FyJYRWV4ONWpL3Mhxi0TuSVb9j3BJL7R56wiMuuq/tVgsNzujhWdezYVo1oZTJrFj6LLdK4DHD51BK3erc62FlSGw7vcHFRVhgE8y6EJFcqKTVBhqJ0Qmr6XgTBA12BKArAjs4QG5/AwrDrImDqrB7udkAutzx2vHQ2ytR",
   "sha1" : "8c44014b96f0f41f3daa3825d4af410233372b65"
-},
-{
+}, {
   "device" : "Pixel 5",
   "manufacturer" : "google",
   "algorithm" : "SHA256_RSA4096",
   "pubk" : "AAAQAJQ75c2T8qdhsNTAlO37M/QNDoIIS7jUkIqOINM+UygqTj8/BVbIih31wOT7oglvXR+3baLR90iAqrTCBhhMrWPw6cdFE5IrpIho+4y7heWCc8VCkR4MBsygEHuseYtB0WJegHnI3YxNOx9HyDo3HuWFkYx8VNlOSNCep6Ce2Xbn1BYjOTIUeWOzee0UY0lLCyriFAf6YkLDmplI1jYBWs4R0TANTJQlMzOThratZXW39IDLuCmlX6r0Wg5ljT25tb767ZG2NHUTQJoLHV95iOyUwuKZa/hvUOmOM0JGVDcVXpzwUX0HN2Q5i4LBulxtQVFrol5yHO1jbK+el76FMhlgZHjEto6peUmZodwLzXybAgbakK3vF8V91DOy0dnkbyHiejzgMhPCCat6wNjhtYs0EMsOtS+WOzxdxFUZMp+gPQrT3f+5HTBkfpTNHdvhiyxZsM+Xqyi4O5OX8LSszWMEviq67OkQawgc9tbsNX6tCc0gH9EiYro/ecOcI/JA5yfJce5gJlIUvavgFzsi9DFQqHcnVevd/C0D6CderCwv5QuGqGfSkt3FJv6ITmFAG7IhYU4Y9A/OkLInZChiQ4nxL+c63K1dVFmNidwQpFwo0+49hvZ9VJ5HsL6px7Z167VAVOkReFjBbqOPYAeq0Xy3wZoCxQapuqxO+VUtR4H5S6xw+ygZzGpXfJJA0BNIdxsOEO3DRlv1lx4Sa6efHYBhodtelrayF19izHpHHRifFMwQgDz1mOU9AcM4cvpqYKIhFaH9d6wRMsBif0L+rT1LJh691bfLR5P5EyPhrb28+1/agYI6EIt83Aaz3d9SnamqAqyGR2E86o8HXGo8x5NAPdp7UM1yt7rOyhNwcG+dVj535XsS2hzHsaUn+PWWanLF/bSuoOYwCbLf22eCmE08uCZW2JHJdzRCwMXy3ZSGbYxOCfaMcaHOpl//4KcHZNBd4j07ODKXiE8rueB/hfMx2NMmxpkeCIf1dxQsFgnC3iHtixgMVRkxuQTAh7ePOu9yEgj17ImTFOVLm1BaBBnd7dDdg7bgiOMloH8+1HvPWerDnz8ghLE044nz73NSsixKvEAm8wAeWbbG8/uOjCsi5opYh1oBgdjUTQEjsu8CApbvjrh8//f8/46n+/SJgBB0AJKY+F9pRk0p2duX2a1R/zbpM4Fa06qjvwRycyGw8A4gdmwFt7189dYjYAukPoQ4qONJn7BXQMFM2EhNLOUyfdz8SmekEL5d9NVG2UB0m9mYdYCbwgPvCZQAsqH3i2pNslx/9GbRS59Q6dSqsDDk2TSFst/2biBiAyl7glFoN/bggoGESxPc3t43Mi/O/ym3l1qd7oQGav7wZL0J8iZ/I575",
   "sha1" : "6908461c2ccd5568d1f39016a9da5aec5b10a785"
-},
-{
+}, {
   "device" : "Pixel 5a",
   "manufacturer" : "google",
   "algorithm" : "SHA256_RSA4096",
   "pubk" : "AAAQAP2EZ6+lhRYjp4cE4WW11okXlC20K5OJWj7iX0bmAGcmPMtWNJt3Jq/w+5ZvfRMa5xy3CMZeJICV1XeD7R/Pwcs9Wadd+DR+Lsai209qJiuMv6R4Y+eF+EacD7NunRpDdaDGnTxdaWJUbYDSFDrwLO1PHBavewd3ujVCmuh1zaQ2CW3Y1lo0UvmO0tISRr4yvR5Ia+zaufQ0TtmlWwX6se7jJ0/ap9Z4wQYJS9R8WDRqV+XX9QUDuOU/w6TI4hB9oYDjiysCtzJe9zibK6jSNq1/3CfOm4GuaCLQEJseoqgsNh25MkTqg4rmmPsk+5Kcylr2gDFRmu4NOJ/sCRIVDXkigrz2WDaB3UaBTN/JZMjuFvxk6LAQSURE4oFuljzfTvnp2bIYbqZ8NUTHuzhEDwelj0eChAkW9hQ85OBTs23lJmAYQxJ+WqYixrB1lpmgz7MUzc/2PJBXLh96FdLJcU2jCzCfrAAepELWsutPfVcE8rOFAdrAF6PPeHUN87pfrbGZx/oj1Nkf0kOic77dqHERqWw//7WngbzHPahjyX33OheZK+xK5tzx2EUX09yXMK84d25UipJuHQ0SsBMM3EmI1b9U2IDEHfhIg5QpJFO5xF1DQyLTu5lG9mAqJcGAjnIt47Jkv3s5i6zBlmXWJJicgnnbDjN7sn/w4LiZY2Uu8ZSwsSobI5EDG5vIdD7NlueFB5zDoqhm19eG2z/QfywOdFlgsfYPDmg1JikeWnpDb3Yy5xPb1ua5TFYItduid0aM+VkoL/KbPt2oVgh4O2uZTFebUHMMCnyGw2zwfjeh4xrD9mD5xWdcjo3KYB1nuv/GtkNEDXpsUxIII4E3ipjfnNHJBz0UPlYnuxDB34KpvHoa/GG8wEWJCDcL0dZX5/KaaiTHwlypWUXnSi3rlm+qcMivO14f8LFmmabMEetiA2YIVqtIXB4MCIYKYr5aF6879LpHA2bFI/LXyGf6pL0tM1CAiQXZwNc+WHC24ujCngT/QD2nRdqWDKuwycG/DtRJVnn+Z5WVD28PZotv/6ODT/4f1OLgM9ufq38Vm2SETZNYCZr4Zcn5bgR7ObqyTnD+vCcpfTDifVp8xPlHT1iY7gdb0gSV8ZIIXpcxUB0kBpM6jO2HJST9hVOBQfMo3V5xjBJYkFwcrCI0bC58zf344C145YuUKchByC5NCkJXHe7YcD9Hut2fIxcZqO08w5XDgJucfS6hMOaspt7XhibxwsE/xF33pgqRz9kFOJ6DnjhGbvbWo3VfNpGdeBfu8vmSpNKI3plaxImWEaK360KHCBVgwqLrhoIgf91FdT6MSO7gGVOHbB+o41UZ8mjE71yrIWA4Opp4/qpVUJhVR0aR6z8d",
   "sha1" : "14e3fd68feb4fe7c9837787ed218d083050574da"
-},
-{
+}, {
   "device" : "Pixel 6",
   "manufacturer" : "google",
   "algorithm" : "SHA256_RSA4096",
   "pubk" : "AAAQAPzSq6nF6uIU7cpTp90ATW+SFDH+L1Rv8NBew/USm5nNdFNhm+HXbWwz6cADn/dtUEd+eksUc6uxisT4EwziErAMbgYyN81+W1ndYFhp4zU1C0YhlS+LnlPxY+rNPmShpFvMIvMCH8GK24tO50FjjTBZrz5kwGfJt0kF7jQwZKQr6e3PMaKYZH11jeAdasEoxwsMjX31U74N8T4r92H8caaLzGJm2qaXn2Nec1HIWwUn7GSigG9yDf6RSzlc6PhKYZvcNG8AmiqghBxuN9HrBc4zo5z2IIm0+W2zxzoPkoRQrKR5LLRoBAifw9zO/xTiiuz/LcDjOesFrdk/vWKH1BJN3bx2etaH7qpqqQo3gjfc//VBZrZu1GelxL1KBNYQ+somh1NGUUKm3WDHtDBzMOrCph4zUyKLU5sqQIzVaqk3mjD4QpLM3nhsuZfheSDEFv38fmX34w0Y34bdogOqM7qsWOAEkxX4SugVrEakxuNoTDaXi765vxnrXcsgyWaalMZpsNra9AJujXATlfvBSRLqd/++B83voe41rnCLJUR3TRIy5PQiE7Zvpv2HZn0ix7EVg0ZRVRKBjubcAVFrtD8pXStqA5v6Jt4sy4g8QKHecgmKj3oad37ubWFDEQIRiEYceAA1xYRwCbMrJoFaBysNUuYp4a68FeZiRqbIg5pxC8LXZ5WfbGOcq4xzXkqk327J/1UxdTLvQT/HKkcefRPbrCh7yEFYSn+XCNCx+w+/GdYyKJ6X3sYPP6Ko4R2O+N7FC7SPfn7qfl9yIOeRcvX6EHaXXMfA4PG8EW7dNZvPXa5Sp1g79w2aFEIRWolj6czvgPfC0fHvflFrd60t1K9WiqxvcQFG5spOUrhqltobGjHo6FS7ohWiX5sE9mJxUZap7AR7avAkAWibFBSyv59uxt4KzXZGqsZJw2vuEWeImXAIc14xSkLLJgeoI0ZIfxqrs+sctno4HMwr7tdzMKpTS8Ni/sJSVplmSzdTJ01V74uDLC7VreL+rjXvYLcBV9363/knhX0Os+O01aTSVwGsYBbKwpEuiqonS4yNs5G2NydQvHoDaXUNAzztMd/UmC4WHZOV+vM/daqXAniafJx3lXi+Zgxw3nl/vU2mgNNek2U1Y5xmefhKjBwVhqmIzZY4Lab6Cobs7sEmXrwOe+578PjnFzzs0MDEaJd6vJExVOe5pLvWhUk4vBFb0eK8JcbY65rXWfOJhm0DKlMd7yIidIQaYK0drCNhCM4Fr33YJmQcFBo2QgLsmESnayMJgmPU/KhK3BwZU0OdUJbsGupzvoJIGdnFrp+0oTxO/X4Mr5ArUmoMSFx+rq6x0sMBJNt/kxvvFKcETHN9oRn15V8pRpDl",
   "sha1" : "85322346680a860c091fa14a64cef1fe4a3ffe31"
-},
-{
+}, {
   "device" : "Pixel 6pro",
   "manufacturer" : "google",
   "algorithm" : "SHA256_RSA4096",
   "pubk" : "AAAQAAw4tB+0tXQVo8gxwKDukkqG5UfUBSsSy/Y46e/wBitpPv6EwpFsTzg8Jw+Xlgw1wXDJPk0nWnAWk2CrxI//64nVRiOMYquuL4PlUyB0JHkeDH9+2EH6YsOZABRUHkj8KvKovqFWxjXyS7pGbFTYxrZn2f04A1GfYJK9sG0TvW2CvuJs2/MgflXLie4N8V1hpjiuP5Qsu7xEzh/uJrzWDBKLEdgC8FjkxufHK366KaYqfrUuuX/bgQpO5MfzynFaf+PysG3YR2+JN2rnd4hpgqFt73qILm8EQ6Ls4gWijloA6M+MV4QW+jMtKjKhBCNITPLSjZx/0GgZNN5MS2/7kq4dNgmjBCP5qFL8V1xa+r1sdDG2WA3n5uEnW4WxddHgrTVg0F6owpHyaQ28uyNFRwKbUK5td7rS5RDFOS4f3Qpy9Gp0VAFXVylxUtpzJqU8e4UkgfdXDgOVcZrH80NtGasEKgZjvuvTVxv4WBVsyOqIxwv/rpMKm/zNUXxRLeX57UFRfhHTXi/Oyjz+ImGFeMSuv3vS3tIE1bH89sKDL9u6KshjqClK5Gv0p47XSSMaHzh2WDG7SM4Lf3zuqwOv1v1iN2QECaYeBDRuroMItmpqftP4D09p3SylEnK8DeJ8MHPFJHbjfMCo0S1GIs6maKNycYKr2SBKPGnjFaPpFqPLIXY4IU5bEKur+soemPDVylpRL2wV4UnUdhMgQAaESRTNqln4rIyNUCZRJPROshq5F4R8dX7Iy+XIb1B1ctI/njVNP+87qirrJmol71qnRPRSJ02SXUb48/cAjXVKqb678/9MoTwjW/t0XXDWPWJFnXC/zc0gATFz8oZdLtnizCkjeXZkkM4v916lvcQ2Zha2GXT2ZC11NU/K20rYjgtyRg2RT3MRfgwtwymjGMl3lI4PG4m0DL63foVpBvG6TDnIp2FJXbBoBZLfaSquP1A8Yqr0fcMfRPeWiTCfCiKIaXVN09SAsJA/ZB+VjeC3hX5hO/PMDfYBzgaJFOCfpLCqaEVZi0MKPgFoXcCc+wyIt2aW5LyplUEB7DS4BKnckZM1SP6MJZfBBalEcpbsB0g2koZHBDtC6I0C0F7pEJedATUCG8jHNha8wOTKZf2+I/nvJP7UMER+kjADHuyqr6TFvSbch3H7zOqT+oVPaxTqLA8tQ45cTNjeGPLb4CghfHrvKqDqQDkpF+w0zBLFbrzs0Ab3OKfaF7nhVPn7Qp/g41pF3Xo7pv/HVXwIL6WnbQhyJmQsdxFnVjndzFzkNwoL+it2v/cBXhAFbacm385E44DEZNTSehxgofGn5Y4ShVeVd2t3hC167vpBMsyxf9ilvn0jYeA8CTK7+ec2H0jrCBNyBxY5",
   "sha1" : "5f9cdcb2a3e84c93eb031529eb7b3a05b1887861"
-},
-{
+}, {
   "device" : "Xiaomi Phone",
   "manufacturer" : "Mi",
   "algorithm" : "SHA256_RSA2048",
   "pubk" : "AAAIAN3C1onuaVOoEOIIpxRB4slj0xuKT7t2yrvDzvHQhOAlM8vz+rnR//6imJ+ET07/dMvAE893FM5LnFQLNcUJ+FYIGjbYdzFCVSYErfVTq96e37/sxVT86Zuz392q8OBkY4UFzpNdwwzWq6J+0tAsEyu778ECITiPceTJgol7IxzjIljHccK3ffP9dQf1FziB6BBTOQBKj26J2KCqtSmXM3Kk4GeV0wdCMZUUcuWXGrt0UjmrD+xHa8jSj9+YRb7BWe+RfYCXtqrAaree/Q24GAm4nSznDjfSH4T50JiNBkaeOf9YZwQlh67JtFZbueUP5prlQ3eXmubddodnA0LdDkOJooBHvMZAM/73+AWtsf145vMRUdtuvj5Dp9shR+kHaBoB78kQ2vUcrT7eetQynrH1TtwpXzXqAfzHRfv1tw2icvPnjFYV7m3njNcrb05Bx/oMvqKzrx99kCZEWuVm8un3gC/ucW9cXkAB+onTQnfJbeS5XcbEPcZkuQ0b7BepCScYnMrlOMSClYYl8OPNK576YRa2KQxdWEbdukihNIhaZhBN/tqdszA2w2960rO70ektljBVPP6m2jcT5iV0spMiers5KtqZ8cy++Urhvg0mWiuPcnue4L7W59lf9bJVlkaFrBfOHvxMdgmmrHCgZd9278zJrYDgFK17kojwSqqqwCkoFQ==",
   "sha1" : "b2a02f1e56e366d727a1a8e089762fe0b91bbc84"
-},
-{
+}, {
   "device" : "Pixel 7",
   "manufacturer" : "Google",
   "algorithm" : "SHA256_RSA4096",
   "pubk" : "AAAQAMzK1QHt1hQ63M2PaUFnvsCGwotv+i4QQuvHzwm+KydVQZZCmn9+7HpKsarbzo57sVelHojqQeTOvhGBF4DzztUx+IWIX4gor49MMgcnossbbMXf55Kkl/TXTSeWdwoxE4TLYUK3EYMr8xKY3vrraXD/mjUCmMv/hPDWqgLMt0HPX8kRCE8b4yTUQQgndgxioKAjfLY9gTIPb6Wl7RUF4cRgnvVthY+YhBpituQWGvBv47SFbDCtUK7F/aPlhhiXW2X01sh9HDbG0Z8mmTblUXFfcOVWYRm0kUPG3WunuAWVIqcxJ5Zy0NlbQkoC4LnPtjkVO7bEZ9/olJ9MiJPonuHg/baAHYxEl3TzQBDMNd/kVEG7y+0lyi9SABE/d5bdiWdEVi8Dg5J52phyK8bxV+qhXKVlYfN1EljWCCChLEbKa1zZ77eWbO4LN+UBo5wX3roAws2ATvcSUHCzhKFQSACV4X7QJSRFWIK+oY2/YmEkLYoIlD2e2smyZXw9is6eLb2+d+4LaNOG2BhvYRohsAO/Raei5dHQ/kKslL74txt6zJ/BucDrOdyyQNCpfuGA8dAcHFOnUXoDHLjGHBCHygEffbw+g24TlAj2MhIfnhOvdN6j8U8+7Dah9nBAhvtt+fPzsce01Wm/kQdtdqIbHo0EAURjLjaeKxyOPeRSKJY2ZJHU/zJp/FYnCQoeNA56zpHloYEMutNk9sLk7i2RbafnmKNA6G0sOMig1C6tYUoqlgUsQuT6s+iOpI0J0wykO91PW6kUYXXuf2yiuaZr7HJpm4DUX5qaAvK5cfdgxKHpxdkVODfImZh7XD3zNjdLVmiaVbzZNJmQpNnD1pXbYB4345xxAUDlFw7/2F3VFGiOpOGAukAXGXS4yxKqHxentAEZZU6E2Eaz58ajLAYd5tlSj5/IkVXJHGlw/Y0kja0UEBk3L3B9OFQYoMXBtdp6RwZQV5qtBkurYcDY/cvwYVZRWHA2AA0T1k6nGz1ZOnDV0fQeUgjnJB4u152wMSE+O1dHDR2hupNpYoDVQOZSpW+9z4qXR+FCL46zoTf2mMgqj3BM1b1gKQx1M43vzRACYpK3UsacVlZv090hpa9KVb9jKXriyp0irRKFt3rqbHEb/uqJC82yxerjKDoKIR1RS6T/P63p5GOZcKKdLeoBSk8Klr94sHa0LMfLSKzXgEveOxvqjyACAV+PZxE/Fe5VUfYt1sxGUEdcRoW54Z7TVioKwPKK+pByvX0y8GXstvuCJgdQawCUeI1JxzZL3V57uhK81Pc8EbsCDxglXqvFnaXvNs5NU20Arg7m2rHmC661CAgv3ScDA3pCdYXM2wj0byKXi6svW9pAj6ApS/pMtIWGhfUq",
   "sha1" : "572d31e590179862f896f8d71b93a39e93403d5f"
-},
-{
+}, {
   "device" : "Pixel 7 vbmeta_system key",
   "manufacturer" : "Google",
   "algorithm" : "SHA256_RSA4096",
   "pubk" : "AAAQAICxQRO/pQoucxxDsEeJDQkujdIIQtUDgRYJzkeF01P3gXqtv1sk7OPpoAj38qz0UkXwp7DV8TpxnimbwoDCD/tukWeFskGTgSYWIDiRAGAAsmuwpFVYogAwoHYxZsQYo6KFsWaiO4kIauilr5yu8GjwmhOy5Loz1+89fuEAA8imhxMN+SqlAMTZ+nFuPj2OiS+QkffhK2Vc2gU7lJgJArGi3ChHuVAWkf58HsT/nyf4IxEsKpiv59TcN16eYENyWZzRRXO0uqHQktzQRs3AvuWZYm1W8AHO4rNRPwK9DlC7WofDZh8hnBOPXDNna5yBiWAwDTgLL8NX5nI538BiOAGYtcnTsDqa/dgKXtGjqt4BYv2EEb0JmhczqDpwpwF1HjyaF8iokvPgk2E7I5FwY0wSr7QRJhTDsnVUlETDZAnc9AvmlWwUNrbF8FGU0IkyyPCeGpPwJOFTQdBDDYK9GtCxmiWriFJRGLcumwmj+vwC0AJJlVaeDiZcb67RgqIOxWvXC4gYOJSTdeMQRqgfhu3+Opc139SIUPRNz3AgmZJW7t41aurUz8x7B0zWleYffZRndUvUIwnj04zO4zVFeEwOLZc+Jp4WDOQwLWUps+AuS7oYzthqmgucNRKgEffLHnVIlcgW09uKyx9aaNgZDQihNWlJkVVpd4Y6C1BQPsatIo9O5av2gtH8ss+Y+F9Q5/evYIVOLPr+vXRPKguCW6tCACi6DEJAebNK34Kq9a12cNrGvGHGbyIvwbIvqzGsyXUNeNwaKQMhOHF6qDsbPuy2y2JPeAljdV2AdNyGNe5MFtEPNDDOxl6HW/GSdo3noHVca/n9kRiKtK6BAgchj5qFa2p1SwNmAp6HMY8YtQ/5/c+25aIX6OUoQAFcIH/4ZfQcg99np/vk6MLq89sk5b4ch6U17+xoGYGXf3STkKle4XFV5XRtFaEOJWxAZdXyaTCm46CChMfwW1kwcBB6NSTGaJHd510UDYSNKTwE4p4oI+PcMizOThNF+MLnOBJH6T/0Kt7DGiDmXz7BbNudPqM2eYKMHkBr3RG2xzBHyRC9HjQVmp64T8C3XxsuOofNS6tiZq7Yr781nkn3aXMAQ/ElucBj9awyPi1yuYsgwm6+yZUGdzbf7azM9PEhAHGyEogGUGTLq4ty6lsuVerpbgjn9sM4H/hDWd6m1Bt/PHZV7sFYRptjUJ8g1ZAxUV8zOe8RdreLlxHfkIyKYGTZV0FO5niE211QAzhZr49jY/IyCdFECZnA4zV5MxiOz5ssMmZWJOIG7p9USbCtGBxKbjNptEyeimiouuy5t/GKBmr6QQY1l0w8sfdUQyIy/rgQgCeqwHZcMjZdJcm1IRrm7eyFjLc4",
-  "sha1" : ""
-},
-{
+  "sha1" : "f88ba4bd6e5518bf185ce8106c6a9a1b997c0c20"
+}, {
   "device" : "Pixel 7 Pro",
   "manufacturer" : "Google",
   "algorithm" : "SHA256_RSA4096",
-  "pubk" : "AAAQAEnai4emBts8xKHH5hbkA/kKbIf+BAdgbGeWPJGs/c9M/q7jBvp0iN2yER93RWPM3sgCb0NVpwgAhB0kaKRNm9TtbA0CdzB/k+wCO38/sr24t+eBTCka0bwgxwUD0TGYNS5tZLB595jnRsM/zMxp6J5aus+pyqF8wDejJH3WCjIy2aQ3yM6xn+8qJGL+mRrpgtTG6q3rjWupuldAsS5X1ACPnekK7glTL3rOXE32wqCeDH3fVpUSZDoZB9vo/qoj29nU3EwCnGWybRfYo1KPua4IaKDcUnOhxe4APHKzwzN8dwWzu5aN3TWL9kvQ8UXLMghL+CsXmdZAHjhfCJqquuwilFNpbMGDlyq0xkZ3zlw5LOLzJMaPiW8KiYfJFts6bsazYlVCOzsd9VyrDBLzmpgob3QXzqanwZTWGLJuyksTVUwDr6aUIJRqf2Ly/jEePoYZSElV9y90j+SEUabLO63VJD1Me1APW4D7UNUOa9LH6sNf/ZkLlHVk+bfFh1ChtgypeVQzgxsuqgZELKE0rreQ6v+MPIyJRFohG43fCz174SDZMJHIx8CBcae6yZSDPJlxWvqwB0DP5TGPps6XcRyIASAs2WcDesQ+ZTzvc1UMGCkESfs0/H7ytiFwd3jC3m566y5zkS/rKNtM8Ya2zh+emg8YwcENOpZT2VlKobejT661ySunWX+3Saf8CX+apSYm5WuTaWHu1BwY6r4hX+AWej8aGjFjtscDr1ZYb/l5jPQmcaMUzHpSfTvq5dCOrrShhvvRZw/2di1HRR76YexlshR3ikehhlGHGFAQs/vuZ84bJn3x5RtPCZ92vxTsMpnj4vqyZD8OSqdcxZoG3ZFLtfWBcduOIBg1mN1AGSNQdwlDbtL+X9FhI6tHZ3to/UMZy4jYxJ8tIePCqPEqQnmlg+Dlt7KeChU9BpMH4CkqBKZIN9DFk4mLk9NS6heabR1GW0u15G/oKBcmxcUYgtIpXmHtfzL7avwqS5F086vBmkcp6AX903GZsabZaIET/2AcWgLUAW+SJxq+IlP+3YGAWJC4pPZZRyBcmsvC8aslnrn+oZYttfNTZcOxdaSBgybG5TR9oITQYKyChlmJXVIkeDYneQkQP/dYwWgKK5HVF/mc4rpq6tQIU9ePOp/jWh6jOHlRpzjHaQwJnKnVyJ+FOyvgY8KjK3U4LfZu4XPpVJk2pY76xzjE/YbqDE5znb/4XyaEpuC4TmTVeswl97rCn+wlYTXWn3cllKkSne2KhKidW9XKG1BssoFiqNgM2CoW25+HHxhgEwoXcY41Bim7PhG6E7ByxjYtTr26M+PBDn4ONDACAQBqhPDPalud3ljHmQZV4SSO7PG/TB2naAONav3q"
-},
-{
+  "pubk" : "AAAQAEnai4emBts8xKHH5hbkA/kKbIf+BAdgbGeWPJGs/c9M/q7jBvp0iN2yER93RWPM3sgCb0NVpwgAhB0kaKRNm9TtbA0CdzB/k+wCO38/sr24t+eBTCka0bwgxwUD0TGYNS5tZLB595jnRsM/zMxp6J5aus+pyqF8wDejJH3WCjIy2aQ3yM6xn+8qJGL+mRrpgtTG6q3rjWupuldAsS5X1ACPnekK7glTL3rOXE32wqCeDH3fVpUSZDoZB9vo/qoj29nU3EwCnGWybRfYo1KPua4IaKDcUnOhxe4APHKzwzN8dwWzu5aN3TWL9kvQ8UXLMghL+CsXmdZAHjhfCJqquuwilFNpbMGDlyq0xkZ3zlw5LOLzJMaPiW8KiYfJFts6bsazYlVCOzsd9VyrDBLzmpgob3QXzqanwZTWGLJuyksTVUwDr6aUIJRqf2Ly/jEePoYZSElV9y90j+SEUabLO63VJD1Me1APW4D7UNUOa9LH6sNf/ZkLlHVk+bfFh1ChtgypeVQzgxsuqgZELKE0rreQ6v+MPIyJRFohG43fCz174SDZMJHIx8CBcae6yZSDPJlxWvqwB0DP5TGPps6XcRyIASAs2WcDesQ+ZTzvc1UMGCkESfs0/H7ytiFwd3jC3m566y5zkS/rKNtM8Ya2zh+emg8YwcENOpZT2VlKobejT661ySunWX+3Saf8CX+apSYm5WuTaWHu1BwY6r4hX+AWej8aGjFjtscDr1ZYb/l5jPQmcaMUzHpSfTvq5dCOrrShhvvRZw/2di1HRR76YexlshR3ikehhlGHGFAQs/vuZ84bJn3x5RtPCZ92vxTsMpnj4vqyZD8OSqdcxZoG3ZFLtfWBcduOIBg1mN1AGSNQdwlDbtL+X9FhI6tHZ3to/UMZy4jYxJ8tIePCqPEqQnmlg+Dlt7KeChU9BpMH4CkqBKZIN9DFk4mLk9NS6heabR1GW0u15G/oKBcmxcUYgtIpXmHtfzL7avwqS5F086vBmkcp6AX903GZsabZaIET/2AcWgLUAW+SJxq+IlP+3YGAWJC4pPZZRyBcmsvC8aslnrn+oZYttfNTZcOxdaSBgybG5TR9oITQYKyChlmJXVIkeDYneQkQP/dYwWgKK5HVF/mc4rpq6tQIU9ePOp/jWh6jOHlRpzjHaQwJnKnVyJ+FOyvgY8KjK3U4LfZu4XPpVJk2pY76xzjE/YbqDE5znb/4XyaEpuC4TmTVeswl97rCn+wlYTXWn3cllKkSne2KhKidW9XKG1BssoFiqNgM2CoW25+HHxhgEwoXcY41Bim7PhG6E7ByxjYtTr26M+PBDn4ONDACAQBqhPDPalud3ljHmQZV4SSO7PG/TB2naAONav3q",
+  "sha1" : "5dc124fbe57e84081995a14f5cbb6bd7cc30407a"
+}, {
   "device" : "Pixel 7a",
   "manufacturer" : "Google",
   "algorithm" : "SHA256_RSA4096",
-  "pubk" : "AAAQAD45w23yHh3LbKgtav84KBVd0rRtMLL7djZPa+7w2dKJWY3gzJCvoXUhCUpqR/zVpCYHt+Is9xN4DciRbXMYwiKBEFGV/N/BvPDth7Dyf+UB5P9sbB1CE7eh9NPieT/rD85F+gNNG07exXb0cmu4GoL4prH7UHWsnntFmu22oGNTjBKYnKRnNjbP2/8Hp6qAiiNNwxlPllXHRoqZTtfMJ1g8ON7STZE9IKOEACVmXbzuda23UfayGUcMQZEZru+6drhh47H9BI6j3Ds56twb8yqcuRFt1+3umxdKIPypZHLbDcZ3rAF5O1hN3Mx8jZlb9KwhUdE/QA0irv98Miv3TT+OYYFB4E4JTfM12i9mZLxEecytH2SzXU1gCZXtz0UwnZthELeahrd74Mv3lI64y/8BVbSk2MiXb+s+VhZxnYOVHCQVX+jrAz00/dTqRsFRJI0HvIXltBrEcLO7ChtOeuBaIERF/Nj1p03dmL4LD1xuCIfqIwcy5VrqnLnqoobNwZDjauLjF8zLiYzlKYoUaPVeFX1AjHs7UrOK2WTdqlR/G9JiAOsKWN9tHp1S6PLQpZBIl8c5DVtzcPO1HZyn8KUeEM9yIHPOqAlVTbBA5rozP4w9SKqqk3HQAcxd8wX2n8ZPLyYL1uljzdFEk/bm1bvXxD/ePHDyw5bkPv7NGvayoQhBm9dqY6pGp9K0vMZgb95OCEsy2zRU/b3aeZHO0dzophwnERJ4Or/Triyt70ljltR6katbrEY3upFG1Aq1hI3IkcoXB2h1zODlGD6fm3zsL15/wTodi4G8h2cOWSdCWyyfqsTPH/pXw21aWvoT9OwI+E+Xoq//VDc5FgkP7u8nK1keFDjGH3YswsNpdZJQyz+MPmH41zrbGRKkAt1Cy3SGesAoQDP0b3BbP1l9muPz7cj7gTE1P8F7QTYrjGKh2oZehNsMXRRMw8jNk4ZWT69XDfd3LTPPX7YPWcChMUhAcuCBQmMZeJYY+oBNRM/PVgYQn5OEYZnE5TqUXWbUFSamnF7zPyfno1Jym7QNlAeTILYAay+LmIGDRAkXiArZ1Wb8qBvtpNxGY/4qPEcITNOT3LbH91P4xzNxATGhguq2n80h1reBikMmo132gxyX0mLpa2HRPuXAVdKDIE+fWj1ksHc5xrVs2hhizbllgmmgQ8j/gxuf+Gd3R7Ou9DM1fRgiJ1r8UxAJe6ZgIuLut13g2ApexbADWHqRo1keYd2dWP7adj+GQG7H71rBTGmvKs/uczYUWFgdWr3HElsiRnWucBkZLG5Ty65nFUYsBZQs3I1PLZ92yFYinps20BA0nHVwZgttCmByx5KzJTy5EEtyZBOGklUUkNHY/5p9WxEayEl0"
-},
-{
+  "pubk" : "AAAQAD45w23yHh3LbKgtav84KBVd0rRtMLL7djZPa+7w2dKJWY3gzJCvoXUhCUpqR/zVpCYHt+Is9xN4DciRbXMYwiKBEFGV/N/BvPDth7Dyf+UB5P9sbB1CE7eh9NPieT/rD85F+gNNG07exXb0cmu4GoL4prH7UHWsnntFmu22oGNTjBKYnKRnNjbP2/8Hp6qAiiNNwxlPllXHRoqZTtfMJ1g8ON7STZE9IKOEACVmXbzuda23UfayGUcMQZEZru+6drhh47H9BI6j3Ds56twb8yqcuRFt1+3umxdKIPypZHLbDcZ3rAF5O1hN3Mx8jZlb9KwhUdE/QA0irv98Miv3TT+OYYFB4E4JTfM12i9mZLxEecytH2SzXU1gCZXtz0UwnZthELeahrd74Mv3lI64y/8BVbSk2MiXb+s+VhZxnYOVHCQVX+jrAz00/dTqRsFRJI0HvIXltBrEcLO7ChtOeuBaIERF/Nj1p03dmL4LD1xuCIfqIwcy5VrqnLnqoobNwZDjauLjF8zLiYzlKYoUaPVeFX1AjHs7UrOK2WTdqlR/G9JiAOsKWN9tHp1S6PLQpZBIl8c5DVtzcPO1HZyn8KUeEM9yIHPOqAlVTbBA5rozP4w9SKqqk3HQAcxd8wX2n8ZPLyYL1uljzdFEk/bm1bvXxD/ePHDyw5bkPv7NGvayoQhBm9dqY6pGp9K0vMZgb95OCEsy2zRU/b3aeZHO0dzophwnERJ4Or/Triyt70ljltR6katbrEY3upFG1Aq1hI3IkcoXB2h1zODlGD6fm3zsL15/wTodi4G8h2cOWSdCWyyfqsTPH/pXw21aWvoT9OwI+E+Xoq//VDc5FgkP7u8nK1keFDjGH3YswsNpdZJQyz+MPmH41zrbGRKkAt1Cy3SGesAoQDP0b3BbP1l9muPz7cj7gTE1P8F7QTYrjGKh2oZehNsMXRRMw8jNk4ZWT69XDfd3LTPPX7YPWcChMUhAcuCBQmMZeJYY+oBNRM/PVgYQn5OEYZnE5TqUXWbUFSamnF7zPyfno1Jym7QNlAeTILYAay+LmIGDRAkXiArZ1Wb8qBvtpNxGY/4qPEcITNOT3LbH91P4xzNxATGhguq2n80h1reBikMmo132gxyX0mLpa2HRPuXAVdKDIE+fWj1ksHc5xrVs2hhizbllgmmgQ8j/gxuf+Gd3R7Ou9DM1fRgiJ1r8UxAJe6ZgIuLut13g2ApexbADWHqRo1keYd2dWP7adj+GQG7H71rBTGmvKs/uczYUWFgdWr3HElsiRnWucBkZLG5Ty65nFUYsBZQs3I1PLZ92yFYinps20BA0nHVwZgttCmByx5KzJTy5EEtyZBOGklUUkNHY/5p9WxEayEl0",
+  "sha1" : "6690bcc2be14ff28a1622531a940bcfffc4382c9"
+}, {
   "device" : "Pixel 7a vbmeta_system",
   "manufacturer" : "Google",
   "algorithm" : "SHA256_RSA4096",
-  "pubk" : "AAAQAFH4m2nVzHTbT2t/hyOzB8ShVQz6yU+q4r0RYykhglRyCv3bcdcct95uROiCYyhZTB//G0IN4g+U4ifEdvaMQo3wVg81Lyd20FZvZE0/giIdWtcjPaKFux+0A6Kb4iyfABwNnVoX6ZSPHRpBjSlvjp0PBekB6EH9RnPE8eNW/roqE5IItIJsbASvyOPhDN/DZO7a507v1TXMjGNNU+1xJNi8glW0ilEwiwaB4TLGQd6jEh7NM9Be0HVKI6OSEACbP6xUA+9zVJNGvchi5FcYhi5TVnBPDSGScYvCpMdiNKFvGYpcYhgpXmR7WhoeJKwQ40umLAfho3YD3w/iJVCWopW5hx44u4dPFfE7cbI/Za9EJITF/3S8hXcesk65bNYngIslWW4id6FhRhvQxPMNolJBnnqwDjN2cjA711+6OVxXg8rQyqxigrM9a9AKr2BZIKmyoaJ8mhcIcapTC5dGIZnyB0MLYWatelINj3xdpYRYzFpzstTdnLjkPSvbo135UIwWX0puiZz4ce7mH1ChE4NlvZ63X28gPui4ZLmnJiA+OF7/UWU+AlJDMriHkuj/M+C7sML9ZQsR186Sl7iK18sLSaaxD0gpvhF1pt68Ylar54furCjOvxuorQ2dN1Q/z+5ThpQFhPIVZ5wyaW5kD85plVk8utrY1lfFeLPwgLXAMpJbJyvxPPMqLxf5ZLYWwA4TdWMYSTkIzz29vG7rnrRIGkPqpi/rWpAHzC5iZK0mTJq8UJAggbzCVSkXcxisfAfwU5gLl8n+cy58+slQAXFDmGNHKk1eFZ1y2TTiwydo6Qv62bQfsW58I3D1PkI6Zdw65sUeJhO3hIkY40S+sK2wiZcO38gIgHG6720eDAu0oFU2DzuhHE0XxPT1YhlKbkBs8r7c47lXQGmShXkC3IeGKpHJxpvvARRlynTrvsW41KJvgNB7TEeUL8Xm1jsMFusS/+PN6ZFXMYGNYpP4ZtG5IWi2T5fPQlM7YyB8ltPaEeG9HeVYfda+xg1XGdOzxjDvGeM3a+ozdAMdtAidzi0dbKLTwe1Wd6RtRxE/Wo+hVIFS/8C6QIi93kvXJ4oz2hwCvuuGUzRDcUg0HG1jnFEkqBgC9pIRsGEX1Z9lfJDB9R8K7ZRvXwJavEcDIT9D23/bXdWfuUq2dTFMmynlRb/04G85DRi7sbrjmVYCPbLRH9fMeY7R5qvcsWu/FHCI8BrJNZPfyFMEtzZSD0CKRKmTSyxLrKstY28AkO0odzRhji/sq9h/X4r/FqvJLD0qagAiVhAW5CuR2N26qSQ41z7WGdISoQdZPSbb5eNKnzRNHgqAYoWWdTaiZalyeh85HIvd3VsB2E/o5hozdozCGjacFQk9"
-},
-{
-  "device" : "GKI 2.0",
-  "manufacturer" : "Google",
-  "algorithm" : "SHA256_RSA4096",
-  "pubk" : "AAAQAB696fOqmcvPXp24WvrWaiOAGtKfhdEcA1qb8i/z1aNA7pMnUaJrP+eWn22VfnViO9+OhvdM6c7+9f6BtThWfyMgtYhGC1iLwBdy9ywNOqY+/AxLKv5IpCCAVL4AyRPf+22ETAjyIqdDykGCRC6LWIGXoWT+fBuZaGGQ635A5lqp1ZhMvaCaCd+fJpZ2NvymO3RRISZyhMaVSMJbGi3p6aLT8NuAzk7VxMIooBV5U5FQ3ExhWSakrjR/zoyFVazzhBtywAv/dXSxivaN/2BpoEXUWlZShk2A1hNkvxT2vIslxXhKUyo38D3f328bDDl9j6hdrZPRwd/iZFH2sWsnzQNZ1Uq/CWIqJxr73sZCx0+EC+h2nYGrhUxPeY1M9ST/bhRroLb67JjGwidKo3LlX5BAysTiUj0jevYmEMRgzCQERxWmknNI/FpySAkAvxO2h9eaJtdcU34MfI62xck3p3rpp+jv88OTV2xUsmaPU2WCVuECkZALzKwGkVpc9uuTRBtviXOpqZcmRjKAcVg1bWFqEsgAONzwyLSUMNkZQbidz+MAObmE5I4NpqDXFU6nz7XWXfKbKQzaG5Mg9TGacBSQY4+dubeUJrO41FxtjHHzImvaLfXD+/EGbaaeqGAjB2Vo02v6dBCXd8bOyOL0rq9kzfTmfQQHjUaEvfGxE1mVJb8oxZ/EwsMVoCj0oz8cgGVVJg65JfvHjHnUKGwWHg9jQIedAZawHvRcYlSulh4BvfiDsHY9zIT5NkZ5gNXP8BFVsXMhX/xWYXa39Tlls2eq6n0s3B/YU+myyYiOL6QFsoNB1QX1fNkZKAgEQpcwRapXHHlvRwdKP8FscyLKmwdBfKg8RZeIZ/9TXL49mq3ocbfrX8se/DdPT61V2nGbApmPErcCrgtbUrxwV1a4LI3C5aMP+52brzOrUYLMeotd8xFgZj1DVgP0nKmuYeq2kzgeTOBWud53KQ+qBcegk942LGGNr1BSuBynkBywTm7iZHidjONcJUgiaB+NnCYewbLDwF21bRphkXthvak/Di2KcVugDUOGblb6X4XNR++ZTnZiBw6IbY85eL2YddPJg4ZH1zNIWa9rRuv9q6VWX1XD5+J92bd34EPuMLrmGvXgYpbfzfuqqLGpPBvbqoRfdgHe7CSe0xa3lDePOTll8sDsKKnr8jOW9CvsbS1s6+x8Nie2UFPwsb/LvfmhhsRTmlZaESRltCOjdZ+XbnSaCw7of/4oQfjk3gLiFNlH6uHDOTdi/QuFsGselWCi8I3NsMf57+1FXiQZsXbR59D+uooDC+J75IDlp2/fkBOVsyTEXe3C4gznsbvoN9GjzkAEo7uti2hjTwhaXHTQ2o3T6XpEBQzj"
-},
-{
+  "pubk" : "AAAQAFH4m2nVzHTbT2t/hyOzB8ShVQz6yU+q4r0RYykhglRyCv3bcdcct95uROiCYyhZTB//G0IN4g+U4ifEdvaMQo3wVg81Lyd20FZvZE0/giIdWtcjPaKFux+0A6Kb4iyfABwNnVoX6ZSPHRpBjSlvjp0PBekB6EH9RnPE8eNW/roqE5IItIJsbASvyOPhDN/DZO7a507v1TXMjGNNU+1xJNi8glW0ilEwiwaB4TLGQd6jEh7NM9Be0HVKI6OSEACbP6xUA+9zVJNGvchi5FcYhi5TVnBPDSGScYvCpMdiNKFvGYpcYhgpXmR7WhoeJKwQ40umLAfho3YD3w/iJVCWopW5hx44u4dPFfE7cbI/Za9EJITF/3S8hXcesk65bNYngIslWW4id6FhRhvQxPMNolJBnnqwDjN2cjA711+6OVxXg8rQyqxigrM9a9AKr2BZIKmyoaJ8mhcIcapTC5dGIZnyB0MLYWatelINj3xdpYRYzFpzstTdnLjkPSvbo135UIwWX0puiZz4ce7mH1ChE4NlvZ63X28gPui4ZLmnJiA+OF7/UWU+AlJDMriHkuj/M+C7sML9ZQsR186Sl7iK18sLSaaxD0gpvhF1pt68Ylar54furCjOvxuorQ2dN1Q/z+5ThpQFhPIVZ5wyaW5kD85plVk8utrY1lfFeLPwgLXAMpJbJyvxPPMqLxf5ZLYWwA4TdWMYSTkIzz29vG7rnrRIGkPqpi/rWpAHzC5iZK0mTJq8UJAggbzCVSkXcxisfAfwU5gLl8n+cy58+slQAXFDmGNHKk1eFZ1y2TTiwydo6Qv62bQfsW58I3D1PkI6Zdw65sUeJhO3hIkY40S+sK2wiZcO38gIgHG6720eDAu0oFU2DzuhHE0XxPT1YhlKbkBs8r7c47lXQGmShXkC3IeGKpHJxpvvARRlynTrvsW41KJvgNB7TEeUL8Xm1jsMFusS/+PN6ZFXMYGNYpP4ZtG5IWi2T5fPQlM7YyB8ltPaEeG9HeVYfda+xg1XGdOzxjDvGeM3a+ozdAMdtAidzi0dbKLTwe1Wd6RtRxE/Wo+hVIFS/8C6QIi93kvXJ4oz2hwCvuuGUzRDcUg0HG1jnFEkqBgC9pIRsGEX1Z9lfJDB9R8K7ZRvXwJavEcDIT9D23/bXdWfuUq2dTFMmynlRb/04G85DRi7sbrjmVYCPbLRH9fMeY7R5qvcsWu/FHCI8BrJNZPfyFMEtzZSD0CKRKmTSyxLrKstY28AkO0odzRhji/sq9h/X4r/FqvJLD0qagAiVhAW5CuR2N26qSQ41z7WGdISoQdZPSbb5eNKnzRNHgqAYoWWdTaiZalyeh85HIvd3VsB2E/o5hozdozCGjacFQk9",
+  "sha1" : "0d783fa67143be62c899029d33f8e4a8f1df5492"
+}, {
   "device" : "Android 12/13/14 GSI",
   "manufacturer" : "Google",
   "algorithm" : "SHA256_RSA4096",
-  "pubk" : "AAAQAMR2F3OdWxaZ3gHcVYO3vMcw/d6UTo5j65MPd5a0/w6V3qLyOtw92OuidhUtvJgx6fBoG9aqjXMcrQkpwLcl630/VFQd+VS75Oqe4joEmxVe3LBY+n4BjUdvbegSZpanzD/lRBht1/6OR4mtMe2jfev1t3DQLroglH7+Ujb9lzL/O1TWLrZ7Lf32N6wH/KZZdnpLKGIaUo0pamQb2njYj5F/kx5Agm8j2ffnCKmYrRI66cyUhOZm5jsOFrdVTwM+CcXn1DNNkvYs5mr4WTpNiPhpOMEKC50Xrhq/H1U/L836nW5q2ZTUhEMYCxbcNS9ezAVyxe6vLLnktb2onX7NnJ+5MTzN+erFjVRHOdBESSwDpcPJANIP3us9bporBtgrIvE1+g+7R5pNsc8kBQ2wyuMfodlt45n2kYIgncKRgfE9AHLhePyoWUcrVewaWgXjp0F9qFeXLOTg385PLdulvxW5HsZ43+oeY+sz6jjJQI19wnTYXS0geb5CrjRFgsP9rljud8K52lqdmi8yV49NkHr2S18nt6cIj4AsCiVLY/9x0Qr52GvhP/nzqr2lYm09DDPlfDonR9+xzKpC78fRlbtQHjESc63uFa0FNS3BkCv+2t8wK6dJtkBAoxNhm2KgfQ3z6K610aBomur7y/N3bcA6OkWI0Agtw9ts4NY7TYjOxI4aRUBL3WAtZRXt5SWsJdbDMja36lDSq28/LksLeKXiTQkr+r9HetuAak3Zyi0a/EbWElkmOBh+h83IE0XtPTytixaLqAV+pLY2UPFR9H87vbsgXnns0f20qEQwlAqypbrtqEj0Cen+ZTQhuGin4EwuQMfJwyI6CNdH01gmUUTvOB2BITOouN8Utukw51fivDaGOCPIGwCUKZkdqR3EHRNb9DqpWXZm+0SmFh+1nFlWQB9gulMC5PTz2RZ/BpJcUoLRe6x+3aDxEOcyTLIC3KG3HDYmGDDpLoLhVBNXer0BECyJ55tvIXYy1PjROgn6CGO96R5ygbWEavrSq2sCa+H5aBfwKf/SBFtYGxyd8504s5SYDFDzF1SHVpnKYyHiDXQUnvoEszHYGpKeNTcV3wL5yB1X/jJr0Tz+r8tG5AkzAfQukCV+xF44vvGZzCx4xUCufwoeMFhnjpU0S4ZfLDC9XycNZR/E/WKhZhPQ4hBUI9d/QyvoUiuoHqoWWYbRU4kyvhHdy6s69pBNNRJdFH7LSmotqA9eDs8NYkiJa/ritElk+WNS6Q5E5Li4MpEySwsQznmvm9SDXxBsAfU9sMeWsYHgMPrEehV6t7iSfdS59GNyamotkPmOyaczUALHuDnuLojMErMHtIewJP40tyBodWs+FkVkVUJYO6r9A5Q7mLmE"
-},
-{
-  "device" : "qcar-gsi key",
+  "pubk" : "AAAQAMR2F3OdWxaZ3gHcVYO3vMcw/d6UTo5j65MPd5a0/w6V3qLyOtw92OuidhUtvJgx6fBoG9aqjXMcrQkpwLcl630/VFQd+VS75Oqe4joEmxVe3LBY+n4BjUdvbegSZpanzD/lRBht1/6OR4mtMe2jfev1t3DQLroglH7+Ujb9lzL/O1TWLrZ7Lf32N6wH/KZZdnpLKGIaUo0pamQb2njYj5F/kx5Agm8j2ffnCKmYrRI66cyUhOZm5jsOFrdVTwM+CcXn1DNNkvYs5mr4WTpNiPhpOMEKC50Xrhq/H1U/L836nW5q2ZTUhEMYCxbcNS9ezAVyxe6vLLnktb2onX7NnJ+5MTzN+erFjVRHOdBESSwDpcPJANIP3us9bporBtgrIvE1+g+7R5pNsc8kBQ2wyuMfodlt45n2kYIgncKRgfE9AHLhePyoWUcrVewaWgXjp0F9qFeXLOTg385PLdulvxW5HsZ43+oeY+sz6jjJQI19wnTYXS0geb5CrjRFgsP9rljud8K52lqdmi8yV49NkHr2S18nt6cIj4AsCiVLY/9x0Qr52GvhP/nzqr2lYm09DDPlfDonR9+xzKpC78fRlbtQHjESc63uFa0FNS3BkCv+2t8wK6dJtkBAoxNhm2KgfQ3z6K610aBomur7y/N3bcA6OkWI0Agtw9ts4NY7TYjOxI4aRUBL3WAtZRXt5SWsJdbDMja36lDSq28/LksLeKXiTQkr+r9HetuAak3Zyi0a/EbWElkmOBh+h83IE0XtPTytixaLqAV+pLY2UPFR9H87vbsgXnns0f20qEQwlAqypbrtqEj0Cen+ZTQhuGin4EwuQMfJwyI6CNdH01gmUUTvOB2BITOouN8Utukw51fivDaGOCPIGwCUKZkdqR3EHRNb9DqpWXZm+0SmFh+1nFlWQB9gulMC5PTz2RZ/BpJcUoLRe6x+3aDxEOcyTLIC3KG3HDYmGDDpLoLhVBNXer0BECyJ55tvIXYy1PjROgn6CGO96R5ygbWEavrSq2sCa+H5aBfwKf/SBFtYGxyd8504s5SYDFDzF1SHVpnKYyHiDXQUnvoEszHYGpKeNTcV3wL5yB1X/jJr0Tz+r8tG5AkzAfQukCV+xF44vvGZzCx4xUCufwoeMFhnjpU0S4ZfLDC9XycNZR/E/WKhZhPQ4hBUI9d/QyvoUiuoHqoWWYbRU4kyvhHdy6s69pBNNRJdFH7LSmotqA9eDs8NYkiJa/ritElk+WNS6Q5E5Li4MpEySwsQznmvm9SDXxBsAfU9sMeWsYHgMPrEehV6t7iSfdS59GNyamotkPmOyaczUALHuDnuLojMErMHtIewJP40tyBodWs+FkVkVUJYO6r9A5Q7mLmE",
+  "sha1" : "1ffb1af796b18ebf40d18faed213f686720f73f2"
+}, {
+  "device" : "qcar-gsi.avbpubkey",
   "manufacturer" : "Google",
   "algorithm" : "SHA256_RSA4096",
-  "pubk" : "AAAQAGL6Cpu6jstCSfiylEV8LXCpKCMzYhgSLT3ORW4fRLCRet+2sPW6J0KFUkXYIB3iwlaNADGOMU/l+R3mZRAK3vIQ+RFLybU9lKQVCwK1Dn95k+jLviRg96sWL0/O7gELYx97FlI/MkfxEhzfZXzZfE3jKPROJwls/TnMGhFE3hF5rlvxZiEhRkbmrTFdggpiLrhSTIcS2gx5moeVbJkLNzfydnRGVtD7hkv2k519Vga8o67q0GCVscrJYkPuwm/HBZSQZZq0QZK/b1+GSucfLaEaxLJg+yteap1xaoh16llF/V+U45jodW588N/apt2QSYC647QIRJMMRIUNzruCGT1qDjrHx4IwqjWt7y7K21LSEYeVVZRS2YycT4ORkKwMY5nkyz3yxN3AzYhRt0F2vp5dK17XNLZgp5M8FVqYyZ9TCYx33Y7ZpR3ILnvPQMQQxi3s3jWKa2s1Vp2eAwMEIGkj24lGcd+ZnMWJb75EhkJghtj+EVq4Dugv4H31KuU1QKuo4Ttc8TASRPuwwFKqzOPGfoQgFgbqK5qSrjp8+khdd5g1lCRO/IbfXKeoFXxfI7PVgNxziEWuObwVlNmZK04I6p9wnjB/AeQo1a8nSOcfCqMkYc+Ee7NBE68WCFoPwCXCY/kWY3cefj/gbyj9cie/w+KbufdtYSe13bM9C/QTsUY0bVfhGX+2ak92aOR8caHWAM5lESOlmbSPJk86wXYPOF8sXIbRecw6B2X8m1h2+y7At09xTtCt1++DY3UqbgpFxcjy5mAIsIkw6VNfGujTu795CTsK3sZ1prA0KmhQ+tjZ5kFALe9zwDJIIEoqGtpL+oqKTa0xiGYf5pMpSvtSsAEWbuibttpkOqLUZA6l2kYsIeMaeLb8SKj2jOxiST4b1eTtKUYp1Vf/v/vfAzhnk8bd6mB8FVfdLRCD+tKDbVZHM8dYki/jhX6evyzCPvYfnSslP2iKA2oZPIB4KZT+0Bs70TK/gQ0VY6Ydlw3pwxzKkEc1kvhknKBm7rN7nuvlIhEKe8d/e1wA97JoiK7fSuCHW9f3aJdaPs+HKAPc3r2e6OO1dTixaLal24l3YRsxOWljH4bapf+FJwyIFwcV9c6EENsA65mjSzFPPfSbszrnmbLQPWydMRKn/0M7sU62izwGiAw/2RNi6kMNY/7VCKJTRiUOKlusxP0I5I8nKLoL1AxjJ8sBXk0P+zlTHKjJf0Ku2j13XlEXxXqR5MsYnHL9evW6QLpHu9dE5sFqxmhb7bP57HEUWPxg6QBq4CcZ92tgYYlwMDbbQPgVHh5s+47hXxAk3BmlxaW6W6vJTuGmnGtBdMNHK4xQdZREypSutVAvKgoY6RmShqIzG18c7vG/"
-},
-{
-  "device" : "q-gsi key",
+  "pubk" : "AAAQAGL6Cpu6jstCSfiylEV8LXCpKCMzYhgSLT3ORW4fRLCRet+2sPW6J0KFUkXYIB3iwlaNADGOMU/l+R3mZRAK3vIQ+RFLybU9lKQVCwK1Dn95k+jLviRg96sWL0/O7gELYx97FlI/MkfxEhzfZXzZfE3jKPROJwls/TnMGhFE3hF5rlvxZiEhRkbmrTFdggpiLrhSTIcS2gx5moeVbJkLNzfydnRGVtD7hkv2k519Vga8o67q0GCVscrJYkPuwm/HBZSQZZq0QZK/b1+GSucfLaEaxLJg+yteap1xaoh16llF/V+U45jodW588N/apt2QSYC647QIRJMMRIUNzruCGT1qDjrHx4IwqjWt7y7K21LSEYeVVZRS2YycT4ORkKwMY5nkyz3yxN3AzYhRt0F2vp5dK17XNLZgp5M8FVqYyZ9TCYx33Y7ZpR3ILnvPQMQQxi3s3jWKa2s1Vp2eAwMEIGkj24lGcd+ZnMWJb75EhkJghtj+EVq4Dugv4H31KuU1QKuo4Ttc8TASRPuwwFKqzOPGfoQgFgbqK5qSrjp8+khdd5g1lCRO/IbfXKeoFXxfI7PVgNxziEWuObwVlNmZK04I6p9wnjB/AeQo1a8nSOcfCqMkYc+Ee7NBE68WCFoPwCXCY/kWY3cefj/gbyj9cie/w+KbufdtYSe13bM9C/QTsUY0bVfhGX+2ak92aOR8caHWAM5lESOlmbSPJk86wXYPOF8sXIbRecw6B2X8m1h2+y7At09xTtCt1++DY3UqbgpFxcjy5mAIsIkw6VNfGujTu795CTsK3sZ1prA0KmhQ+tjZ5kFALe9zwDJIIEoqGtpL+oqKTa0xiGYf5pMpSvtSsAEWbuibttpkOqLUZA6l2kYsIeMaeLb8SKj2jOxiST4b1eTtKUYp1Vf/v/vfAzhnk8bd6mB8FVfdLRCD+tKDbVZHM8dYki/jhX6evyzCPvYfnSslP2iKA2oZPIB4KZT+0Bs70TK/gQ0VY6Ydlw3pwxzKkEc1kvhknKBm7rN7nuvlIhEKe8d/e1wA97JoiK7fSuCHW9f3aJdaPs+HKAPc3r2e6OO1dTixaLal24l3YRsxOWljH4bapf+FJwyIFwcV9c6EENsA65mjSzFPPfSbszrnmbLQPWydMRKn/0M7sU62izwGiAw/2RNi6kMNY/7VCKJTRiUOKlusxP0I5I8nKLoL1AxjJ8sBXk0P+zlTHKjJf0Ku2j13XlEXxXqR5MsYnHL9evW6QLpHu9dE5sFqxmhb7bP57HEUWPxg6QBq4CcZ92tgYYlwMDbbQPgVHh5s+47hXxAk3BmlxaW6W6vJTuGmnGtBdMNHK4xQdZREypSutVAvKgoY6RmShqIzG18c7vG/",
+  "sha1" : "594f70f6344799cb39fa2fc569a0c646d716a060"
+}, {
+  "device" : "q-gsi.avbpubkey",
   "manufacturer" : "Google",
   "algorithm" : "SHA256_RSA4096",
-  "pubk" : "AAAQAN3haYGQPHFa9yJAviIpp5Feoyn9fr9IEOXPfDzY+SzDr0drrCjO5gY59btYOt/RbVhiXRZK3uSwN3OSiQ98CtECYG9AxUu+3m7o0W+y/UiQkvbbLN+gnbZjiAqWWBIdT0RUTdIf98eMBdgzbdpbDn7uzmwDjLvCkrc/rsWcYYeD6VuS0qKiw/Bzm/8hp7lqqtW0fgn4Y7OBPXRfckyNExjkSvktZZKDFFKp/Xcio5coGLBqXc+1g0Lmo2osbx4bSP4cwJSxKtEeSfH51DLPSc8w+tba/8Jmp+j0KAf5jowNzRKyxyjxavzs0c0Us087MkHN4MaBeLIRH4twUtBRUVKNwacmC3vkFjgnVhpATzXHQa6OYQdV6I8Hu1GyKJ1mr85vEOroNB710Kr7r4Y6YhkW4TpYJQzQ0YZGVQXgp0q00qAQGa9BANrsBaPHFLfLMt/oxGWmIIEeJPKMJ20VTojJqC0XJp39Ujbn0UXC/5V9lU94BQYwog84FOVh2THwcMYsDFb/WlJkF6ERKDYjQwEcIPwR18E1oM3nBM3x5TJpeCV929gxBKYVdf3uoPwiq/tJmM6m+HcHrqjnwN17i1SyG54Hg5rXRQG98Zx+jh4mam1j6dD9dnm0UYNbU24Bca5QhfSR9gwTXxj+9owvyNhKFF41/LcEeaIl+4W0azzj0Mcpf45+UlP0vG5mxKpzlasQthS8m6nPdkYrKrSTClWueuZRhiW0lnPF7PCj8n9jccJ2xYoqcdKRja3hQuBp5u6cRjZi0ACimdTwAMjw7IVkyNlJsTEHPCcQCMknWp5sncJtqady+BbO4W4AfGqSdi6zEZQc3bP5QdQsrnT3rocNHoX3gNwh+hDaED5Rj3MzPXFclb0xfLf1yMSIVuGCePKAcOqwlVbQIeoo2yfHPWX02EvS1JbBrkBCAJ6HRw3e5t/JQXm+faSBaTWGrSBwqaG/ykXgEDzjdeTsGnVr5g9vazd3Z3Lr6F7HqTIYvMZ+ovkIwiBC6dapTX0Ow35m+NjYSTUd15igmaqxjxq4zq2wxE5T5DQhF5ria8cp+0AJhWkfl35oxPWPnLworlDjvu2BdEb0RtfkHM8/po1BBlHzYqqTyV1NqkQq9nO6gVCyGW/X8XufeXKg1CDUiGfjn3IhIIXVcmjW4NxAgdCZdAjGNqIyaYR/LOksw0uaB1IFh0VQNjj300LOXUbJMXdaxzx1sQpw+nFSNYtTX6Uck/XfeBJDSiae5kbVQcey0hhbj1CDWT/u05hVvtxbmmcqVcS+pXk3wjJ/nnWJNga+DYtzK678/u9Fcj0dC+fsWXlEgRen9i4hDynaB7nkOFsnrweA014TLwuSSOmdEDnO0NMnxeQH"
-},
-{
-  "device" : "r-gsi key",
+  "pubk" : "AAAQAN3haYGQPHFa9yJAviIpp5Feoyn9fr9IEOXPfDzY+SzDr0drrCjO5gY59btYOt/RbVhiXRZK3uSwN3OSiQ98CtECYG9AxUu+3m7o0W+y/UiQkvbbLN+gnbZjiAqWWBIdT0RUTdIf98eMBdgzbdpbDn7uzmwDjLvCkrc/rsWcYYeD6VuS0qKiw/Bzm/8hp7lqqtW0fgn4Y7OBPXRfckyNExjkSvktZZKDFFKp/Xcio5coGLBqXc+1g0Lmo2osbx4bSP4cwJSxKtEeSfH51DLPSc8w+tba/8Jmp+j0KAf5jowNzRKyxyjxavzs0c0Us087MkHN4MaBeLIRH4twUtBRUVKNwacmC3vkFjgnVhpATzXHQa6OYQdV6I8Hu1GyKJ1mr85vEOroNB710Kr7r4Y6YhkW4TpYJQzQ0YZGVQXgp0q00qAQGa9BANrsBaPHFLfLMt/oxGWmIIEeJPKMJ20VTojJqC0XJp39Ujbn0UXC/5V9lU94BQYwog84FOVh2THwcMYsDFb/WlJkF6ERKDYjQwEcIPwR18E1oM3nBM3x5TJpeCV929gxBKYVdf3uoPwiq/tJmM6m+HcHrqjnwN17i1SyG54Hg5rXRQG98Zx+jh4mam1j6dD9dnm0UYNbU24Bca5QhfSR9gwTXxj+9owvyNhKFF41/LcEeaIl+4W0azzj0Mcpf45+UlP0vG5mxKpzlasQthS8m6nPdkYrKrSTClWueuZRhiW0lnPF7PCj8n9jccJ2xYoqcdKRja3hQuBp5u6cRjZi0ACimdTwAMjw7IVkyNlJsTEHPCcQCMknWp5sncJtqady+BbO4W4AfGqSdi6zEZQc3bP5QdQsrnT3rocNHoX3gNwh+hDaED5Rj3MzPXFclb0xfLf1yMSIVuGCePKAcOqwlVbQIeoo2yfHPWX02EvS1JbBrkBCAJ6HRw3e5t/JQXm+faSBaTWGrSBwqaG/ykXgEDzjdeTsGnVr5g9vazd3Z3Lr6F7HqTIYvMZ+ovkIwiBC6dapTX0Ow35m+NjYSTUd15igmaqxjxq4zq2wxE5T5DQhF5ria8cp+0AJhWkfl35oxPWPnLworlDjvu2BdEb0RtfkHM8/po1BBlHzYqqTyV1NqkQq9nO6gVCyGW/X8XufeXKg1CDUiGfjn3IhIIXVcmjW4NxAgdCZdAjGNqIyaYR/LOksw0uaB1IFh0VQNjj300LOXUbJMXdaxzx1sQpw+nFSNYtTX6Uck/XfeBJDSiae5kbVQcey0hhbj1CDWT/u05hVvtxbmmcqVcS+pXk3wjJ/nnWJNga+DYtzK678/u9Fcj0dC+fsWXlEgRen9i4hDynaB7nkOFsnrweA014TLwuSSOmdEDnO0NMnxeQH",
+  "sha1" : "144820003f9d46c96e9090dcf0e4feb84ca84810"
+}, {
+  "device" : "r-gsi.avbpubkey",
   "manufacturer" : "Google",
   "algorithm" : "SHA256_RSA4096",
-  "pubk" : "AAAQAGb+3nuKBXXDQgj/dBdxprzFpUgV6IEMnpGYSIaYcIoQzQIJ0jJ8nc/IeI3qzmaOg4obVl6O7xqMDeHkIzv+HAdW3vth4K1kCKED4vZOxwp8h3qbx4Xg2Bc0ynxL4FUWs7E1+p9uqEkyIYs5shgWN1ORI0z2hh71XzzxReielLUNMp0Ub5Km1q9h7nWj2KlxMNVvppaXXb4GTVoBfFfw/xJnCa7GEdd2vnrnLJU9jKjHWo3R472yyDCU6iBrdHycKWyFNzg7HFQLRD/IapnK31Cle7wD+wzRxN/M47zYWLBSLUsL3iYvRPupYZjPWzsMUZuris86DEm0SdfE0IzhYitB55CT4Vo3CXXrVNg3rYWNOpjd/kK++bvzUxO0tycxkEvAJfc9vlJbYJyaXr7eHXuVq+BlagJeTGLL4SCe4/inguL/xr7/j4Du0miVO/bMz2Pxg1cxCnsXjd52x7dxVzQljSnLwaS9z5bbQRkKfEYra6GIPk9v/ZedYLOBgkV/k06n31FUT3EJG/Kd3X3HLbRSEqz4LyehU3hOfwIDWTtlnnyVWAnS36rAT22IH6+Lrgi6sPIYqJqXG8jTYoqNTnD2oSRui5VhRd+4gx2YWF6xcXvPkkNIgdp3QkONfxxwLHWkW+bawhOuRo7NHX6rqc0RxdEzA+N+6H/6G02gA3inbnOvTTUmQteC/EvT0nMubYGRcOuyiueTY+M36OwtBwnKnBNMP/IaCIP7xWH5fBqzT6+yHwhDsDLg5WhvBI+Nd5gYZYicO+p9ImeomI92BRRHI0xsa0X7a5we0YD9+q/QG34KjNGU21Ovni7PHjhrd4koMfuFXdTA5yMMgifjB816N4NhlUKOFPGcpUu4q7bUURCgIa1kmlxohLiTJv2zPE1mAHJxoq96ZiJy7mpsnrL+Wl+/bc7/bBru5KojvjOQrLCKfk7djWLKuaRVD3aPFw4ZdQHSdgNZvIc+a4a9IeD/V1M62poaQLnzWC2gaOlIVwhjOtTIpWw896xMq/ayVz/dchYsgtt+yHQfx+MYFsJ0m4YV6RNIhrDp5AuE57SJRNdqLp6OgpTkJpbqXN9tLVFX0j5/5uioZJ7pV3mVLh+weX4gRTxo4wBC0ugPa+ltuXCg1DLBgS3/kLE4e/nSq5ZueFZoBJ7iFPvBAvjGaSCjoxkAgYMCrBkev4inIGUHOiZ8vGVXBZllUV/4YpzBkBLPvdcp//K3Hd7TggfVRu5PrkmpeakdRsBcj6uCtpQUwXvpQ4WzhGxIClmBo8wpa8U60iaWbWsQVu+C6EayPZvMrTnBui6M5NxjhtD/LeyyMNiC0jMQlgLyjrKn6FUl+jZRhW+n3dLrK+MqMkcW7/5Q6FFK"
-},
-{
-  "device" : "s-gsi key",
+  "pubk" : "AAAQAGb+3nuKBXXDQgj/dBdxprzFpUgV6IEMnpGYSIaYcIoQzQIJ0jJ8nc/IeI3qzmaOg4obVl6O7xqMDeHkIzv+HAdW3vth4K1kCKED4vZOxwp8h3qbx4Xg2Bc0ynxL4FUWs7E1+p9uqEkyIYs5shgWN1ORI0z2hh71XzzxReielLUNMp0Ub5Km1q9h7nWj2KlxMNVvppaXXb4GTVoBfFfw/xJnCa7GEdd2vnrnLJU9jKjHWo3R472yyDCU6iBrdHycKWyFNzg7HFQLRD/IapnK31Cle7wD+wzRxN/M47zYWLBSLUsL3iYvRPupYZjPWzsMUZuris86DEm0SdfE0IzhYitB55CT4Vo3CXXrVNg3rYWNOpjd/kK++bvzUxO0tycxkEvAJfc9vlJbYJyaXr7eHXuVq+BlagJeTGLL4SCe4/inguL/xr7/j4Du0miVO/bMz2Pxg1cxCnsXjd52x7dxVzQljSnLwaS9z5bbQRkKfEYra6GIPk9v/ZedYLOBgkV/k06n31FUT3EJG/Kd3X3HLbRSEqz4LyehU3hOfwIDWTtlnnyVWAnS36rAT22IH6+Lrgi6sPIYqJqXG8jTYoqNTnD2oSRui5VhRd+4gx2YWF6xcXvPkkNIgdp3QkONfxxwLHWkW+bawhOuRo7NHX6rqc0RxdEzA+N+6H/6G02gA3inbnOvTTUmQteC/EvT0nMubYGRcOuyiueTY+M36OwtBwnKnBNMP/IaCIP7xWH5fBqzT6+yHwhDsDLg5WhvBI+Nd5gYZYicO+p9ImeomI92BRRHI0xsa0X7a5we0YD9+q/QG34KjNGU21Ovni7PHjhrd4koMfuFXdTA5yMMgifjB816N4NhlUKOFPGcpUu4q7bUURCgIa1kmlxohLiTJv2zPE1mAHJxoq96ZiJy7mpsnrL+Wl+/bc7/bBru5KojvjOQrLCKfk7djWLKuaRVD3aPFw4ZdQHSdgNZvIc+a4a9IeD/V1M62poaQLnzWC2gaOlIVwhjOtTIpWw896xMq/ayVz/dchYsgtt+yHQfx+MYFsJ0m4YV6RNIhrDp5AuE57SJRNdqLp6OgpTkJpbqXN9tLVFX0j5/5uioZJ7pV3mVLh+weX4gRTxo4wBC0ugPa+ltuXCg1DLBgS3/kLE4e/nSq5ZueFZoBJ7iFPvBAvjGaSCjoxkAgYMCrBkev4inIGUHOiZ8vGVXBZllUV/4YpzBkBLPvdcp//K3Hd7TggfVRu5PrkmpeakdRsBcj6uCtpQUwXvpQ4WzhGxIClmBo8wpa8U60iaWbWsQVu+C6EayPZvMrTnBui6M5NxjhtD/LeyyMNiC0jMQlgLyjrKn6FUl+jZRhW+n3dLrK+MqMkcW7/5Q6FFK",
+  "sha1" : "e3cc565489737d7c5a54fff8337fe4279783c8ce"
+}, {
+  "device" : "s-gsi.avbpubkey",
   "manufacturer" : "Google",
   "algorithm" : "SHA256_RSA4096",
-  "pubk" : "AAAQAD1N+Zmv1D3jU0dOiBZKfV4npeO5Y1Q7FHWisVGhCOiLh2yRjF9RPvo8gaoND2kIaJEgEwGp/gc7o30Y+loiPRU1/7DvEEQ38nHmlsQtzTMqSkZVhaAhtmsMRVgKZIeCEN8LEXsX1/yYwOSVCQ3XHRBfIs2pvR9hi1Fd752z4ZiUqQVueprGkEZM1Wu/Ef2hLUIwRduQPivGTxZUzo3WzwBlyxv7ANXL4DuhuE7ojRtDXB67aZ83eMp0ukF+5k0nDaOo9bWDk82HHuXf5wJrNcBA0qS3PYfM1q07byc0tQFRQBsD4fxPWsNzTpoMn232qGLKovjkJ6ejUmfdcdRiMDuyAmgM8RNLKWtpZmGfIf5HpIEvqxmt29GUDDsPSA0Fl/RE5rmF9Yq2URhMlA7PlSJSK1XFp72B2whSvxpmIHdoZ3rjTAcDY4cio3laBLM8OHQEwhN8+Y+12BNl65mmvTw1ZCBZ4wnRrQcSg/PMVcV87Jq7SmL4NhAprX0Vmkxmh/Cacle1/Q8sx1XntZ7WC0Z57OjId7pxxZLTRw/JAtYzqu8KotsvuybnEvJdjYkIUVPuVaz20ZWbwkZbq8MkGpxE/nwM65QoADWLxj8THAnI0tkg8FHPaC5HJfFUGIPpYDF8XB8SkLhLBYmxEr2ylQmtSU0h481tQox+YUruvliO+5+1V3si+/F3X4mi8YOJB4dbbbLY6iyYMN23hkP0pT+4lY7gLuFfETBDvh7ItcNTU440eC7Y3CMlLpxCoIh3+x9cMXikr9Y5BmkjTgffRr1wk7nUbEm5aLy2oei+qbK0x7UJYMX6xlf3gMJ3yINAFMIghRRfQ1Jwjf3yY/PwClxJ1Mr07DnH1vNz/Tnb3E9jZ/JSzCaxHT6jY4Qp2zM1vjS6CXV98yZ6hn35HY39EsZlQ8lngKpWWHwo5BIqjIiG3AZeOoYz8p2yE8awQLNgvtdOEBc1L0jjOg18n7KN5h+Y8Utby396Qp9oaP4rhp2hAIcuWWaOR3ITvBhmRZ3wPk1iBUDbyZtj2TGsQ/HDF3Q77ZLkqRdaBM2J2oAH8J2TLrCpBsO2UzNFaYu4l9eGe/DlMPzdU+0JDVZJKYMthdun/HDhRJI14n3mMzOi8lCtB4OaP3SxkA7TJk19u1RNUiUGBLuADbw69/ZTqjhMaFfYNByqgAue7ZudiTcZYYxYV27TCoP9YNy+u/9gwdddnjqwBhIcrpV03EhGnmrgTYS0+JRUQnDwcNui183Gg2GePR/AjYf/zkI7WEP/rR6CVzF2urT+e7Wx59fp0f0+a4kiFjkims8iwZIZ6Uujdm7tkDmCVkMzll0beZtKxzh1n6CcA5Ju+WyrmN+lj5opNbD4Qnot"
-},
-{
-  "device" : "t-gsi key",
+  "pubk" : "AAAQAD1N+Zmv1D3jU0dOiBZKfV4npeO5Y1Q7FHWisVGhCOiLh2yRjF9RPvo8gaoND2kIaJEgEwGp/gc7o30Y+loiPRU1/7DvEEQ38nHmlsQtzTMqSkZVhaAhtmsMRVgKZIeCEN8LEXsX1/yYwOSVCQ3XHRBfIs2pvR9hi1Fd752z4ZiUqQVueprGkEZM1Wu/Ef2hLUIwRduQPivGTxZUzo3WzwBlyxv7ANXL4DuhuE7ojRtDXB67aZ83eMp0ukF+5k0nDaOo9bWDk82HHuXf5wJrNcBA0qS3PYfM1q07byc0tQFRQBsD4fxPWsNzTpoMn232qGLKovjkJ6ejUmfdcdRiMDuyAmgM8RNLKWtpZmGfIf5HpIEvqxmt29GUDDsPSA0Fl/RE5rmF9Yq2URhMlA7PlSJSK1XFp72B2whSvxpmIHdoZ3rjTAcDY4cio3laBLM8OHQEwhN8+Y+12BNl65mmvTw1ZCBZ4wnRrQcSg/PMVcV87Jq7SmL4NhAprX0Vmkxmh/Cacle1/Q8sx1XntZ7WC0Z57OjId7pxxZLTRw/JAtYzqu8KotsvuybnEvJdjYkIUVPuVaz20ZWbwkZbq8MkGpxE/nwM65QoADWLxj8THAnI0tkg8FHPaC5HJfFUGIPpYDF8XB8SkLhLBYmxEr2ylQmtSU0h481tQox+YUruvliO+5+1V3si+/F3X4mi8YOJB4dbbbLY6iyYMN23hkP0pT+4lY7gLuFfETBDvh7ItcNTU440eC7Y3CMlLpxCoIh3+x9cMXikr9Y5BmkjTgffRr1wk7nUbEm5aLy2oei+qbK0x7UJYMX6xlf3gMJ3yINAFMIghRRfQ1Jwjf3yY/PwClxJ1Mr07DnH1vNz/Tnb3E9jZ/JSzCaxHT6jY4Qp2zM1vjS6CXV98yZ6hn35HY39EsZlQ8lngKpWWHwo5BIqjIiG3AZeOoYz8p2yE8awQLNgvtdOEBc1L0jjOg18n7KN5h+Y8Utby396Qp9oaP4rhp2hAIcuWWaOR3ITvBhmRZ3wPk1iBUDbyZtj2TGsQ/HDF3Q77ZLkqRdaBM2J2oAH8J2TLrCpBsO2UzNFaYu4l9eGe/DlMPzdU+0JDVZJKYMthdun/HDhRJI14n3mMzOi8lCtB4OaP3SxkA7TJk19u1RNUiUGBLuADbw69/ZTqjhMaFfYNByqgAue7ZudiTcZYYxYV27TCoP9YNy+u/9gwdddnjqwBhIcrpV03EhGnmrgTYS0+JRUQnDwcNui183Gg2GePR/AjYf/zkI7WEP/rR6CVzF2urT+e7Wx59fp0f0+a4kiFjkims8iwZIZ6Uujdm7tkDmCVkMzll0beZtKxzh1n6CcA5Ju+WyrmN+lj5opNbD4Qnot",
+  "sha1" : "152cb9d664a600bd37fa1ea6713816a4f3265243"
+}, {
+  "device" : "t-gsi.avbpubkey",
   "manufacturer" : "Google",
   "algorithm" : "SHA256_RSA4096",
-  "pubk" : "AAAQAB696fOqmcvPXp24WvrWaiOAGtKfhdEcA1qb8i/z1aNA7pMnUaJrP+eWn22VfnViO9+OhvdM6c7+9f6BtThWfyMgtYhGC1iLwBdy9ywNOqY+/AxLKv5IpCCAVL4AyRPf+22ETAjyIqdDykGCRC6LWIGXoWT+fBuZaGGQ635A5lqp1ZhMvaCaCd+fJpZ2NvymO3RRISZyhMaVSMJbGi3p6aLT8NuAzk7VxMIooBV5U5FQ3ExhWSakrjR/zoyFVazzhBtywAv/dXSxivaN/2BpoEXUWlZShk2A1hNkvxT2vIslxXhKUyo38D3f328bDDl9j6hdrZPRwd/iZFH2sWsnzQNZ1Uq/CWIqJxr73sZCx0+EC+h2nYGrhUxPeY1M9ST/bhRroLb67JjGwidKo3LlX5BAysTiUj0jevYmEMRgzCQERxWmknNI/FpySAkAvxO2h9eaJtdcU34MfI62xck3p3rpp+jv88OTV2xUsmaPU2WCVuECkZALzKwGkVpc9uuTRBtviXOpqZcmRjKAcVg1bWFqEsgAONzwyLSUMNkZQbidz+MAObmE5I4NpqDXFU6nz7XWXfKbKQzaG5Mg9TGacBSQY4+dubeUJrO41FxtjHHzImvaLfXD+/EGbaaeqGAjB2Vo02v6dBCXd8bOyOL0rq9kzfTmfQQHjUaEvfGxE1mVJb8oxZ/EwsMVoCj0oz8cgGVVJg65JfvHjHnUKGwWHg9jQIedAZawHvRcYlSulh4BvfiDsHY9zIT5NkZ5gNXP8BFVsXMhX/xWYXa39Tlls2eq6n0s3B/YU+myyYiOL6QFsoNB1QX1fNkZKAgEQpcwRapXHHlvRwdKP8FscyLKmwdBfKg8RZeIZ/9TXL49mq3ocbfrX8se/DdPT61V2nGbApmPErcCrgtbUrxwV1a4LI3C5aMP+52brzOrUYLMeotd8xFgZj1DVgP0nKmuYeq2kzgeTOBWud53KQ+qBcegk942LGGNr1BSuBynkBywTm7iZHidjONcJUgiaB+NnCYewbLDwF21bRphkXthvak/Di2KcVugDUOGblb6X4XNR++ZTnZiBw6IbY85eL2YddPJg4ZH1zNIWa9rRuv9q6VWX1XD5+J92bd34EPuMLrmGvXgYpbfzfuqqLGpPBvbqoRfdgHe7CSe0xa3lDePOTll8sDsKKnr8jOW9CvsbS1s6+x8Nie2UFPwsb/LvfmhhsRTmlZaESRltCOjdZ+XbnSaCw7of/4oQfjk3gLiFNlH6uHDOTdi/QuFsGselWCi8I3NsMf57+1FXiQZsXbR59D+uooDC+J75IDlp2/fkBOVsyTEXe3C4gznsbvoN9GjzkAEo7uti2hjTwhaXHTQ2o3T6XpEBQzj"
-}
-]
+  "pubk" : "AAAQAB696fOqmcvPXp24WvrWaiOAGtKfhdEcA1qb8i/z1aNA7pMnUaJrP+eWn22VfnViO9+OhvdM6c7+9f6BtThWfyMgtYhGC1iLwBdy9ywNOqY+/AxLKv5IpCCAVL4AyRPf+22ETAjyIqdDykGCRC6LWIGXoWT+fBuZaGGQ635A5lqp1ZhMvaCaCd+fJpZ2NvymO3RRISZyhMaVSMJbGi3p6aLT8NuAzk7VxMIooBV5U5FQ3ExhWSakrjR/zoyFVazzhBtywAv/dXSxivaN/2BpoEXUWlZShk2A1hNkvxT2vIslxXhKUyo38D3f328bDDl9j6hdrZPRwd/iZFH2sWsnzQNZ1Uq/CWIqJxr73sZCx0+EC+h2nYGrhUxPeY1M9ST/bhRroLb67JjGwidKo3LlX5BAysTiUj0jevYmEMRgzCQERxWmknNI/FpySAkAvxO2h9eaJtdcU34MfI62xck3p3rpp+jv88OTV2xUsmaPU2WCVuECkZALzKwGkVpc9uuTRBtviXOpqZcmRjKAcVg1bWFqEsgAONzwyLSUMNkZQbidz+MAObmE5I4NpqDXFU6nz7XWXfKbKQzaG5Mg9TGacBSQY4+dubeUJrO41FxtjHHzImvaLfXD+/EGbaaeqGAjB2Vo02v6dBCXd8bOyOL0rq9kzfTmfQQHjUaEvfGxE1mVJb8oxZ/EwsMVoCj0oz8cgGVVJg65JfvHjHnUKGwWHg9jQIedAZawHvRcYlSulh4BvfiDsHY9zIT5NkZ5gNXP8BFVsXMhX/xWYXa39Tlls2eq6n0s3B/YU+myyYiOL6QFsoNB1QX1fNkZKAgEQpcwRapXHHlvRwdKP8FscyLKmwdBfKg8RZeIZ/9TXL49mq3ocbfrX8se/DdPT61V2nGbApmPErcCrgtbUrxwV1a4LI3C5aMP+52brzOrUYLMeotd8xFgZj1DVgP0nKmuYeq2kzgeTOBWud53KQ+qBcegk942LGGNr1BSuBynkBywTm7iZHidjONcJUgiaB+NnCYewbLDwF21bRphkXthvak/Di2KcVugDUOGblb6X4XNR++ZTnZiBw6IbY85eL2YddPJg4ZH1zNIWa9rRuv9q6VWX1XD5+J92bd34EPuMLrmGvXgYpbfzfuqqLGpPBvbqoRfdgHe7CSe0xa3lDePOTll8sDsKKnr8jOW9CvsbS1s6+x8Nie2UFPwsb/LvfmhhsRTmlZaESRltCOjdZ+XbnSaCw7of/4oQfjk3gLiFNlH6uHDOTdi/QuFsGselWCi8I3NsMf57+1FXiQZsXbR59D+uooDC+J75IDlp2/fkBOVsyTEXe3C4gznsbvoN9GjzkAEo7uti2hjTwhaXHTQ2o3T6XpEBQzj",
+  "sha1" : "b42c87bedcf600d7bebe3dbade2444e9724c3159"
+} ]

bbootimg/src/test/kotlin/AvbTest.kt

@@ -14,12 +14,17 @@
 
 import avb.desc.UnknownDescriptor
 import avb.desc.HashDescriptor
+import cfig.Avb
+import cfig.helper.CryptoHelper
+import cfig.helper.Dumpling
+import com.fasterxml.jackson.core.type.TypeReference
+import com.fasterxml.jackson.databind.ObjectMapper
 import org.apache.commons.codec.binary.Hex
 import org.junit.Test
-
 import org.junit.Assert.*
 import org.slf4j.LoggerFactory
 import java.io.ByteArrayInputStream
+import java.io.File
 
 class AvbTest {
     private val log = LoggerFactory.getLogger(AvbTest::class.java)
@@ -41,4 +46,31 @@ class AvbTest {
         val descAnalyzed = desc.analyze()
         assertTrue(descAnalyzed is HashDescriptor)
     }
+
+    @Test
+    fun verifyKnownKeysJson() {
+        val keys = ObjectMapper().readValue(
+            this::class.java.classLoader.getResource("known_keys.json"),
+            object : TypeReference<List<Avb.Companion.KnownPublicKey>>() {})
+        keys.forEachIndexed { _, knownPublicKey ->
+            verifySha1(knownPublicKey)
+        }
+        val outStr = ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(keys)
+        log.info(outStr)
+    }
+
+    private fun verifySha1(known: Avb.Companion.KnownPublicKey) {
+        val hash = CryptoHelper.Hasher.hash(Dumpling(known.pubk), "sha-1")
+        if (known.sha1.isBlank()) {
+            log.info("+ add new sha1")
+            known.sha1 = Hex.encodeHexString(hash)
+        } else {
+            if (known.sha1 == Hex.encodeHexString(hash)) {
+                log.info("= sha1 match")
+            } else {
+                log.error("- sha1 mismatch")
+                throw IllegalArgumentException("sha1 mismatch")
+            }
+        }
+    }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

helper/build.gradle.kts

@@ -15,7 +15,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.8.0"
+    kotlin("jvm") version "1.9.0"
     `java-library`
     application
 }
@@ -42,6 +42,10 @@ dependencies {
     implementation("org.apache.commons:commons-compress:1.21")
     implementation("org.tukaani:xz:1.9")
     implementation("com.github.freva:ascii-table:1.2.0")
+    implementation("com.nimbusds:nimbus-jose-jwt:9.31")
+    // jackson
+    implementation("com.fasterxml.jackson.core:jackson-annotations:2.14.0")
+    implementation("com.fasterxml.jackson.core:jackson-databind:2.14.0")
 
     testImplementation("org.jetbrains.kotlin:kotlin-test")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit")

helper/src/main/kotlin/cfig/helper/CryptoHelper.kt

@@ -4,11 +4,19 @@ package cfig.helper
 
 import cc.cfig.io.Struct
 import com.google.common.math.BigIntegerMath
+import com.nimbusds.jose.Algorithm
+import com.nimbusds.jose.jwk.KeyUse
+import com.nimbusds.jose.util.Base64URL
 import org.apache.commons.exec.CommandLine
 import org.apache.commons.exec.DefaultExecutor
 import org.apache.commons.exec.ExecuteException
 import org.apache.commons.exec.PumpStreamHandler
+import org.bouncycastle.asn1.ASN1InputStream
+import org.bouncycastle.asn1.ASN1Primitive
+import org.bouncycastle.asn1.ASN1Sequence
+import org.bouncycastle.asn1.pkcs.PrivateKeyInfo
 import org.bouncycastle.pkcs.PKCS10CertificationRequest
+import org.bouncycastle.util.io.pem.PemObject
 import org.bouncycastle.util.io.pem.PemReader
 import org.slf4j.LoggerFactory
 import java.io.*
@@ -17,10 +25,8 @@ import java.math.RoundingMode
 import java.security.*
 import java.security.cert.Certificate
 import java.security.cert.CertificateFactory
-import java.security.spec.PKCS8EncodedKeySpec
-import java.security.spec.RSAPrivateKeySpec
-import java.security.spec.RSAPublicKeySpec
-import java.security.spec.X509EncodedKeySpec
+import java.security.cert.X509Certificate
+import java.security.spec.*
 import java.util.*
 import javax.crypto.Cipher
 import kotlin.reflect.KClass
@@ -52,6 +58,7 @@ class CryptoHelper {
                                     .generatePublic(keySpec) as java.security.interfaces.RSAPublicKey
                             }
                         }
+
                         "RSA PRIVATE KEY", "PRIVATE KEY" -> {
                             try {
                                 retClazz = org.bouncycastle.asn1.pkcs.RSAPrivateKey::class
@@ -63,14 +70,17 @@ class CryptoHelper {
                                     .generatePrivate(keySpec) as sun.security.rsa.RSAPrivateCrtKeyImpl
                             }
                         }
+
                         "CERTIFICATE REQUEST" -> {
                             retClazz = PKCS10CertificationRequest::class
                             PKCS10CertificationRequest(p.content)
                         }
+
                         "CERTIFICATE" -> {
                             retClazz = Certificate::class
                             CertificateFactory.getInstance("X.509").generateCertificate(ByteArrayInputStream(p.content))
                         }
+
                         else -> throw IllegalArgumentException("unsupported type: ${p.type}")
                     }
                     return KeyBox(KeyFormat.PEM, retClazz, ret)
@@ -166,16 +176,16 @@ class CryptoHelper {
                 from avbtool::encode_rsa_key()
              */
             fun encodeRSAkey(rsa: org.bouncycastle.asn1.pkcs.RSAPrivateKey): ByteArray {
-                require(65537.toBigInteger() == rsa.publicExponent)
+                check(65537.toBigInteger() == rsa.publicExponent)
                 val numBits: Int = BigIntegerMath.log2(rsa.modulus, RoundingMode.CEILING)
-                require(rsa.modulus.bitLength() == numBits)
+                check(rsa.modulus.bitLength() == numBits)
                 val b = BigInteger.valueOf(2).pow(32)
                 val n0inv = b.minus(rsa.modulus.modInverse(b)).toLong()
                 val rrModn = BigInteger.valueOf(4).pow(numBits).rem(rsa.modulus).toByteArray().let {
-                    it.sliceArray(it.size - numBits/8 until it.size)
+                    it.sliceArray(it.size - numBits / 8 until it.size)
                 }
                 val unsignedModulo = rsa.modulus.toByteArray().let {
-                    it.sliceArray(it.size - numBits/8 until it.size)
+                    it.sliceArray(it.size - numBits / 8 until it.size)
                 }
                 return Struct("!II${numBits / 8}b${numBits / 8}b").pack(
                     numBits,
@@ -199,14 +209,39 @@ class CryptoHelper {
                 return KeyFactory.getInstance("RSA").generatePublic(keySpec) as java.security.interfaces.RSAPublicKey
             }
 
-            fun decodePem(keyText: String): ByteArray {
-                val publicKeyPEM = keyText
-                    .replace("-----BEGIN .*-----".toRegex(), "")
-                    .replace(System.lineSeparator().toRegex(), "")
-                    .replace("\n", "")
-                    .replace("\r", "")
-                    .replace("-----END .*-----".toRegex(), "")
-                return Base64.getDecoder().decode(publicKeyPEM)
+            fun rsa2jwk(
+                inK: java.security.interfaces.RSAPrivateCrtKey,
+                keyName: String = "thePrivateKey"
+            ): com.nimbusds.jose.jwk.RSAKey {
+                return com.nimbusds.jose.jwk.RSAKey.Builder(Base64URL.encode(inK.modulus), Base64URL.encode(inK.publicExponent))
+                    .algorithm(Algorithm(inK.algorithm))
+                    .privateKey(inK)
+                    .keyUse(KeyUse.SIGNATURE)
+                    .keyID(keyName)
+                    .build()
+            }
+            fun rsa2jwk(
+                inK: java.security.interfaces.RSAPublicKey,
+                keyName: String = "thePublicKey"
+            ): com.nimbusds.jose.jwk.RSAKey {
+                return com.nimbusds.jose.jwk.RSAKey.Builder(Base64URL.encode(inK.modulus), Base64URL.encode(inK.publicExponent))
+                    .algorithm(Algorithm(inK.algorithm))
+                    .keyUse(KeyUse.SIGNATURE)
+                    .keyID(keyName)
+                    .build()
+            }
+
+            fun bcRSA2RSA(inK: org.bouncycastle.asn1.pkcs.RSAPrivateKey): PrivateKey {
+                return KeyFactory.getInstance("RSA").generatePrivate(
+                    RSAPrivateCrtKeySpec(
+                        inK.modulus, inK.publicExponent, inK.privateExponent, inK.prime1,
+                        inK.prime2, inK.exponent1, inK.exponent2, inK.coefficient
+                    )
+                )
+            }
+
+            fun pk8toPk1(pk8: java.security.PrivateKey): ASN1Primitive {
+                return PrivateKeyInfo.getInstance(pk8.encoded).parsePrivateKey().toASN1Primitive()
             }
         } //end-companion
     }
@@ -232,9 +267,9 @@ class CryptoHelper {
             }
 
             fun hash(ds: Dumpling<*>, coordinates: List<Pair<Long, Long>>, algorithm: String): ByteArray {
-                require(coordinates.isNotEmpty())
+                check(coordinates.isNotEmpty())
                 coordinates.forEach {
-                    require(it.first >= 0 && it.second > 0)
+                    check(it.first >= 0 && it.second > 0)
                 }
                 return MessageDigest.getInstance(algorithm).let { md ->
                     coordinates.forEach { coordinate ->
@@ -333,6 +368,191 @@ class CryptoHelper {
         }
     }
 
+    data class UnBoxed(
+        /*
+            EC PRIVATE KEY, OPENSSH PRIVATE KEY, CERTIFICATE REQUEST, CERTIFICATE
+            RSA PRIVATE KEY, PRIVATE KEY, RSA PUBLIC KEY, PUBLIC KEY
+         */
+        val pemType: String? = null,
+        val asn1: Boolean = false,
+        val data: ByteArray = byteArrayOf(),
+        // RSA PRIVATE KEY, RSA PUBLIC KEY
+        var rawAsn1Type: String? = null,
+        // AvbRSAPublicKey
+        var rawType: String? = null,
+    ) {
+        fun parse(): Any? {
+            var ret: Any? = null
+            when (this.pemType) {
+                "EC PRIVATE KEY" -> {
+                    check(this.asn1)
+                    log.warn("not supported yet: " + this.pemType)
+                }
+
+                "OPENSSH PRIVATE KEY" -> { //Since OpenSSH 7.8
+                    check(!this.asn1)
+                    log.warn("not supported yet: " + this.pemType)
+                }
+
+                "CERTIFICATE REQUEST" -> {
+                    ret = PKCS10CertificationRequest(this.data)
+                    log.warn("Found: PEM(${ret.subject} CSR)")
+                }
+
+                "CERTIFICATE" -> {
+                    ret = CertificateFactory.getInstance("X.509").generateCertificate(ByteArrayInputStream(this.data))
+                    check(ret is X509Certificate)
+                    log.info("alg=" + ret.sigAlgName)
+                    check(ret.publicKey is java.security.interfaces.RSAPublicKey)
+                    log.info("Found: PEM(${ret.type} Cert) -> ${this.pemType}")
+                }
+
+                "RSA PRIVATE KEY", "PRIVATE KEY" -> run {
+                    check(this.asn1)
+                    //org.bouncycastle.asn1.pkcs.RSAPrivateKey::class
+                    try {
+                        ret = org.bouncycastle.asn1.pkcs.RSAPrivateKey.getInstance(this.data)
+                        check(ret is org.bouncycastle.asn1.pkcs.RSAPrivateKey)
+                        log.info("Found: PEM(PKCS1v2) -> ${this.pemType}")
+                        return@run
+                    } catch (_: java.lang.ClassCastException) {
+                    }
+                    val keySpec = PKCS8EncodedKeySpec(this.data)
+                    // sun.security.rsa.RSAPrivateCrtKeyImpl sun.security.rsa.RSAPrivateKeyImpl
+                    ret = KeyFactory.getInstance("RSA").generatePrivate(keySpec)
+                    check(ret is java.security.interfaces.RSAPrivateKey)
+                    log.info("Found: PEM(PKCS#8) -> ${this.pemType}")
+                }
+
+                "RSA PUBLIC KEY", "PUBLIC KEY" -> {
+                    check(this.asn1)
+                    try {
+                        ret = org.bouncycastle.asn1.pkcs.RSAPublicKey.getInstance(this.data)
+                        check(ret is org.bouncycastle.asn1.pkcs.RSAPublicKey)
+                        log.info(ret.toString())
+                        log.info("Found: PEM -> ${this.pemType}")
+                    } catch (_: IllegalArgumentException) {
+                    }
+                    val keySpec = X509EncodedKeySpec(this.data)
+                    ret = KeyFactory.getInstance("RSA").generatePublic(keySpec)
+                    check(ret is java.security.interfaces.RSAPublicKey)
+                    log.info("Found: PEM(PKCS#8) -> ${this.pemType}")
+                }
+
+                null -> run {
+                    // AvbRSAPublicKey
+                    if (!this.asn1) {
+                        try {
+                            ret = KeyBox.decodeRSAkey(this.data)
+                            this.rawType = "AvbRSAPublicKey"
+                            log.info("Found: raw(AVB Public Key) -> ${this.rawType}")
+                            return@run
+                        } catch (_: IllegalStateException) {
+                        }
+                    }
+                    check(this.asn1)
+                    // PRIVATE KEY (RSA)
+                    try {
+                        ret = org.bouncycastle.asn1.pkcs.RSAPrivateKey.getInstance(this.data)
+                        check(ret is org.bouncycastle.asn1.pkcs.RSAPrivateKey)
+                        this.rawAsn1Type = "RSA PRIVATE KEY"
+                        log.info("Found: raw(PKCS1v2) -> ${this.rawAsn1Type}")
+                        return@run
+                    } catch (_: java.lang.ClassCastException) {
+                    }
+                    // PRIVATE KEY (RSA)
+                    try {
+                        val keySpec = PKCS8EncodedKeySpec(this.data)
+                        // java.security.interfaces.RSAPrivateCrtKey || java.security.interfaces.RSAPrivateKey
+                        ret = KeyFactory.getInstance("RSA").generatePrivate(keySpec)
+                        check(ret is java.security.interfaces.RSAPrivateCrtKey)
+                        this.rawAsn1Type = "RSA PRIVATE KEY"
+                        log.info("Found: raw(PKCS#8) -> ${this.rawAsn1Type}")
+                        return@run
+                    } catch (_: InvalidKeySpecException) {
+                    }
+                    // PUBLIC KEY (RSA)
+                    try {
+                        ret = org.bouncycastle.asn1.pkcs.RSAPublicKey.getInstance(this.data)
+                        check(ret is org.bouncycastle.asn1.pkcs.RSAPublicKey)
+                        this.rawAsn1Type = "RSA PUBLIC KEY"
+                        log.info(ret.toString())
+                        log.info("Found: raw() -> ${this.rawAsn1Type}")
+                        return@run
+                    } catch (_: IllegalArgumentException) {
+                    }
+                    // PUBLIC KEY (RSA)
+                    val keySpec = X509EncodedKeySpec(this.data)
+                    ret = KeyFactory.getInstance("RSA").generatePublic(keySpec)
+                    check(ret is java.security.interfaces.RSAPublicKey)
+                    this.rawAsn1Type = "RSA PUBLIC KEY"
+                    log.info("Found: raw(PKCS#8) -> ${this.rawAsn1Type}")
+                }
+
+                else -> {
+                    log.warn("#####################: ${this.pemType}")
+                }
+            }
+            return ret
+        }
+
+        companion object {
+            fun fromData(data: ByteArray): UnBoxed {
+                PemReader(InputStreamReader(ByteArrayInputStream(data))).use { pr ->
+                    var obj: PemObject? = null
+                    if (pr.readPemObject().also { obj = it } != null) {
+                        //log.debug("PEM: ${obj!!.type}")
+                        val isAsn1 = isValidAsn1(obj!!.content)
+                        //log.debug("asn1=$isAsn1")
+                        return UnBoxed(obj!!.type!!, isAsn1, obj!!.content)
+                    } else {
+                        //log.info("not pem")
+                        val isAsn1 = isValidAsn1(data)
+                        //log.info("asn1=$isAsn1")
+                        return UnBoxed(null, isAsn1, data)
+                    }
+                }
+            }
+
+            @Throws(IOException::class)
+            fun isValidAsn1(data: ByteArray): Boolean {
+                return try {
+                    ASN1InputStream(data).use { input ->
+                        var obj: ASN1Primitive? = null
+                        while (input.readObject() != null) {
+                        }
+                        true
+                    }
+                } catch (e: IOException) {
+                    false
+                }
+            }
+
+            fun parseASN1(data: ByteArray) {
+                ASN1InputStream(data).use { input ->
+                    var obj: ASN1Primitive? = null
+                    while (input.readObject().also { obj = it } != null) {
+                        parseASN1Object(obj!!)
+                    }
+                }
+            }
+
+            private fun parseASN1Object(asn1Object: ASN1Primitive) {
+                if (asn1Object is ASN1Sequence) {
+                    log.info("[SEQ] " + asn1Object.size() + " objects")
+                    for (i in 0 until asn1Object.size()) {
+                        val element = asn1Object.getObjectAt(i).toASN1Primitive()
+                        parseASN1Object(element) // Recursively parse each element
+                    }
+                } else {
+                    // Handle other ASN1Primitive types as needed
+                    // For example, you can print the element's content:
+                    log.info("[OBJ] $asn1Object")
+                }
+            }
+        }
+    }
+
     companion object {
         private val log = LoggerFactory.getLogger(CryptoHelper::class.java)
         fun listAll() {

helper/src/main/kotlin/cfig/helper/Launcher.kt

@@ -2,8 +2,10 @@
 
 package cfig.helper
 
-import org.bouncycastle.asn1.ASN1Primitive
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo
+import cfig.helper.CryptoHelper.KeyBox.Companion.bcRSA2RSA
+import cfig.helper.CryptoHelper.KeyBox.Companion.pk8toPk1
+import cfig.helper.CryptoHelper.KeyBox.Companion.rsa2jwk
+import com.fasterxml.jackson.databind.ObjectMapper
 import org.bouncycastle.util.io.pem.PemObject
 import org.bouncycastle.util.io.pem.PemWriter
 import org.slf4j.LoggerFactory
@@ -14,6 +16,7 @@ import java.io.FileWriter
 import java.math.BigInteger
 import java.security.KeyFactory
 import java.security.KeyPairGenerator
+import java.security.cert.X509Certificate
 import java.security.spec.RSAPublicKeySpec
 import java.util.*
 import kotlin.system.exitProcess
@@ -70,10 +73,6 @@ class Launcher {
         }
     }
 
-    private fun pk8toPk1(pk8: java.security.PrivateKey): ASN1Primitive {
-        return PrivateKeyInfo.getInstance(pk8.encoded).parsePrivateKey().toASN1Primitive()
-    }
-
     fun processCommand(inFile: String, info2: Properties) {
         FileInputStream(inFile).use { fis ->
             info2.load(fis)
@@ -88,7 +87,7 @@ class Launcher {
                     it.initialize(kLen)
                     it.generateKeyPair()
                 }
-                FileOutputStream(kFile, false).use {
+                FileOutputStream(kFile + ".pk8", false).use {
                     it.write(keyPair.private.encoded)
                     log.info("RSA priv key(len=$kLen) written to $kFile.pk8")
                 }
@@ -101,6 +100,7 @@ class Launcher {
                 }
                 dumpPem(PemObject("RSA PUBLIC KEY", keyPair.public.encoded), "$kFile.pem.pub")
             }
+
             "toPub" -> {
                 val k = CryptoHelper.KeyBox.parse4(File(kFile).readBytes())
                 if (k.key is org.bouncycastle.asn1.pkcs.RSAPrivateKey) {
@@ -111,12 +111,14 @@ class Launcher {
                     throw IllegalArgumentException("not supported")
                 }
             }
+
             "parse" -> {
                 val k = CryptoHelper.KeyBox.parse4(File(kFile).readBytes())
                 log.info("fmt=" + k.fmt.toString())
                 log.info("clazz=" + k.clazz)
                 log.info("key=" + k.key)
             }
+
             else -> {
                 //pass
             }
@@ -127,38 +129,33 @@ class Launcher {
         val preFile = info2.getProperty("file")
         info2["file"] = (if (preFile == null) "" else "$preFile,") + File(inFile).canonicalFile.path
         info2["propFile"] = File(info2.getProperty("file")).name + ".prop"
-        val k = CryptoHelper.KeyBox.parse4(File(inFile).readBytes())
-        info2["fileType"] = k.fmt
-        info2["fileClazz"] = k.clazz
-        log.info("Recognized ${k.fmt}: " + k.clazz)
-        if (k.key is sun.security.x509.X509CertImpl) {
-            val crt = k.key
-            val crtSubj = (crt.get("x509.info") as sun.security.x509.X509CertInfo).get("subject").toString()
-            val subj2 = crtSubj
-                .replace(", ", "/")
-                .replace("EMAILADDRESS", "emailAddress")
-                .replace("\\s".toRegex(), "")
-            info2.setProperty("csr.info", "/$subj2")
-        }
-        if (k.key is sun.security.rsa.RSAPrivateCrtKeyImpl) {
-            val pk8 = k.key
-            info2.setProperty("rsa.len", pk8.modulus.bitLength().toString())
-            info2["rsa.modulus"] = Helper.toHexString(pk8.modulus.toByteArray())
-            info2["rsa.privateExponent"] = Helper.toHexString(pk8.privateExponent.toByteArray())
-            info2["rsa.publicExponent"] = Helper.toHexString(pk8.publicExponent.toByteArray())
-            info2["rsa.primeP"] = Helper.toHexString(pk8.primeP.toByteArray())
-            info2["rsa.primeQ"] = Helper.toHexString(pk8.primeQ.toByteArray())
+        val unboxed = CryptoHelper.UnBoxed.fromData(File(inFile).readBytes())
+        val k2 = unboxed.parse()
+        var retJwk: com.nimbusds.jose.jwk.RSAKey? = null
+        if (k2 is java.security.interfaces.RSAPrivateCrtKey) {
+            retJwk = rsa2jwk(k2)
+            //log.info(retJwk.toJSONString())
+        } else if (k2 is org.bouncycastle.asn1.pkcs.RSAPrivateKey) {
+            val privk = bcRSA2RSA(k2)
+            check(privk is java.security.interfaces.RSAPrivateCrtKey)
+            retJwk = rsa2jwk(privk)
+            //log.info(retJwk.toJSONString())
+        } else if (k2 is java.security.interfaces.RSAPublicKey) {
+            retJwk = rsa2jwk(k2)
+            //log.info(retJwk.toJSONString())
+        } else if (k2 is X509Certificate) {
+            retJwk = rsa2jwk(k2.publicKey as java.security.interfaces.RSAPublicKey)
+        } else {
+            log.info("Found other: " + k2!!::class.java.toString())
         }
-        if (k.key is org.bouncycastle.asn1.pkcs.RSAPrivateKey) {
-            val rsa = k.key
-            info2.setProperty("rsa.len", rsa.modulus.bitLength().toString())
-            info2["rsa.modulus"] = Helper.toHexString(rsa.modulus.toByteArray())
-            info2["rsa.privateExponent"] = Helper.toHexString(rsa.privateExponent.toByteArray())
-            info2["rsa.publicExponent"] = Helper.toHexString(rsa.publicExponent.toByteArray())
-            info2["rsa.primeP"] = Helper.toHexString(rsa.prime1.toByteArray())
-            info2["rsa.primeQ"] = Helper.toHexString(rsa.prime2.toByteArray())
+        if (retJwk != null) {
+            log.info("transforming: $inFile --> out.jwk ...")
+            File("out.jwk").writeText(
+                ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(
+                    ObjectMapper().readValue(retJwk.toJSONString(), Any::class.java)
+                )
+            )
         }
-
     }
 }
 
@@ -196,10 +193,5 @@ fun main(args: Array<String>) {
             log.warn("[${index + 1}/${args.size}] Processing $s ...")
             Launcher().processFile(s, info2)
         }
-        FileOutputStream(info2.getProperty("propFile")).use { fos ->
-            info2.setProperty("all_cmds", allSupportedCommands)
-            info2.store(fos, null)
-            log.info("Writing to " + info2.getProperty("propFile"))
-        }
     }
 }

integrationTest.py

@@ -10,6 +10,7 @@ successLogo = """
 """
 resDir = "src/integrationTest/resources"
 resDir2 = "src/integrationTest/resources_2"
+resDir3 = "src/integrationTest/resources_3"
 log = logging.getLogger('TEST')
 log.setLevel(logging.DEBUG)
 consoleHandler = logging.StreamHandler(sys.stdout)
@@ -182,6 +183,8 @@ def main():
     verifySingleDir(resDir2, "issue_122_ramdisk_img")
     # Issue 123: dtb
     verifySingleDir(resDir2, "issue_123_dtb")
+    # Issue 125: cmdline trim
+    verifySingleDir(resDir3, "issue_125_trim_cmdline")
 
     log.info(successLogo)
 

src/integrationTest/resources_3

@@ -0,0 +1 @@
+Subproject commit 1cd001925f550d82c5dc1b8b6f69611bf4c6490b