From e2a649eddb7ab76fb371f736dfe9d6a52c29e487 Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@torproject.org>
Date: Thu, 9 Mar 2017 01:11:37 +0000
Subject: [PATCH 1/3] Add a missing `use ed25519::Signature` in a docstring
 example.

 * THANKS to Tony Arcieri (@tarcieri) for pointing out the mistake.
---
 src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib.rs b/src/lib.rs
index 7548c36..59e545a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,6 +27,7 @@
 //! use rand::Rng;
 //! use rand::OsRng;
 //! use ed25519::Keypair;
+//! use ed25519::Signature;
 //!
 //! let mut cspring: OsRng = OsRng::new().unwrap();
 //! let keypair: Keypair = Keypair::generate(&mut cspring);

From 4f1447314f2d0648302aff351fef4422e611fbc8 Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@torproject.org>
Date: Tue, 14 Mar 2017 20:16:20 +0000
Subject: [PATCH 2/3] Bump curve25519-dalek version to ^0.6.

---
 Cargo.toml     |  2 +-
 src/ed25519.rs | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ffc9d7a..f48a5e1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ arrayref = "0.3.3"
 sha2 = "^0.4"
 
 [dependencies.curve25519-dalek]
-version = "^0.4"
+version = "^0.6"
 default-features = false
 
 [dependencies.rand]
diff --git a/src/ed25519.rs b/src/ed25519.rs
index a2ac9d2..f431563 100644
--- a/src/ed25519.rs
+++ b/src/ed25519.rs
@@ -18,6 +18,7 @@ use sha2::{Digest, Sha512};
 use rand::Rng;
 
 use curve25519_dalek::curve;
+use curve25519_dalek::curve::BasepointMult;
 use curve25519_dalek::curve::CompressedEdwardsY;
 use curve25519_dalek::curve::ExtendedPoint;
 use curve25519_dalek::curve::ProjectivePoint;
@@ -166,7 +167,7 @@ impl SecretKey {
         r = ExtendedPoint::basepoint_mult(&mesg_digest);
 
         h = Sha512::new();
-        h.input(&r.compress().to_bytes()[..]);
+        h.input(&r.compress_edwards().to_bytes()[..]);
         h.input(public_key);
         h.input(&message);
         hash.copy_from_slice(h.result().as_slice());
@@ -174,7 +175,7 @@ impl SecretKey {
         hram_digest = Scalar::reduce(&hash);
 
         s = Scalar::multiply_add(&hram_digest, &expanded_key_secret, &mesg_digest);
-        t = r.compress();
+        t = r.compress_edwards();
 
         signature_bytes[..32].copy_from_slice(&t.0);
         signature_bytes[32..64].copy_from_slice(&s.0);
@@ -274,7 +275,7 @@ impl PublicKey {
         digest_reduced = Scalar::reduce(&digest);
         r = curve::double_scalar_mult_vartime(&digest_reduced, &a, &Scalar(*top_half));
 
-        if arrays_equal_ct(bottom_half, &r.compress().to_bytes()) == 1 {
+        if arrays_equal_ct(bottom_half, &r.compress_edwards().to_bytes()) == 1 {
             return true
         } else {
             return false
@@ -319,7 +320,7 @@ impl Keypair {
         digest[31] &= 127;
         digest[31] |= 64;
 
-        pk = ExtendedPoint::basepoint_mult(&Scalar(*digest)).compress().to_bytes();
+        pk = ExtendedPoint::basepoint_mult(&Scalar(*digest)).compress_edwards().to_bytes();
 
         for i in  0..32 {
             sk[i]    = t[i];
@@ -397,7 +398,7 @@ mod test {
                 break;
             }
         }
-        public = PublicKey(a.compress());
+        public = PublicKey(a.compress_edwards());
 
         assert!(keypair.public.0 == public.0);
     }

From 5f8f05dad97fe367dd77e6bf05743697a907559a Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@torproject.org>
Date: Tue, 14 Mar 2017 20:42:44 +0000
Subject: [PATCH 3/3] Bump ed25519-dalek version to 0.2.3.

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index f48a5e1..06e004d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ed25519-dalek"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Isis Lovecruft <isis@torproject.org>"]
 readme = "README.md"
 license = "CC0-1.0"