From f49a3ac1ff7f5143101c1b081f549b0add3822ec Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>
Date: Tue, 5 Jul 2022 15:04:08 +0200
Subject: [PATCH] Port updateKey

Signed-off-by: Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>
---
 src/service/pgp.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/service/pgp.js b/src/service/pgp.js
index a36d3b8..ee3d51f 100644
--- a/src/service/pgp.js
+++ b/src/service/pgp.js
@@ -168,13 +168,17 @@ class PGP {
    * @return {String}            merged armored key block
    */
   async updateKey(srcArmored, dstArmored) {
-    const {keys: [srcKey], err: srcErr} = await openpgp.key.readArmored(srcArmored);
-    if (srcErr) {
+    let srcKey;
+    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);
       util.throw(500, 'Failed to parse PGP key');
     }
-    const {keys: [dstKey], err: dstErr} = await openpgp.key.readArmored(dstArmored);
-    if (dstErr) {
+    try {
+      dstKey = await openpgp.readKey({armoredKey: dstArmored});
+    } catch (dstErr) {
       log.error('pgp', 'Failed to parse destination PGP key for update:\n%s', dstArmored, dstErr);
       util.throw(500, 'Failed to parse PGP key');
     }