/* -*-c-*-
*
- * $Id: key-binary.c,v 1.4 2004/03/28 01:58:47 mdw Exp $
+ * $Id$
*
* Key binary encoding
*
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: key-binary.c,v $
- * Revision 1.4 2004/03/28 01:58:47 mdw
- * Generate, store and retreive elliptic curve keys.
- *
- * 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>
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);
- EC_CREATE(&k->u.e);
k->u.e.x = mp_loadb(MP_NEW, q + 6, xsz);
- k->u.e.y = mp_loadb(MP_NEW, q + 6 + xsz, ysz);
+ k->u.e.y = mp_loadb(MP_NEW, q + 8 + xsz, ysz);
} break;
/* --- Structured key data --- */
* 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;
case KENC_EC: {
char *p;
- size_t xsz = mp_octets(k->u.e.x), ysz = mp_octets(k->u.e.y);
- size_t sz = xsz + ysz + 4;
+ 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);
- 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);
+ 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;
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;