X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/0d4a06cd790bcad456592d60cb4b40981fa2429a..025c5f4aa5ffbf8948482a4233318db81c2df5d2:/key-binary.c

diff --git a/key-binary.c b/key-binary.c
index 79712e1..75cfbe7 100644
--- a/key-binary.c
+++ b/key-binary.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: key-binary.c,v 1.3 2001/02/03 11:57:00 mdw Exp $
+ * $Id: key-binary.c,v 1.7 2004/04/08 01:36:15 mdw Exp $
  *
  * Key binary encoding
  *
@@ -27,21 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: key-binary.c,v $
- * Revision 1.3  2001/02/03 11:57:00  mdw
- * Track mLib change: symbols no longer need to include a terminating
- * null.
- *
- * Revision 1.2  2000/06/17 11:25:20  mdw
- * Use secure memory interface from MP library.
- *
- * Revision 1.1  2000/02/12 18:21:02  mdw
- * Overhaul of key management (again).
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <stdlib.h>
@@ -107,6 +92,29 @@ int key_decode(const void *p, size_t sz, key_data *k)
       k->u.m = mp_loadb(k->e & KF_BURN ? MP_NEWSEC : MP_NEW, q + 4, psz);
       break;
 
+    /* --- String data --- */
+
+    case KENC_STRING:
+      k->u.p = xmalloc(sz + 1);
+      memcpy(k->u.p, q + 4, sz);
+      k->u.p[sz] = 0;
+      break;
+
+    /* --- Elliptic curve point data --- */
+
+    case KENC_EC: {
+      size_t xsz, ysz;
+      EC_CREATE(&k->u.e);
+      if (!sz) break;
+      if (sz < 2) return (-1);
+      xsz = LOAD16(q + 4);
+      if (sz < xsz + 4) return (-1);
+      ysz = LOAD16(q + 6 + xsz);
+      if (sz < xsz + ysz + 4) return (-1);
+      k->u.e.x = mp_loadb(MP_NEW, q + 6, xsz);
+      k->u.e.y = mp_loadb(MP_NEW, q + 6 + xsz, ysz);
+    } break;
+
     /* --- Structured key data --- */
 
     case KENC_STRUCT: {
@@ -184,6 +192,11 @@ int key_decode(const void *p, size_t sz, key_data *k)
  * Use:		Encodes a key block as binary data.
  */
 
+static int ksbyname(const void *a, const void *b) {
+  key_struct *const *x = a, *const *y = b;
+  return (strcmp(SYM_NAME(*x), SYM_NAME(*y)));
+}
+
 int key_encode(key_data *k, dstr *d, const key_filter *kf)
 {
   int rc = 0;
@@ -216,10 +229,50 @@ int key_encode(key_data *k, dstr *d, const key_filter *kf)
       rc = 1;
     } break;
 
+    case KENC_STRING: {
+      char *p;
+      size_t sz = strlen(k->u.p);
+
+      DENSURE(d, (sz + 7) & ~3);
+      p = d->buf + d->len;
+      STORE16(p, k->e);
+      STORE16(p + 2, sz);
+      memcpy(p + 4, k->u.p, sz);
+      d->len += sz + 4;
+      rc = 1;
+    } break;
+
+    case KENC_EC: {
+      char *p;
+      size_t xsz = 0, ysz = 0;
+      size_t sz;
+
+      if (EC_ATINF(&k->u.e))
+	sz = 0;
+      else {
+	xsz = mp_octets(k->u.e.x);
+	ysz = mp_octets(k->u.e.y);
+	sz = xsz + ysz + 4;
+      }
+      DENSURE(d, (sz + 7) & ~3);
+      p = d->buf + d->len;
+      STORE16(p, k->e);
+      STORE16(p + 2, sz);
+      if (!EC_ATINF(&k->u.e)) {
+	STORE16(p + 4, xsz);
+	mp_storeb(k->u.e.x, p + 6, xsz);
+	STORE16(p + 6 + xsz, ysz);
+	mp_storeb(k->u.e.y, p + 8 + xsz, ysz);
+      }
+      d->len += sz + 4;
+      rc = 1;
+    } break;
+
     case KENC_STRUCT: {
       size_t n;
       char *p;
-      key_struct *ks;
+      key_struct *ks, **ksv;
+      size_t nks, j;
       sym_iter i;
 
       n = d->len;
@@ -227,17 +280,29 @@ int key_encode(key_data *k, dstr *d, const key_filter *kf)
       p = d->buf + n;
       STORE16(p, k->e & KF_ENCMASK);
       d->len += 4;
-      for (sym_mkiter(&i, &k->u.s); (ks = sym_next(&i)) != 0; ) {
-	size_t o = d->len;
-	DENSURE(d, 1);
-	*(octet *)(d->buf + d->len++) = strlen(SYM_NAME(ks));
-	DPUTS(d, SYM_NAME(ks));
-	while (d->len & 3)
-	  DPUTC(d, 0);
-	if (key_encode(&ks->k, d, kf))
-	  rc = 1;
-	else
-	  d->len = o;
+      
+      for (nks = 0, sym_mkiter(&i, &k->u.s);
+	   (ks = sym_next(&i)) != 0;
+	   nks++);
+      if (nks) {
+	ksv = xmalloc(nks * sizeof(*ksv));
+	for (j = 0, sym_mkiter(&i, &k->u.s); (ks = sym_next(&i)) != 0; j++)
+	  ksv[j] = ks;
+	qsort(ksv, nks, sizeof(*ksv), ksbyname);
+	for (j = 0; j < nks; j++) {
+	  size_t o = d->len;
+	  ks = ksv[j];
+	  DENSURE(d, 1);
+	  *(octet *)(d->buf + d->len++) = strlen(SYM_NAME(ks));
+	  DPUTS(d, SYM_NAME(ks));
+	  while (d->len & 3)
+	    DPUTC(d, 0);
+	  if (key_encode(&ks->k, d, kf))
+	    rc = 1;
+	  else
+	    d->len = o;
+	}
+	xfree(ksv);
       }
       if (!rc)
         d->len = n;