* (c) 2004 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of Catacomb.
*
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
- *
+ *
* Catacomb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Library General Public
* License along with Catacomb; if not, write to the Free
* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* Use: Parses an elliptic curve description, which has the form
*
* * a field description
- * * an optional `/'
+ * * an optional `;'
* * `prime', `primeproj', `bin', or `binproj'
* * an optional `:'
* * the %$a$% parameter
field *f;
if ((f = field_parse(qd)) == 0) goto fail;
- qd_delim(qd, '/');
+ qd_delim(qd, ';');
switch (qd_enum(qd, "prime,primeproj,bin,binproj")) {
case 0:
if (F_TYPE(f) != FTY_PRIME) {
* curve, or it has the form
*
* * elliptic curve description
- * * optional `/'
+ * * optional `;'
* * common point
* * optional `:'
* * group order
ec_infofromdata(ei, ee->data);
goto found;
}
- }
+ }
if ((c = ec_curveparse(qd)) == 0) goto fail;
- qd_delim(qd, '/'); if (!ec_ptparse(qd, &g)) goto fail;
+ qd_delim(qd, ';'); if (!ec_ptparse(qd, &g)) goto fail;
qd_delim(qd, ':'); if ((r = qd_getmp(qd)) == 0) goto fail;
qd_delim(qd, '*'); if ((h = qd_getmp(qd)) == 0) goto fail;
ei->c = c; ei->g = g; ei->r = r; ei->h = h;
e = ec_checkinfo(&ei, gr);
ec_freeinfo(&ei);
if (e) {
- printf(" [%s fails: %s]", ee->name, e);
+ printf(" [%s fails: %s]", ee->name, e);
ok = 0;
} else
printf(" %s", ee->name);