X-Git-Url: https://www.bearssl.org/gitweb//home/git/?p=BearSSL;a=blobdiff_plain;f=src%2Fec%2Fec_all_m31.c;h=8fd8c3c064add2b59b109a7ae8a1945ec18cdad7;hp=b217d7c2c090ee7480b2764cdac63de1c8177cb8;hb=dda1f8a0c46e15b4a235163470ff700b2f13dcc5;hpb=b2a08e908d6a1802c9d50aca699193b38b31a0b2

diff --git a/src/ec/ec_all_m31.c b/src/ec/ec_all_m31.c
index b217d7c..8fd8c3c 100644
--- a/src/ec/ec_all_m31.c
+++ b/src/ec/ec_all_m31.c
@@ -29,10 +29,14 @@ api_generator(int curve, size_t *len)
 {
 	switch (curve) {
 	case BR_EC_secp256r1:
+#if BR_INT128 || BR_UMUL128
+		return br_ec_p256_m64.generator(curve, len);
+#else
 		return br_ec_p256_m31.generator(curve, len);
+#endif
 	case BR_EC_curve25519:
 #if BR_INT128 || BR_UMUL128
-		return br_ec_c25519_m62.generator(curve, len);
+		return br_ec_c25519_m64.generator(curve, len);
 #else
 		return br_ec_c25519_m31.generator(curve, len);
 #endif
@@ -46,10 +50,14 @@ api_order(int curve, size_t *len)
 {
 	switch (curve) {
 	case BR_EC_secp256r1:
+#if BR_INT128 || BR_UMUL128
+		return br_ec_p256_m64.order(curve, len);
+#else
 		return br_ec_p256_m31.order(curve, len);
+#endif
 	case BR_EC_curve25519:
 #if BR_INT128 || BR_UMUL128
-		return br_ec_c25519_m62.order(curve, len);
+		return br_ec_c25519_m64.order(curve, len);
 #else
 		return br_ec_c25519_m31.order(curve, len);
 #endif
@@ -63,10 +71,14 @@ api_xoff(int curve, size_t *len)
 {
 	switch (curve) {
 	case BR_EC_secp256r1:
+#if BR_INT128 || BR_UMUL128
+		return br_ec_p256_m64.xoff(curve, len);
+#else
 		return br_ec_p256_m31.xoff(curve, len);
+#endif
 	case BR_EC_curve25519:
 #if BR_INT128 || BR_UMUL128
-		return br_ec_c25519_m62.xoff(curve, len);
+		return br_ec_c25519_m64.xoff(curve, len);
 #else
 		return br_ec_c25519_m31.xoff(curve, len);
 #endif
@@ -81,10 +93,14 @@ api_mul(unsigned char *G, size_t Glen,
 {
 	switch (curve) {
 	case BR_EC_secp256r1:
+#if BR_INT128 || BR_UMUL128
+		return br_ec_p256_m64.mul(G, Glen, kb, kblen, curve);
+#else
 		return br_ec_p256_m31.mul(G, Glen, kb, kblen, curve);
+#endif
 	case BR_EC_curve25519:
 #if BR_INT128 || BR_UMUL128
-		return br_ec_c25519_m62.mul(G, Glen, kb, kblen, curve);
+		return br_ec_c25519_m64.mul(G, Glen, kb, kblen, curve);
 #else
 		return br_ec_c25519_m31.mul(G, Glen, kb, kblen, curve);
 #endif
@@ -99,10 +115,14 @@ api_mulgen(unsigned char *R,
 {
 	switch (curve) {
 	case BR_EC_secp256r1:
+#if BR_INT128 || BR_UMUL128
+		return br_ec_p256_m64.mulgen(R, x, xlen, curve);
+#else
 		return br_ec_p256_m31.mulgen(R, x, xlen, curve);
+#endif
 	case BR_EC_curve25519:
 #if BR_INT128 || BR_UMUL128
-		return br_ec_c25519_m62.mulgen(R, x, xlen, curve);
+		return br_ec_c25519_m64.mulgen(R, x, xlen, curve);
 #else
 		return br_ec_c25519_m31.mulgen(R, x, xlen, curve);
 #endif
@@ -118,11 +138,16 @@ api_muladd(unsigned char *A, const unsigned char *B, size_t len,
 {
 	switch (curve) {
 	case BR_EC_secp256r1:
+#if BR_INT128 || BR_UMUL128
+		return br_ec_p256_m64.muladd(A, B, len,
+			x, xlen, y, ylen, curve);
+#else
 		return br_ec_p256_m31.muladd(A, B, len,
 			x, xlen, y, ylen, curve);
+#endif
 	case BR_EC_curve25519:
 #if BR_INT128 || BR_UMUL128
-		return br_ec_c25519_m62.muladd(A, B, len,
+		return br_ec_c25519_m64.muladd(A, B, len,
 			x, xlen, y, ylen, curve);
 #else
 		return br_ec_c25519_m31.muladd(A, B, len,