X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/c81b29e0a7b1c0ee0b3299a39dafe480f16159ef..a90d420cbe87490c844ae422c966e746d3134b07:/progs/key.c

diff --git a/progs/key.c b/progs/key.c
index 9c9466b8..c38ed5db 100644
--- a/progs/key.c
+++ b/progs/key.c
@@ -1397,6 +1397,11 @@ static void showkeydata(key_data *k, int ind, listopts *o, dstr *d)
   }									\
 } while (0)
 
+  if ((k->e&KF_ENCMASK) == KENC_ENCRYPT && o->v <= 4)
+    { fputs(" encrypted\n", stdout); return; }
+  if ((k->e&KF_ENCMASK) != KENC_STRUCT && !(k->e&KF_NONSECRET) && o->v <= 3)
+    { fputs(" secret\n", stdout); return; }
+
   switch (k->e & KF_ENCMASK) {
 
     /* --- Binary key data --- *
@@ -1432,20 +1437,16 @@ static void showkeydata(key_data *k, int ind, listopts *o, dstr *d)
      * key.  Otherwise just say that it's encrypted and move on.
      */
 
-    case KENC_ENCRYPT:
-      if (o->v <= 3)
-	fputs(" encrypted\n", stdout);
+    case KENC_ENCRYPT: {
+      key_data *kd;
+      if (key_punlock(&kd, k, d->buf))
+	printf(" <failed to unlock %s>\n", d->buf);
       else {
-	key_data *kd;
-	if (key_punlock(&kd, k, d->buf))
-	  printf(" <failed to unlock %s>\n", d->buf);
-	else {
-	  fputs(" encrypted", stdout);
-	  showkeydata(kd, ind, o, d);
-	  key_drop(kd);
-	}
+	fputs(" encrypted", stdout);
+	showkeydata(kd, ind, o, d);
+	key_drop(kd);
       }
-      break;
+    } break;
 
     /* --- Integer keys --- *
      *