X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/e56dff91c23e9e8ac8bc34cfc17728a1cb2953c6..e4a509b8174c8b2cfc0a084b78c9c7b7d08b624b:/key-pack.c

diff --git a/key-pack.c b/key-pack.c
index e6f2825..cc0f20a 100644
--- a/key-pack.c
+++ b/key-pack.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: key-pack.c,v 1.1 2000/06/17 10:42:41 mdw Exp $
+ * $Id: key-pack.c,v 1.3 2004/04/08 01:36:15 mdw Exp $
  *
  * Packing and unpacking key data
  *
@@ -27,14 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: key-pack.c,v $
- * Revision 1.1  2000/06/17 10:42:41  mdw
- * Packing and unpacking structured keys.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <mLib/dstr.h>
@@ -67,6 +59,12 @@ int key_pack(key_packdef *kp, key_data *kd, dstr *d)
     case KENC_MP:
       kd->u.m = *(mp **)kp->p;
       return (0);
+    case KENC_STRING:
+      kd->u.p = *(char **)kp->p;
+      return (0);
+    case KENC_EC:
+      kd->u.e = *(ec *)kp->p;
+      return (0);
 
     /* --- Encrypted keys are a little tricky --- *
      *
@@ -161,6 +159,12 @@ int key_unpack(key_packdef *kp, key_data *kd, dstr *d)
     case KENC_MP:
       *(mp **)kp->p = kd->u.m;
       break;
+    case KENC_STRING:
+      *(char **)kp->p = kd->u.p;
+      break;
+    case KENC_EC:
+      *(ec *)kp->p = kd->u.e;
+      break;
 
     /* --- Structured keys take a little care --- */