Port updateKey
Signed-off-by: Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>
This commit is contained in:
parent
b10e3faf45
commit
f49a3ac1ff
@ -168,13 +168,17 @@ class PGP {
|
|||||||
* @return {String} merged armored key block
|
* @return {String} merged armored key block
|
||||||
*/
|
*/
|
||||||
async updateKey(srcArmored, dstArmored) {
|
async updateKey(srcArmored, dstArmored) {
|
||||||
const {keys: [srcKey], err: srcErr} = await openpgp.key.readArmored(srcArmored);
|
let srcKey;
|
||||||
if (srcErr) {
|
let dstKey;
|
||||||
|
try {
|
||||||
|
srcKey = await openpgp.readKey({armoredKey: srcArmored});
|
||||||
|
} catch (srcErr) {
|
||||||
log.error('pgp', 'Failed to parse source PGP key for update:\n%s', srcArmored, srcErr);
|
log.error('pgp', 'Failed to parse source PGP key for update:\n%s', srcArmored, srcErr);
|
||||||
util.throw(500, 'Failed to parse PGP key');
|
util.throw(500, 'Failed to parse PGP key');
|
||||||
}
|
}
|
||||||
const {keys: [dstKey], err: dstErr} = await openpgp.key.readArmored(dstArmored);
|
try {
|
||||||
if (dstErr) {
|
dstKey = await openpgp.readKey({armoredKey: dstArmored});
|
||||||
|
} catch (dstErr) {
|
||||||
log.error('pgp', 'Failed to parse destination PGP key for update:\n%s', dstArmored, dstErr);
|
log.error('pgp', 'Failed to parse destination PGP key for update:\n%s', dstArmored, dstErr);
|
||||||
util.throw(500, 'Failed to parse PGP key');
|
util.throw(500, 'Failed to parse PGP key');
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user