mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00
Code

fix pgp pubkey parsing

Browse Source 
the base64 checksum must not be included in the key data. Newer rpm
don't like that.
This commit is contained in:
Ludwig Nussel 2011-08-05 13:52:42 +02:00
parent e3f0821bd4
commit f707e9a22e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osc/checker.py
View File

@ -61,16 +61,24 @@ class Checker:
key = ''
line = fd.readline()
crc = None
while line:
if line[0:12] == "-----END PGP":
break
line = line.rstrip()
key += line
line = fd.readline()
if (line[0] == '='):
crc = line[1:]
line = fd.readline()
break
else:
key += line
line = fd.readline()
fd.close()
if not line or line[0:12] != "-----END PGP":
raise KeyError(file, "not a pgp public key")
# TODO: compute and compare CRC, see RFC 2440
bkey = base64.b64decode(key)
r = self.ts.pgpImportPubkey(bkey)