diff --git a/src/openpgp/files.c b/src/openpgp/files.c
index 79ef11f..2eca01d 100644
--- a/src/openpgp/files.c
+++ b/src/openpgp/files.c
@@ -326,154 +326,151 @@ file_t file_entries[] = {
     /* 81 */ { .fid = EF_PIV_KEY_RETIRED12, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_WP },
-    /* 82 */ { .fid = EF_PIV_KEY_RETIRED12, .parent = 0, .name = NULL,
+    /* 82 */ { .fid = EF_PIV_KEY_RETIRED13, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_WP },
-    /* 83 */ { .fid = EF_PIV_KEY_RETIRED13, .parent = 0, .name = NULL,
+    /* 83 */ { .fid = EF_PIV_KEY_RETIRED14, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_WP },
-    /* 84 */ { .fid = EF_PIV_KEY_RETIRED14, .parent = 0, .name = NULL,
+    /* 84 */ { .fid = EF_PIV_KEY_RETIRED15, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_WP },
-    /* 85 */ { .fid = EF_PIV_KEY_RETIRED15, .parent = 0, .name = NULL,
+    /* 85 */ { .fid = EF_PIV_KEY_RETIRED16, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_WP },
-    /* 86 */ { .fid = EF_PIV_KEY_RETIRED16, .parent = 0, .name = NULL,
+    /* 86 */ { .fid = EF_PIV_KEY_RETIRED17, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_WP },
-    /* 87 */ { .fid = EF_PIV_KEY_RETIRED17, .parent = 0, .name = NULL,
+    /* 87 */ { .fid = EF_PIV_KEY_RETIRED18, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_WP },
-    /* 88 */ { .fid = EF_PIV_KEY_RETIRED18, .parent = 0, .name = NULL,
+    /* 88 */ { .fid = EF_PIV_KEY_RETIRED19, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_WP },
-    /* 89 */ { .fid = EF_PIV_KEY_RETIRED19, .parent = 0, .name = NULL,
+    /* 89 */ { .fid = EF_PIV_KEY_RETIRED20, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_WP },
-    /* 90 */ { .fid = EF_PIV_KEY_RETIRED20, .parent = 0, .name = NULL,
-               .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
-               .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_WP },
-    /* 91 */ { .fid = EF_PIV_KEY_ATTESTATION, .parent = 0, .name = NULL,
+    /* 90 */ { .fid = EF_PIV_KEY_ATTESTATION, .parent = 0, .name = NULL,
                .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_WP },
-    /* 92 */ { .fid = EF_PIV_CAPABILITY, .parent = 0, .name = NULL,
+    /* 91 */ { .fid = EF_PIV_CAPABILITY, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 93 */ { .fid = EF_PIV_CHUID, .parent = 0, .name = NULL,
+    /* 92 */ { .fid = EF_PIV_CHUID, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 94 */ { .fid = EF_PIV_AUTHENTICATION, .parent = 0, .name = NULL,
+    /* 93 */ { .fid = EF_PIV_AUTHENTICATION, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 95 */ { .fid = EF_PIV_FINGERPRINTS, .parent = 0, .name = NULL,
+    /* 94 */ { .fid = EF_PIV_FINGERPRINTS, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 96 */ { .fid = EF_PIV_SECURITY, .parent = 0, .name = NULL,
+    /* 95 */ { .fid = EF_PIV_SECURITY, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 97 */ { .fid = EF_PIV_FACIAL, .parent = 0, .name = NULL,
+    /* 96 */ { .fid = EF_PIV_FACIAL, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 98 */ { .fid = EF_PIV_PRINTED, .parent = 0, .name = NULL,
+    /* 97 */ { .fid = EF_PIV_PRINTED, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 99 */ { .fid = EF_PIV_SIGNATURE, .parent = 0, .name = NULL,
+    /* 98 */ { .fid = EF_PIV_SIGNATURE, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 100 */ { .fid = EF_PIV_KEY_MANAGEMENT, .parent = 0, .name = NULL,
+    /* 99 */ { .fid = EF_PIV_KEY_MANAGEMENT, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 101 */ { .fid = EF_PIV_CARD_AUTH, .parent = 0, .name = NULL,
+    /* 100 */ { .fid = EF_PIV_CARD_AUTH, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 102 */ { .fid = EF_PIV_DISCOVERY, .parent = 0, .name = NULL,
+    /* 101 */ { .fid = EF_PIV_DISCOVERY, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FUNC, .data = (uint8_t *) piv_parse_discovery,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 103 */ { .fid = EF_PIV_KEY_HISTORY, .parent = 0, .name = NULL,
+    /* 102 */ { .fid = EF_PIV_KEY_HISTORY, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 104 */ { .fid = EF_PIV_IRIS, .parent = 0, .name = NULL,
+    /* 103 */ { .fid = EF_PIV_IRIS, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 105 */ { .fid = EF_PIV_BITGT, .parent = 0, .name = NULL,
+    /* 104 */ { .fid = EF_PIV_BITGT, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 106 */ { .fid = EF_PIV_SM_SIGNER, .parent = 0, .name = NULL,
+    /* 105 */ { .fid = EF_PIV_SM_SIGNER, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 107 */ { .fid = EF_PIV_PC_REF_DATA, .parent = 0, .name = NULL,
+    /* 106 */ { .fid = EF_PIV_PC_REF_DATA, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 108 */ { .fid = EF_PIV_RETIRED1, .parent = 0, .name = NULL,
+    /* 107 */ { .fid = EF_PIV_RETIRED1, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 109 */ { .fid = EF_PIV_RETIRED2, .parent = 0, .name = NULL,
+    /* 108 */ { .fid = EF_PIV_RETIRED2, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 110 */ { .fid = EF_PIV_RETIRED3, .parent = 0, .name = NULL,
+    /* 109 */ { .fid = EF_PIV_RETIRED3, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 111 */ { .fid = EF_PIV_RETIRED4, .parent = 0, .name = NULL,
+    /* 110 */ { .fid = EF_PIV_RETIRED4, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 112 */ { .fid = EF_PIV_RETIRED5, .parent = 0, .name = NULL,
+    /* 111 */ { .fid = EF_PIV_RETIRED5, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 113 */ { .fid = EF_PIV_RETIRED6, .parent = 0, .name = NULL,
+    /* 112 */ { .fid = EF_PIV_RETIRED6, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 114 */ { .fid = EF_PIV_RETIRED7, .parent = 0, .name = NULL,
+    /* 113 */ { .fid = EF_PIV_RETIRED7, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 115 */ { .fid = EF_PIV_RETIRED8, .parent = 0, .name = NULL,
+    /* 114 */ { .fid = EF_PIV_RETIRED8, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 116 */ { .fid = EF_PIV_RETIRED9, .parent = 0, .name = NULL,
+    /* 115 */ { .fid = EF_PIV_RETIRED9, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 117 */ { .fid = EF_PIV_RETIRED10, .parent = 0, .name = NULL,
+    /* 116 */ { .fid = EF_PIV_RETIRED10, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 118 */ { .fid = EF_PIV_RETIRED11, .parent = 0, .name = NULL,
+    /* 117 */ { .fid = EF_PIV_RETIRED11, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 119 */ { .fid = EF_PIV_RETIRED12, .parent = 0, .name = NULL,
+    /* 118 */ { .fid = EF_PIV_RETIRED12, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 120 */ { .fid = EF_PIV_RETIRED13, .parent = 0, .name = NULL,
+    /* 119 */ { .fid = EF_PIV_RETIRED13, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 121 */ { .fid = EF_PIV_RETIRED14, .parent = 0, .name = NULL,
+    /* 120 */ { .fid = EF_PIV_RETIRED14, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 122 */ { .fid = EF_PIV_RETIRED15, .parent = 0, .name = NULL,
+    /* 121 */ { .fid = EF_PIV_RETIRED15, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 123 */ { .fid = EF_PIV_RETIRED16, .parent = 0, .name = NULL,
+    /* 122 */ { .fid = EF_PIV_RETIRED16, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 124 */ { .fid = EF_PIV_RETIRED17, .parent = 0, .name = NULL,
+    /* 123 */ { .fid = EF_PIV_RETIRED17, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 125 */ { .fid = EF_PIV_RETIRED18, .parent = 0, .name = NULL,
+    /* 124 */ { .fid = EF_PIV_RETIRED18, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 126 */ { .fid = EF_PIV_RETIRED19, .parent = 0, .name = NULL,
+    /* 125 */ { .fid = EF_PIV_RETIRED19, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 127 */ { .fid = EF_PIV_RETIRED20, .parent = 0, .name = NULL,
+    /* 126 */ { .fid = EF_PIV_RETIRED20, .parent = 0, .name = NULL,
                .type = FILE_TYPE_WORKING_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
-    /* 128 */ { .fid = EF_PIV_PIN, .parent = 0, .name = NULL,
+    /* 127 */ { .fid = EF_PIV_PIN, .parent = 0, .name = NULL,
                .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_WP },
-    /* 129 */ { .fid = EF_PIV_PUK, .parent = 0, .name = NULL,
+    /* 128 */ { .fid = EF_PIV_PUK, .parent = 0, .name = NULL,
                .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_WP },
-    /* 130 */ { .fid = EF_META, .parent = 0, .name = NULL,
+    /* 129 */ { .fid = EF_META, .parent = 0, .name = NULL,
                .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_NONE },
-    /* 131 */ { .fid = EF_PW_RETRIES, .parent = 0, .name = NULL,
+    /* 130 */ { .fid = EF_PW_RETRIES, .parent = 0, .name = NULL,
                .type = FILE_TYPE_INTERNAL_EF | FILE_DATA_FLASH, .data = NULL,
                .ef_structure = FILE_EF_TRANSPARENT, .acl = ACL_R_WP },
     /* 131 */ { .fid = EF_PRIV_DO_1, .parent = 0, .name = NULL,