X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/d2d54c98e2d65c46c5fe6519812aa4c6ea55ea02..45c0fd363937c6e9b05da04a9167e9912c05ca0c:/ec-info.c diff --git a/ec-info.c b/ec-info.c index 3a5b0962..474691b3 100644 --- a/ec-info.c +++ b/ec-info.c @@ -7,7 +7,7 @@ * (c) 2004 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of Catacomb. * @@ -15,12 +15,12 @@ * 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, @@ -48,7 +48,7 @@ * 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 @@ -63,7 +63,7 @@ ec_curve *ec_curveparse(qd_parse *qd) 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) { @@ -218,7 +218,7 @@ void ec_infofromdata(ec_info *ei, ecdata *ed) * curve, or it has the form * * * elliptic curve description - * * optional `/' + * * optional `;' * * common point * * optional `:' * * group order @@ -239,10 +239,10 @@ int ec_infoparse(qd_parse *qd, ec_info *ei) 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;