diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2009-11-25 15:07:17 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2009-11-25 15:07:17 +0200 |
| commit | 98213fc4192c7af07037a0f3e9cce9e3b8509c02 (patch) | |
| tree | 5384d5ccd3a8b798e65ee97e8db6a0803c575fcf /rpmio | |
| parent | ded0c513836cee2f237edc2e28ee8aec261fd675 (diff) | |
| download | rpm-98213fc4192c7af07037a0f3e9cce9e3b8509c02.tar.gz rpm-98213fc4192c7af07037a0f3e9cce9e3b8509c02.tar.bz2 rpm-98213fc4192c7af07037a0f3e9cce9e3b8509c02.zip | |
We can't handle OpenPGP subkeys or secret keys, so dont even try
- parsing subkeys ends up overwriting data in the main key, causing
bogus signature checking failures
- this is the final missing piece of RhBug:436812, short of adding
proper support for subkeys (maybe someday...)
Diffstat (limited to 'rpmio')
| -rw-r--r-- | rpmio/rpmpgp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c index b6c4065b2..854174e3c 100644 --- a/rpmio/rpmpgp.c +++ b/rpmio/rpmpgp.c @@ -1180,11 +1180,6 @@ static int pgpPrtPkt(const uint8_t *pkt, size_t pleft, else memset(_digp->signid, 0, sizeof(_digp->signid)); } - case PGPTAG_PUBLIC_SUBKEY: - rc = pgpPrtKey(tag, h, hlen, _dig, _digp); - break; - case PGPTAG_SECRET_KEY: - case PGPTAG_SECRET_SUBKEY: rc = pgpPrtKey(tag, h, hlen, _dig, _digp); break; case PGPTAG_USER_ID: @@ -1195,6 +1190,9 @@ static int pgpPrtPkt(const uint8_t *pkt, size_t pleft, rc = pgpPrtComment(tag, h, hlen); break; + case PGPTAG_PUBLIC_SUBKEY: + case PGPTAG_SECRET_KEY: + case PGPTAG_SECRET_SUBKEY: case PGPTAG_RESERVED: case PGPTAG_PUBLIC_SESSION_KEY: case PGPTAG_SYMMETRIC_SESSION_KEY: |