Move FFI and constants into their own modules; replace outptrs with returns

src/constants.rs

@@ -0,0 +1,20 @@
+//! Constants
+
+/// The size (in bytes) of a nonce
+pub static NONCE_SIZE: uint = 32;
+
+/// The size (in bytes) of a secret key
+pub static SECRET_KEY_SIZE: uint = 32;
+
+/// The size (in bytes) of an uncompressed public key
+pub static UNCOMPRESSED_PUBLIC_KEY_SIZE: uint = 65;
+
+/// The size (in bytes) of a compressed public key
+pub static COMPRESSED_PUBLIC_KEY_SIZE: uint = 33;
+
+/// The maximum size of a signature
+pub static MAX_SIGNATURE_SIZE: uint = 72;
+
+/// The maximum size of a compact signature
+pub static MAX_COMPACT_SIGNATURE_SIZE: uint = 64;
+

src/ffi.rs

@@ -5,42 +5,31 @@ use libc::{c_int, c_uchar};
 #[link(name = "secp256k1")]
 extern "C" {
     pub fn secp256k1_start();
+
     pub fn secp256k1_stop();
-    pub fn secp256k1_ecdsa_verify(
-        msg : *const c_uchar, msglen : c_int,
-        sig : *const c_uchar, siglen : c_int,
-        pubkey : *const c_uchar, pubkeylen : c_int
-        ) -> c_int;
 
-    pub fn secp256k1_ecdsa_pubkey_create(
+    pub fn secp256k1_ecdsa_verify(msg: *const c_uchar, msg_len: c_int,
-        pubkey : *mut c_uchar,
+                                  sig: *const c_uchar, sig_len: c_int,
-        pubkeylen : *mut c_int,
+                                  pk: *const c_uchar, pk_len: c_int)
-        seckey : *const c_uchar,
+                                  -> c_int;
-        compressed : c_int
-        ) -> c_int;
 
-    pub fn secp256k1_ecdsa_sign(
+    pub fn secp256k1_ecdsa_pubkey_create(pk: *mut c_uchar, pk_len : *mut c_int,
-        msg : *const c_uchar, msglen : c_int,
+                                         sk: *const c_uchar, compressed: c_int)
-        sig : *mut c_uchar, siglen : *mut c_int,
+                                         -> c_int;
-        seckey : *const c_uchar,
-        nonce : *const c_uchar
-        ) -> c_int;
 
-    pub fn secp256k1_ecdsa_sign_compact(
+    pub fn secp256k1_ecdsa_sign(msg: *const c_uchar, msg_len: c_int,
-        msg : *const c_uchar, msglen : c_int,
+                                sig: *mut c_uchar, sig_len: *mut c_int,
-        sig64 : *mut c_uchar,
+                                sk: *const c_uchar, nonce: *const c_uchar)
-        seckey : *const c_uchar,
+                                -> c_int;
-        nonce : *const c_uchar,
-        recid : *mut c_int
-        ) -> c_int;
 
-    pub fn secp256k1_ecdsa_recover_compact(
+    pub fn secp256k1_ecdsa_sign_compact(msg: *const c_uchar, msg_len: c_int,
-        msg : *const c_uchar, msglen : c_int,
+                                        sig64: *mut c_uchar, sk: *const c_uchar,
-        sig64 : *const c_uchar,
+                                        nonce: *const c_uchar, recid: *mut c_int)
-        pubkey : *mut c_uchar,
+                                        -> c_int;
-        pubkeylen : *mut c_int,
+
-        compressed : c_int,
+    pub fn secp256k1_ecdsa_recover_compact(msg: *const c_uchar, msg_len: c_int,
-        recid : c_int
+                                           sig64: *const c_uchar, pk: *mut c_uchar,
-        ) -> c_int;
+                                           pk_len: *mut c_int, compressed: c_int,
+                                           recid: c_int) -> c_int;
 }
 

src/key.rs

@@ -0,0 +1,171 @@
+//! Public/Private keys
+
+use std::fmt;
+use std::rand::Rng;
+use constants;
+use ffi;
+
+use super::Result;
+
+/// Secret 256-bit nonce used as `k` in an ECDSA signature
+pub struct Nonce([u8, ..constants::NONCE_SIZE]);
+
+/// Secret 256-bit key used as `x` in an ECDSA signature
+pub struct SecretKey([u8, ..constants::SECRET_KEY_SIZE]);
+
+/// Public key
+#[deriving(PartialEq, Eq, Show)]
+pub struct PublicKey(PublicKeyData);
+
+enum PublicKeyData {
+    Compressed([u8, ..constants::COMPRESSED_PUBLIC_KEY_SIZE]),
+    Uncompressed([u8, ..constants::UNCOMPRESSED_PUBLIC_KEY_SIZE]),
+}
+
+fn random_32_bytes<R:Rng>(rng: &mut R) -> [u8, ..32] {
+    [rng.gen(), rng.gen(), rng.gen(), rng.gen(),
+     rng.gen(), rng.gen(), rng.gen(), rng.gen(),
+     rng.gen(), rng.gen(), rng.gen(), rng.gen(),
+     rng.gen(), rng.gen(), rng.gen(), rng.gen(),
+     rng.gen(), rng.gen(), rng.gen(), rng.gen(),
+     rng.gen(), rng.gen(), rng.gen(), rng.gen(),
+     rng.gen(), rng.gen(), rng.gen(), rng.gen(),
+     rng.gen(), rng.gen(), rng.gen(), rng.gen()]
+}
+
+impl Nonce {
+    /// Creates a new random nonce
+    #[inline]
+    pub fn new<R:Rng>(rng: &mut R) -> Nonce {
+        Nonce(random_32_bytes(rng))
+    }
+
+    /// Converts the nonce to a raw pointer suitable for use with
+    /// the FFI functions
+    #[inline]
+    pub fn as_ptr(&self) -> *const u8 {
+        let &Nonce(ref data) = self;
+        data.as_ptr()
+    }
+}
+
+impl SecretKey {
+    /// Creates a new random secret key
+    #[inline]
+    pub fn new<R:Rng>(rng: &mut R) -> SecretKey {
+        SecretKey(random_32_bytes(rng))
+    }
+
+    /// Converts the secret key to a raw pointer suitable for use with
+    /// the FFI functions
+    #[inline]
+    pub fn as_ptr(&self) -> *const u8 {
+        let &SecretKey(ref data) = self;
+        data.as_ptr()
+    }
+}
+
+impl PublicKey {
+    /// Creates a new zeroed out public key
+    #[inline]
+    pub fn new(compressed: bool) -> PublicKey {
+        PublicKey(
+            if compressed { Compressed([0, ..constants::COMPRESSED_PUBLIC_KEY_SIZE]) }
+            else { Uncompressed([0, ..constants::UNCOMPRESSED_PUBLIC_KEY_SIZE]) }
+        )
+    }
+
+    /// Creates a new public key from a secret key
+    #[inline]
+    pub fn from_secret_key(sk: &SecretKey, compressed: bool) -> PublicKey {
+        let mut pk = PublicKey::new(compressed);
+        let compressed = if compressed {1} else {0};
+        unsafe {
+            let mut len = 0;
+            while ffi::secp256k1_ecdsa_pubkey_create(
+                pk.as_mut_ptr(), &mut len,
+                sk.as_ptr(), compressed) != 1 {
+                // loop
+            }
+            assert_eq!(len as uint, pk.len()); 
+        };
+        pk
+    }
+
+    /// Returns whether the public key is compressed or uncompressed
+    #[inline]
+    pub fn is_compressed(&self) -> bool {
+        let &PublicKey(ref data) = self;
+        match *data {
+            Compressed(_) => true,
+            Uncompressed(_) => false
+        }
+    }
+
+    /// Returns the length of the public key
+    #[inline]
+    pub fn len(&self) -> uint {
+        let &PublicKey(ref data) = self;
+        match *data {
+            Compressed(ref x) => x.len(),
+            Uncompressed(ref x) => x.len()
+        }
+    }
+
+    /// Converts the public key into a byte slice
+    #[inline]
+    pub fn as_slice<'a>(&'a self) -> &'a [u8] {
+        let &PublicKey(ref data) = self;
+        data.as_slice()
+    }
+
+    /// Converts the public key to a raw pointer suitable for use
+    /// with the FFI functions
+    #[inline]
+    pub fn as_ptr(&self) -> *const u8 {
+        let &PublicKey(ref data) = self;
+        match *data {
+            Compressed(ref x) => x.as_ptr(),
+            Uncompressed(ref x) => x.as_ptr()
+        }
+    }
+
+    /// Converts the public key to a mutable raw pointer suitable for use
+    /// with the FFI functions
+    #[inline]
+    pub fn as_mut_ptr(&mut self) -> *mut u8 {
+        let &PublicKey(ref mut data) = self;
+        match *data {
+            Compressed(ref mut x) => x.as_mut_ptr(),
+            Uncompressed(ref mut x) => x.as_mut_ptr()
+        }
+    }
+}
+
+impl PublicKeyData {
+    #[inline]
+    fn as_slice<'a>(&'a self) -> &'a [u8] {
+        match *self {
+            Compressed(ref x) => x.as_slice(),
+            Uncompressed(ref x) => x.as_slice()
+        }
+    }
+}
+
+// We have to do all these impls ourselves as Rust can't derive
+// them for arrays
+impl PartialEq for PublicKeyData {
+    fn eq(&self, other: &PublicKeyData) -> bool {
+        self.as_slice() == other.as_slice()
+    }
+}
+
+impl Eq for PublicKeyData {}
+
+impl fmt::Show for PublicKeyData {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.as_slice().fmt(f)
+    }
+}
+
+

src/secp256k1.rs

@@ -25,32 +25,43 @@
 extern crate libc;
 extern crate sync;
 
+use std::io::IoError;
+use std::rand::OsRng;
 use libc::c_int;
 use sync::one::{Once, ONCE_INIT};
 
+pub mod constants;
 pub mod ffi;
+pub mod key;
 
-/// A secret 256-bit nonce used as `k` in an ECDSA signature
+/// A tag used for recovering the public key from a compact signature
-pub type Nonce = [u8, ..32];
+pub struct RecoveryId(i32);
 
-/// A secret 256-bit key used as `x` in an ECDSA signature
-pub type SecKey = [u8, ..32];
-
-/// A public key
-pub enum PubKey {
-    /// A compressed (1-bit x-coordinate) EC public key
-    Compressed([u8, ..33]),
-    /// An uncompressed (full x-coordinate) EC public key
-    Uncompressed([u8, ..65])
-}
 /// An ECDSA signature
-pub type Signature = Vec<u8>;
+pub struct Signature(pub Vec<u8>);
+
+impl Signature {
+    /// Converts the signature to a mutable raw pointer suitable for use
+    /// with the FFI functions
+    #[inline]
+    pub fn as_mut_ptr(&mut self) -> *mut u8 {
+        let &Signature(ref mut data) = self;
+        data.as_mut_ptr()
+    }
+
+    /// Converts the signature to a byte slice suitable for verification
+    #[inline]
+    pub fn as_slice<'a>(&'a self) -> &'a [u8] {
+        let &Signature(ref data) = self;
+        data.as_slice()
+    }
+}
 
 /// An ECDSA error
-#[deriving(Show)]
+#[deriving(PartialEq, Eq, Clone, Show)]
-#[deriving(Eq)]
-#[deriving(PartialEq)]
 pub enum Error {
+    /// Signature failed verification
+    IncorrectSignature,
     /// Bad public key
     InvalidPublicKey,
     /// Bad signature
@@ -59,188 +70,122 @@ pub enum Error {
     InvalidSecretKey,
     /// Bad nonce
     InvalidNonce,
+    /// Rng problem
+    RngError(IoError),
 }
 
-#[deriving(Eq)]
+/// Result type
-#[deriving(PartialEq)]
+pub type Result<T> = ::std::prelude::Result<T, Error>;
+
 /// Result of verifying a signature
-pub type VerifyResult = Result<bool, Error>;
+pub type VerifyResult = Result<bool>;
 
 static mut Secp256k1_init : Once = ONCE_INIT;
 
 /// The secp256k1 engine, used to execute all signature operations
-pub struct Secp256k1;
+pub struct Secp256k1 {
-
+    rng: OsRng
+}
 
 impl Secp256k1 {
     /// Constructs a new secp256k1 engine.
-    pub fn new() -> Secp256k1 {
+    pub fn new() -> Result<Secp256k1> {
         unsafe {
             Secp256k1_init.doit(|| {
                 ffi::secp256k1_start();
             });
         }
-        Secp256k1
+        match OsRng::new() {
-    }
+            Ok(rng) => Ok(Secp256k1 { rng: rng }),
-
+            Err(e) => Err(RngError(e))
-    /// Determines the public key corresponding to a given private key.
-    pub fn pubkey_create(
-        &self,
-        pubkey : &mut PubKey,
-        seckey : &SecKey
-        ) -> Result<(), Error> {
-
-        let (compressed, pub_ptr, pub_len) = match *pubkey {
-            Uncompressed(ref mut key) => (false, key.as_mut_ptr(), key.len()),
-            Compressed(ref mut key) => (true, key.as_mut_ptr(), key.len()),
-        };
-        let mut len = pub_len as c_int;
-        let res = unsafe {
-            ffi::secp256k1_ecdsa_pubkey_create(
-                pub_ptr, &mut len,
-                seckey.as_ptr(),
-                if compressed {1} else {0}
-                )
-        };
-
-        assert_eq!(pub_len as i32, len);
-
-        match res {
-            0 => Err(InvalidSecretKey),
-            1 => Ok(()),
-            _ => fail!("secp256k1_ecdsa_pubkey_create invalid return value"),
         }
     }
 
-    /// Constructs a signature for `msg` using the secret key `seckey`
+    /// Generates a randam keypair
-    pub fn sign(&self, sig : &mut Signature, msg : &[u8], seckey : &SecKey, nonce : &Nonce) -> Result<(), Error> {
+    pub fn generate_keypair(&mut self, compressed: bool)
-
+                            -> (key::SecretKey, key::PublicKey) {
-        let origlen = 72u;
+        let sk = key::SecretKey::new(&mut self.rng);
-        let mut siglen = origlen as c_int;
+        (sk, key::PublicKey::from_secret_key(&sk, compressed))
-
-        if sig.len() != origlen {
-            fail!("invalid length of signature buffer");
-        }
-
-        let res = unsafe {
-            ffi::secp256k1_ecdsa_sign(
-                msg.as_ptr(), msg.len() as c_int,
-                sig.as_mut_ptr(), &mut siglen,
-                seckey.as_ptr(),
-                nonce.as_ptr()
-                )
-        };
-
-        if (origlen as c_int) < siglen {
-            fail!("secp256k1_ecdsa_sign wrong return len");
-        }
-
-        match res {
-            0 => Err(InvalidNonce),
-            1 => { sig.truncate(siglen as uint); Ok(()) },
-            _ => fail!("secp256k1_ecdsa_sign invalid return value"),
-        }
     }
 
-    /// Constructs a compact signature for `msg` using the secret key `seckey`
+    /// Generates a random nonce
-    pub fn sign_compact(
+    pub fn generate_nonce(&mut self) -> key::Nonce {
-        &self,
+        key::Nonce::new(&mut self.rng)
-        sig : &mut [u8],
+    }
-        msg : &[u8],
-        seckey : &SecKey,
-        nonce : &Nonce
-        ) -> Result<i32, Error> {
 
-        let origlen = 64u;
+    /// Constructs a signature for `msg` using the secret key `sk` and nonce `nonce`
+    pub fn sign(&self, msg: &[u8], sk: &key::SecretKey, nonce: &key::Nonce)
+                -> Result<Signature> {
+        let mut sig = vec![];
+        unsafe {
+            let mut len = constants::MAX_SIGNATURE_SIZE as c_int;
+            sig.reserve(constants::MAX_SIGNATURE_SIZE);
+            if ffi::secp256k1_ecdsa_sign(msg.as_ptr(), msg.len() as c_int,
+                                         sig.as_mut_ptr(), &mut len,
+                                         sk.as_ptr(), nonce.as_ptr()) != 1 {
+                return Err(InvalidNonce);
+            }
+            // This assertation is probably too late :)
+            assert!(len as uint <= constants::MAX_SIGNATURE_SIZE);
+            sig.set_len(len as uint);
+        };
 
-        if sig.len() != origlen {
+        Ok(Signature(sig))
-            fail!("invalid length of signature buffer");
+    }
-        }
 
+    /// Constructs a compact signature for `msg` using the secret key `sk`
+    pub fn sign_compact(&self, msg: &[u8], sk: &key::SecretKey, nonce: &key::Nonce)
+                        -> Result<(Signature, RecoveryId)> {
+        let mut sig = vec![];
         let mut recid = 0;
-
+        unsafe {
-        let res = unsafe {
+            sig.reserve(constants::MAX_COMPACT_SIGNATURE_SIZE);
-            ffi::secp256k1_ecdsa_sign_compact(
+            if ffi::secp256k1_ecdsa_sign_compact(msg.as_ptr(), msg.len() as c_int,
-                msg.as_ptr(), msg.len() as c_int,
+                                                 sig.as_mut_ptr(), sk.as_ptr(),
-                sig.as_mut_ptr(),
+                                                 nonce.as_ptr(), &mut recid) != 1 {
-                seckey.as_ptr(),
+                return Err(InvalidNonce);
-                nonce.as_ptr(),
+            }
-                &mut recid
-                )
         };
-
+        Ok((Signature(sig), RecoveryId(recid)))
-        match res {
-            0 => Err(InvalidNonce),
-            1 => { Ok(recid) },
-            _ => fail!("secp256k1_ecdsa_sign_compact invalid return value"),
-        }
     }
 
     /// Determines the public key for which `sig` is a valid signature for
     /// `msg`. Returns through the out-pointer `pubkey`.
-    pub fn recover_compact(
+    pub fn recover_compact(&self, msg: &[u8], sig: &[u8],
-        &self,
+                           compressed: bool, recid: RecoveryId)
-        msg : &[u8],
+                            -> Result<key::PublicKey> {
-        sig : &[u8],
+        let mut pk = key::PublicKey::new(compressed);
-        pubkey : &mut PubKey,
+        let RecoveryId(recid) = recid;
-        recid : i32
-        ) -> Result<(), Error> {
 
-        let (compressed, pub_ptr, pub_len) = match *pubkey {
+        unsafe {
-            Uncompressed(ref mut key) => (false, key.as_mut_ptr(), key.len()),
+            let mut len = 0;
-            Compressed(ref mut key) => (true, key.as_mut_ptr(), key.len()),
+            if ffi::secp256k1_ecdsa_recover_compact(msg.as_ptr(), msg.len() as c_int,
+                                                    sig.as_ptr(), pk.as_mut_ptr(), &mut len,
+                                                    if compressed {1} else {0},
+                                                    recid) != 1 {
+                return Err(InvalidSignature);
+            }
+            assert_eq!(len as uint, pk.len());
         };
-
+        Ok(pk)
-        let origlen = 64u;
-
-        if sig.len() != origlen {
-            fail!("invalid length of signature buffer");
-        }
-
-        let mut len = pub_len as c_int;
-        let res = unsafe {
-            ffi::secp256k1_ecdsa_recover_compact(
-                msg.as_ptr(), msg.len() as i32,
-                sig.as_ptr(),
-                pub_ptr, &mut len,
-                if compressed {1} else {0},
-                recid
-                )
-        };
-
-        assert_eq!(pub_len as i32, len);
-
-        match res {
-            0 => Err(InvalidSignature),
-            1 => Ok(()),
-            _ => fail!("secp256k1_ecdsa_recover_compact invalid return value"),
-        }
     }
 
 
     /// Checks that `sig` is a valid ECDSA signature for `msg` using the public
     /// key `pubkey`. Returns `Ok(true)` on success.
-    pub fn verify(&self, msg : &[u8], sig : &[u8], pubkey : &PubKey) -> VerifyResult {
+    pub fn verify(&self, msg: &[u8], sig: &[u8], pk: &key::PublicKey) -> Result<()> {
-
-        let (pub_ptr, pub_len) = match *pubkey {
-            Uncompressed(ref key) => (key.as_ptr(), key.len()),
-            Compressed(ref key) => (key.as_ptr(), key.len()),
-        };
-
         let res = unsafe {
-            ffi::secp256k1_ecdsa_verify(
+            ffi::secp256k1_ecdsa_verify(msg.as_ptr(), msg.len() as c_int,
-                msg.as_ptr(), msg.len() as c_int,
+                                        sig.as_ptr(), sig.len() as c_int,
-                sig.as_ptr(), sig.len() as c_int,
+                                        pk.as_ptr(), pk.len() as c_int)
-                pub_ptr, pub_len as c_int
-                )
         };
 
         match res {
-            1 => Ok(true),
+            1 => Ok(()),
-            0 => Ok(false),
+            0 => Err(IncorrectSignature),
             -1 => Err(InvalidPublicKey),
             -2 => Err(InvalidSignature),
-            _ => fail!("secp256k1_ecdsa_verify() invalid return value")
+            _ => unreachable!()
         }
     }
 }
@@ -252,122 +197,104 @@ mod test {
     use std::rand;
     use std::rand::Rng;
     use super::*;
+    use key::PublicKey;
 
     #[test]
     fn invalid_pubkey() {
-        let s = Secp256k1::new();
+        let s = Secp256k1::new().unwrap();
 
         let mut msg = Vec::from_elem(32, 0u8);
         let sig = Vec::from_elem(32, 0u8);
-        let pubkey = Compressed([0u8, .. 33]);
+        let pk = PublicKey::new(true);
 
         rand::task_rng().fill_bytes(msg.as_mut_slice());
 
-        assert_eq!(s.verify(msg.as_mut_slice(), sig.as_slice(), &pubkey), Err(InvalidPublicKey));
+        assert_eq!(s.verify(msg.as_mut_slice(), sig.as_slice(), &pk), Err(InvalidPublicKey));
     }
 
     #[test]
     fn valid_pubkey_uncompressed() {
-        let s = Secp256k1::new();
+        let mut s = Secp256k1::new().unwrap();
+
+        let (_, pk) = s.generate_keypair(false);
 
-        let seckey = [0u8, ..32];
-        let mut pubkey = Uncompressed([0u8, ..65]);
-        s.pubkey_create(&mut pubkey, &seckey).unwrap();
         let mut msg = Vec::from_elem(32, 0u8);
         let sig = Vec::from_elem(32, 0u8);
 
         rand::task_rng().fill_bytes(msg.as_mut_slice());
 
-        assert_eq!(s.verify(msg.as_mut_slice(), sig.as_slice(), &pubkey), Err(InvalidSignature));
+        assert_eq!(s.verify(msg.as_mut_slice(), sig.as_slice(), &pk), Err(InvalidSignature));
     }
 
     #[test]
     fn valid_pubkey_compressed() {
-        let s = Secp256k1::new();
+        let mut s = Secp256k1::new().unwrap();
 
-        let seckey = [0u8, ..32];
+        let (_, pk) = s.generate_keypair(true);
-        let mut pubkey = Compressed([0u8, .. 33]);
-        s.pubkey_create(&mut pubkey, &seckey).unwrap();
         let mut msg = Vec::from_elem(32, 0u8);
         let sig = Vec::from_elem(32, 0u8);
 
         rand::task_rng().fill_bytes(msg.as_mut_slice());
 
-        assert_eq!(s.verify(msg.as_mut_slice(), sig.as_slice(), &pubkey), Err(InvalidSignature));
+        assert_eq!(s.verify(msg.as_mut_slice(), sig.as_slice(), &pk), Err(InvalidSignature));
     }
 
     #[test]
     fn sign() {
-        let s = Secp256k1::new();
+        let mut s = Secp256k1::new().unwrap();
 
         let mut msg = [0u8, ..32];
-        let mut seckey = [0u8, ..32];
-        let mut nonce = [0u8, ..32];
-        let mut sig = Vec::from_elem(72, 0u8);
         rand::task_rng().fill_bytes(msg);
-        rand::task_rng().fill_bytes(nonce);
-        rand::task_rng().fill_bytes(seckey);
 
-        s.sign(&mut sig, msg.as_slice(), &seckey, &nonce).unwrap();
+        let (sk, _) = s.generate_keypair(false);
+        let nonce = s.generate_nonce();
+
+        s.sign(msg.as_slice(), &sk, &nonce).unwrap();
     }
 
     #[test]
     fn sign_and_verify() {
-        let s = Secp256k1::new();
+        let mut s = Secp256k1::new().unwrap();
 
         let mut msg = Vec::from_elem(32, 0u8);
-        let mut seckey = [0u8, ..32];
-        let mut pubkey = Compressed([0u8, .. 33]);
-        let mut nonce = [0u8, ..32];
-        let mut sig = Vec::from_elem(72, 0u8);
         rand::task_rng().fill_bytes(msg.as_mut_slice());
-        rand::task_rng().fill_bytes(nonce);
-        rand::task_rng().fill_bytes(seckey);
 
-        s.pubkey_create(&mut pubkey, &seckey).unwrap();
+        let (sk, pk) = s.generate_keypair(false);
+        let nonce = s.generate_nonce();
 
-        s.sign(&mut sig, msg.as_slice(), &seckey, &nonce).unwrap();
+        let sig = s.sign(msg.as_slice(), &sk, &nonce).unwrap();
 
-        assert_eq!(s.verify(msg.as_slice(), sig.as_slice(), &pubkey), Ok(true));
+        assert_eq!(s.verify(msg.as_slice(), sig.as_slice(), &pk), Ok(()));
     }
 
     #[test]
     fn sign_and_verify_fail() {
-        let s = Secp256k1::new();
+        let mut s = Secp256k1::new().unwrap();
 
         let mut msg = Vec::from_elem(32, 0u8);
-        let mut seckey = [0u8, ..32];
-        let mut pubkey = Compressed([0u8, .. 33]);
-        let mut nonce = [0u8, ..32];
-        let mut sig = Vec::from_elem(72, 0u8);
         rand::task_rng().fill_bytes(msg.as_mut_slice());
-        rand::task_rng().fill_bytes(nonce);
-        rand::task_rng().fill_bytes(seckey);
 
-        s.pubkey_create(&mut pubkey, &seckey).unwrap();
+        let (sk, pk) = s.generate_keypair(false);
-        s.sign(&mut sig, msg.as_slice(), &seckey, &nonce).unwrap();
+        let nonce = s.generate_nonce();
+
+        let sig = s.sign(msg.as_slice(), &sk, &nonce).unwrap();
 
         rand::task_rng().fill_bytes(msg.as_mut_slice());
-        assert_eq!(s.verify(msg.as_slice(), sig.as_slice(), &pubkey), Ok(false));
+        assert_eq!(s.verify(msg.as_slice(), sig.as_slice(), &pk), Err(IncorrectSignature));
     }
 
     #[test]
     fn sign_compact_with_recovery() {
-        let s = Secp256k1::new();
+        let mut s = Secp256k1::new().unwrap();
 
         let mut msg = [0u8, ..32];
-        let mut seckey = [0u8, ..32];
-        let mut pubkey = Uncompressed([0u8, ..65]);
-        let mut nonce = [0u8, ..32];
-        let mut sig = Vec::from_elem(64, 0u8);
         rand::task_rng().fill_bytes(msg.as_mut_slice());
-        rand::task_rng().fill_bytes(nonce);
-        rand::task_rng().fill_bytes(seckey);
 
-        s.pubkey_create(&mut pubkey, &seckey).unwrap();
+        let (sk, pk) = s.generate_keypair(false);
+        let nonce = s.generate_nonce();
 
-        let recid = s.sign_compact(sig.as_mut_slice(), msg.as_slice(), &seckey, &nonce).unwrap();
+        let (sig, recid) = s.sign_compact(msg.as_slice(), &sk, &nonce).unwrap();
 
-        assert_eq!(s.recover_compact(msg.as_slice(), sig.as_slice(), &mut pubkey, recid), Ok(()));
+        assert_eq!(s.recover_compact(msg.as_slice(), sig.as_slice(), false, recid), Ok(pk));
     }
 }