Merge branch '1.3.x'

[catacomb-python] / ec.c

diff --git a/ec.c b/ec.c
index 184dc9ecd47ff83d3b6acb85f5b9b61d59caa46b..a660eb66691752cfd006f3da122c51b802050fad 100644 (file)
--- a/ec.c
+++ b/ec.c
@@ -48,13 +48,13 @@ ec_curve *eccurve_copy(ec_curve *c)
     return (0);
   a = F_OUT(f, MP_NEW, c->a);
   b = F_OUT(f, MP_NEW, c->b);
     return (0);
   a = F_OUT(f, MP_NEW, c->a);
   b = F_OUT(f, MP_NEW, c->b);

-  if (strcmp(EC_NAME(c), "prime") == 0)
+  if (STRCMP(EC_NAME(c), ==, "prime"))

     c = ec_prime(f, a, b);
     c = ec_prime(f, a, b);

-  else if (strcmp(EC_NAME(c), "primeproj") == 0)
+  else if (STRCMP(EC_NAME(c), ==, "primeproj"))

     c = ec_primeproj(f, a, b);
     c = ec_primeproj(f, a, b);

-  else if (strcmp(EC_NAME(c), "bin") == 0)
+  else if (STRCMP(EC_NAME(c), ==, "bin"))

     c = ec_bin(f, a, b);
     c = ec_bin(f, a, b);

-  else if (strcmp(EC_NAME(c), "binproj") == 0)
+  else if (STRCMP(EC_NAME(c), ==, "binproj"))

     c = ec_binproj(f, a, b);
   else
     c = 0;
     c = ec_binproj(f, a, b);
   else
     c = 0;


@@ -983,13 +983,13 @@ PyObject *eccurve_pywrap(PyObject *fobj, ec_curve *c)
   else
     Py_INCREF(fobj);
   assert(FIELD_F(fobj) == c->f);
   else
     Py_INCREF(fobj);
   assert(FIELD_F(fobj) == c->f);

-  if (strcmp(EC_NAME(c), "prime") == 0)
+  if (STRCMP(EC_NAME(c), ==, "prime"))

     ty = ecprimecurve_pytype;
     ty = ecprimecurve_pytype;

-  else if (strcmp(EC_NAME(c), "primeproj") == 0)
+  else if (STRCMP(EC_NAME(c), ==, "primeproj"))

     ty = ecprimeprojcurve_pytype;
     ty = ecprimeprojcurve_pytype;

-  else if (strcmp(EC_NAME(c), "bin") == 0)
+  else if (STRCMP(EC_NAME(c), ==, "bin"))

     ty = ecbincurve_pytype;
     ty = ecbincurve_pytype;

-  else if (strcmp(EC_NAME(c), "binproj") == 0)
+  else if (STRCMP(EC_NAME(c), ==, "binproj"))

     ty = ecbinprojcurve_pytype;
   else
     abort();
     ty = ecbinprojcurve_pytype;
   else
     abort();