folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deal with \r\n after "-----END PGP PBLIC KEY BLOCK-----" from hkp://sks.keyserver.penguin.de 

Add parser failure error codes.

CVS patchset: 7622
CVS date: 2004/12/01 17:52:31
This commit is contained in:
jbj 2004-12-01 17:52:31 +00:00
parent 99e1763612
commit d49ad2ca27
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
rpmio/rpmpgp.c
View File

@ -377,6 +377,7 @@ int pgpPrtSubType(const byte *h, unsigned int hlen, pgpSigType sigtype)
pgpPrtVal(" ", pgpSubTypeTbl, (p[0]&(~PGPSUBTYPE_CRITICAL)));
if (p[0] & PGPSUBTYPE_CRITICAL)
if (_print)
fprintf(stderr, " *CRITICAL*");
switch (*p) {
case PGPSUBTYPE_PREFER_SYMKEY: /* preferred symmetric algorithms */
@ -1213,7 +1214,7 @@ pgpArmor pgpReadPkts(const char * fn, const byte ** pkt, size_t * pktlen)
const char * armortype = NULL;
char * t, * te;
int pstate = 0;
pgpArmor ec = PGPARMOR_ERROR; /* XXX assume failure */
pgpArmor ec = PGPARMOR_ERR_NO_BEGIN_PGP; /* XXX assume failure */
int rc;
rc = rpmioSlurp(fn, &b, &blen);
@ -1244,8 +1245,10 @@ pgpArmor pgpReadPkts(const char * fn, const byte ** pkt, size_t * pktlen)
t += sizeof("-----BEGIN PGP ")-1;
rc = pgpValTok(pgpArmorTbl, t, te);
if (rc < 0)
if (rc < 0) {
ec = PGPARMOR_ERR_UNKNOWN_ARMOR_TYPE;
goto exit;
}
if (rc != PGPARMOR_PUBKEY) /* XXX ASCII Pubkeys only, please. */
continue;
armortype = t;
@ -1278,10 +1281,13 @@ pgpArmor pgpReadPkts(const char * fn, const byte ** pkt, size_t * pktlen)
/*@switchbreak@*/ break;
case 3:
pstate = 0;
if (!TOKEQ(t, "-----END PGP "))
if (!TOKEQ(t, "-----END PGP ")) {
ec = PGPARMOR_ERR_NO_END_PGP;
goto exit;
}
*t = '\0'; /* Terminate encoded crc */
t += sizeof("-----END PGP ")-1;
if (t >= te) continue;
if (armortype == NULL) /* XXX can't happen */
continue;
@ -1289,23 +1295,37 @@ pgpArmor pgpReadPkts(const char * fn, const byte ** pkt, size_t * pktlen)
if (rc)
continue;
t = te - (sizeof("-----\n")-1);
if (!TOKEQ(t, "-----\n"))
t += strlen(armortype);
if (t >= te) continue;
if (!TOKEQ(t, "-----")) {
ec = PGPARMOR_ERR_NO_END_PGP;
goto exit;
}
t += (sizeof("-----")-1);
if (t >= te) continue;
/* XXX permitting \r here is not RFC-2440 compliant <shrug> */
if (!(*t == '\n' || *t == '\r')) continue;
crcdec = NULL;
crclen = 0;
if (b64decode(crcenc, (void **)&crcdec, &crclen) != 0)
continue;
if (b64decode(crcenc, (void **)&crcdec, &crclen) != 0) {
ec = PGPARMOR_ERR_CRC_DECODE;
goto exit;
}
crcpkt = pgpGrab(crcdec, crclen);
crcdec = _free(crcdec);
dec = NULL;
declen = 0;
if (b64decode(enc, (void **)&dec, &declen) != 0)
if (b64decode(enc, (void **)&dec, &declen) != 0) {
ec = PGPARMOR_ERR_BODY_DECODE;
goto exit;
}
crc = pgpCRC(dec, declen);
if (crcpkt != crc)
if (crcpkt != crc) {
ec = PGPARMOR_ERR_CRC_CHECK;
goto exit;
}
b = _free(b);
b = dec;
blen = declen;

9
rpmio/rpmpgp.h
View File

@ -926,7 +926,14 @@ union pgpPktPre_u {
*/
/*@-typeuse@*/
typedef enum pgpArmor_e {
PGPARMOR_ERROR = -1,
PGPARMOR_ERR_CRC_CHECK = -7,
PGPARMOR_ERR_BODY_DECODE = -6,
PGPARMOR_ERR_CRC_DECODE = -5,
PGPARMOR_ERR_NO_END_PGP = -4,
PGPARMOR_ERR_UNKNOWN_PREAMBLE_TAG = -3,
PGPARMOR_ERR_UNKNOWN_ARMOR_TYPE = -2,
PGPARMOR_ERR_NO_BEGIN_PGP = -1,
#define PGPARMOR_ERROR PGPARMOR_ERR_NO_BEGIN_PGP
PGPARMOR_NONE = 0,
PGPARMOR_MESSAGE = 1, /*!< MESSAGE */
PGPARMOR_PUBKEY = 2, /*!< PUBLIC KEY BLOCK */