From ef95df6caa9bb19daa6c164302a68d3420e3018f Mon Sep 17 00:00:00 2001
From: Sean Bowe <ewillbefull@gmail.com>
Date: Tue, 13 Dec 2016 23:11:00 -0700
Subject: [PATCH] Ensure G2 elements are in the correct subgroup of the twisted
 curve.

---
 Cargo.toml        |  2 +-
 README.md         |  2 +-
 src/groups/mod.rs | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index eabb522..3177874 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bn"
-version = "0.4.1"
+version = "0.4.2"
 authors = ["Sean Bowe <ewillbefull@gmail.com>"]
 description = "Pairing cryptography with the Barreto-Naehrig curve"
 keywords = ["pairing","crypto","cryptography"]
diff --git a/README.md b/README.md
index fecb172..fc88a08 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Add the `bn` crate to your dependencies in `Cargo.toml`...
 
 ```toml
 [dependencies]
-bn = "0.4.1"
+bn = "0.4.2"
 ```
 
 ...and add an `extern crate` declaration to your crate root:
diff --git a/src/groups/mod.rs b/src/groups/mod.rs
index 60338c0..b57c3de 100644
--- a/src/groups/mod.rs
+++ b/src/groups/mod.rs
@@ -30,6 +30,7 @@ pub trait GroupParams: Sized {
     fn name() -> &'static str;
     fn one() -> G<Self>;
     fn coeff_b() -> Self::Base;
+    fn check_order() -> bool { false }
 }
 
 #[repr(C)]
@@ -181,6 +182,18 @@ impl<P: GroupParams> Decodable for AffineG<P> {
 
         // y^2 = x^3 + b
         if y.squared() == (x.squared() * x) + P::coeff_b() {
+            if P::check_order() {
+                let p: G<P> = G {
+                    x: x,
+                    y: y,
+                    z: P::Base::one()
+                };
+
+                if (p * (-Fr::one())) + p != G::zero() {
+                    return Err(s.error("point is not in the subgroup"))
+                }
+            }
+
             Ok(AffineG {
                 x: x,
                 y: y
@@ -378,6 +391,8 @@ impl GroupParams for G2Params {
             const_fq([0x38e7ecccd1dcff67, 0x65f0b37d93ce0d3e, 0xd749d0dd22ac00aa, 0x0141b9ce4a688d4d])
         )
     }
+
+    fn check_order() -> bool { true }
 }
 
 pub type G2 = G<G2Params>;