File accept-crit-subpkt.diff of Package rpm-ndb
--- rpmio/rpmpgp.c.orig 2024-04-25 14:58:24.951835573 +0000
+++ rpmio/rpmpgp.c 2024-04-26 09:29:55.365018253 +0000
@@ -458,8 +458,10 @@ static int pgpPrtSubType(const uint8_t *
_digp->saved |= PGPDIG_SAVED_TIME;
_digp->time = pgpGrab(p+1, sizeof(_digp->time));
}
+ /* FALLTHROUGH */
case PGPSUBTYPE_SIG_EXPIRE_TIME:
case PGPSUBTYPE_KEY_EXPIRE_TIME:
+ impl = *p;
pgpPrtTime(" ", p+1, plen-1);
break;
@@ -473,6 +475,16 @@ static int pgpPrtSubType(const uint8_t *
_digp->saved |= PGPDIG_SAVED_ID;
memcpy(_digp->signid, p+1, sizeof(_digp->signid));
}
+ pgpPrtHex("", p+1, plen-1);
+ break;
+
+ case PGPSUBTYPE_PRIMARY_USERID:
+ case PGPSUBTYPE_KEY_FLAGS:
+ case PGPSUBTYPE_EMBEDDED_SIG:
+ impl = *p; /* accept critical packet */
+ pgpPrtHex("", p+1, plen-1);
+ break;
+
case PGPSUBTYPE_EXPORTABLE_CERT:
case PGPSUBTYPE_TRUST_SIG:
case PGPSUBTYPE_REGEX:
@@ -481,13 +493,10 @@ static int pgpPrtSubType(const uint8_t *
case PGPSUBTYPE_REVOKE_KEY:
case PGPSUBTYPE_NOTATION:
case PGPSUBTYPE_PREFER_KEYSERVER:
- case PGPSUBTYPE_PRIMARY_USERID:
case PGPSUBTYPE_POLICY_URL:
- case PGPSUBTYPE_KEY_FLAGS:
case PGPSUBTYPE_SIGNER_USERID:
case PGPSUBTYPE_REVOKE_REASON:
case PGPSUBTYPE_FEATURES:
- case PGPSUBTYPE_EMBEDDED_SIG:
case PGPSUBTYPE_INTERNAL_100:
case PGPSUBTYPE_INTERNAL_101:
case PGPSUBTYPE_INTERNAL_102: