From c9d17f6ab746aae9f51658e5f8773b5c60beb7d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michele=20Orr=C3=B9?= Date: Thu, 28 Nov 2019 15:57:35 +0100 Subject: [PATCH 1/2] Make sage script in notes/design.rs work with sage 3.9. Sage is now using python3. --- src/notes/design.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/notes/design.rs b/src/notes/design.rs index d245260ef..6c528e714 100644 --- a/src/notes/design.rs +++ b/src/notes/design.rs @@ -46,7 +46,7 @@ //! y = psqrt(rhs) //! p = ec(x, y) * g1_h(param) //! if (not p.is_zero()) and (p * r).is_zero(): -//! print "g1 generator: %s" % p +//! print("g1 generator: {}".format(p)) //! break //! Fqx. = PolynomialRing(Fq, 'j') //! Fq2. = GF(q^2, modulus=j^2 + 1) @@ -57,7 +57,7 @@ //! if rhs.is_square(): //! y = psqrt(rhs) //! p = ec2(Fq2(x), y) * g2_h(param) -//! if (not p.is_zero()) and (p * r).is_zero(): -//! print "g2 generator: %s" % p +//! if not p.is_zero() and (p * r).is_zero(): +//! print("g2 generator: {}".format(p)) //! break //! ``` From 14b5e16d883ea0e14c5dfd601a42a2eaaccb82f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michele=20Orr=C3=B9?= Date: Thu, 28 Nov 2019 15:58:31 +0100 Subject: [PATCH 2/2] No need to define a polynomial ring in notes/design.rs. --- src/notes/design.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/notes/design.rs b/src/notes/design.rs index 6c528e714..0f8c7fafb 100644 --- a/src/notes/design.rs +++ b/src/notes/design.rs @@ -48,8 +48,7 @@ //! if (not p.is_zero()) and (p * r).is_zero(): //! print("g1 generator: {}".format(p)) //! break -//! Fqx. = PolynomialRing(Fq, 'j') -//! Fq2. = GF(q^2, modulus=j^2 + 1) +//! Fq2. = GF(q^2, modulus=[1, 0, 1]) //! ec2 = EllipticCurve(Fq2, [0, (4 * (1 + i))]) //! assert(ec2.order() == (r * g2_h(param))) //! for x in range(0,100):