- 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);