diff crypto-lib/libhl-crypto/src/signatures/ed25519.rs ursa/libursa/src/signatures/ed25519.rs
2c2
< use super::super::CryptoError;
---
> use CryptoError;
34c34,35
<     use rand::{Rng, ChaChaRng, SeedableRng};
---
>     use rand_chacha::ChaChaRng;
>     use rand::{RngCore, SeedableRng};
53c54
<                                 let mut rng = ChaChaRng::from_seed(s.chunks(4).map(get_u32).collect::<Vec<u32>>().as_slice());
---
>                                 let mut rng = ChaChaRng::from_seed(*array_ref!(s.as_slice(), 0, 32));
112,113c113,116
<     use rand::{Rng, ChaChaRng, SeedableRng};
<     use rand::os::OsRng;
---
>     use hash::{digest, DigestAlgorithm};
>     use rand::{RngCore, SeedableRng};
>     use rand_chacha::ChaChaRng;
>     use rand::rngs::OsRng;
125c128,129
<                                 let mut rng = ChaChaRng::from_seed(s.chunks(4).map(get_u32).collect::<Vec<u32>>().as_slice());
---
>                                 let hash = digest(DigestAlgorithm::Sha2_256, &s.as_slice())?;
>                                 let mut rng = ChaChaRng::from_seed(*array_ref!(hash, 0, 32));
diff crypto-lib/libhl-crypto/src/signatures/mod.rs ursa/libursa/src/signatures/mod.rs
66,74d65
<
< fn get_u32(n: &[u8]) -> u32 {
<     let mut res = 0u32;
<     for i in 0..4 {
<         res <<= 8;
<         res |= n[i] as u32;
<     }
<     res
< }
diff crypto-lib/libhl-crypto/src/signatures/secp256k1.rs ursa/libursa/src/signatures/secp256k1.rs
5c5
< use rand::os::OsRng;
---
> use rand::rngs::OsRng;
61c61,62
<     use rand::{ChaChaRng, SeedableRng};
---
>     use rand_chacha::ChaChaRng;
>     use rand::{RngCore, SeedableRng};
67c68
<             let pk = libsecp256k1::key::PublicKey::from_slice(&self.0, &pk[..]).unwrap();
---
>             let pk = libsecp256k1::key::PublicKey::from_slice(&pk[..]).unwrap();
71c72
<             let pk = libsecp256k1::key::PublicKey::from_slice(&self.0, &pk[..]).unwrap();
---
>             let pk = libsecp256k1::key::PublicKey::from_slice(&pk[..]).unwrap();
75c76
<             let res = libsecp256k1::key::PublicKey::from_slice(&self.0, data)?;
---
>             let res = libsecp256k1::key::PublicKey::from_slice(data)?;
87,88c88,91
<                                 let mut rng = ChaChaRng::from_seed(seed.chunks(4).map(get_u32).collect::<Vec<u32>>().as_slice());
<                                 libsecp256k1::key::SecretKey::new(&self.0, &mut rng)
---
>                                 let mut s = [0u8; PRIVATE_KEY_SIZE];
>                                 let mut rng = ChaChaRng::from_seed(*array_ref!(seed.as_slice(), 0, 32));
>                                 rng.fill_bytes(&mut s);
>                                 libsecp256k1::key::SecretKey::from_slice(&s[..])?
90c93
<                             KeyPairOption::FromSecretKey(s) => libsecp256k1::key::SecretKey::from_slice(&self.0, &s[..])?
---
>                             KeyPairOption::FromSecretKey(s) => libsecp256k1::key::SecretKey::from_slice(&s[..])?
95c98,100
<                         libsecp256k1::key::SecretKey::new(&self.0, &mut rng)
---
>                         let mut s = [0u8; PRIVATE_KEY_SIZE];
>                         rng.fill_bytes(&mut s);
>                         libsecp256k1::key::SecretKey::from_slice(&s[..])?
104c109
<             let s = libsecp256k1::key::SecretKey::from_slice(&self.0, &sk[..])?;
---
>             let s = libsecp256k1::key::SecretKey::from_slice(&sk[..])?;
106c111
<             Ok(sig.serialize_compact(&self.0).to_vec())
---
>             Ok(sig.serialize_compact().to_vec())
111,112c116,117
<             let p = libsecp256k1::PublicKey::from_slice(&self.0, &pk[..])?;
<             let sig = libsecp256k1::Signature::from_compact(&self.0, signature)?;
---
>             let p = libsecp256k1::PublicKey::from_slice(&pk[..])?;
>             let sig = libsecp256k1::Signature::from_compact(signature)?;
121,123c126,128
<             let mut sig = libsecp256k1::Signature::from_compact(&self.0, signature)?;
<             sig.normalize_s(&self.0);
<             let compact = sig.serialize_compact(&self.0);
---
>             let mut sig = libsecp256k1::Signature::from_compact(signature)?;
>             sig.normalize_s();
>             let compact = sig.serialize_compact();
135c140,141
<     use rand::{ChaChaRng, SeedableRng, Rng};
---
>     use rand::{SeedableRng, RngCore};
>     use rand_chacha::ChaChaRng;
137c143
<     use amcl_3::secp256k1::{ecp, ecdh};
---
>     use amcl::secp256k1::{ecp, ecdh};
172c178
<                                 let mut rng = ChaChaRng::from_seed(seed.chunks(4).map(get_u32).collect::<Vec<u32>>().as_slice());
---
>                                 let mut rng = ChaChaRng::from_seed(*array_ref!(seed.as_slice(), 0, PRIVATE_KEY_SIZE));
174c180
<                                 let d = digest(DigestAlgorithm::SHA2_256, &sk[..])?;
---
>                                 let d = digest(DigestAlgorithm::Sha2_256, &sk[..])?;
183c189
<                         let d = digest(DigestAlgorithm::SHA2_256, &sk[..])?;
---
>                         let d = digest(DigestAlgorithm::Sha2_256, &sk[..])?;
187c193
<             let mut pk = [0u8; PUBLIC_KEY_SIZE]; //Compressed
---
>             let mut pk = [0u8; PUBLIC_UNCOMPRESSED_KEY_SIZE];
189c195,197
<             Ok((PublicKey(pk.to_vec()), PrivateKey(sk.to_vec())))
---
>             let mut compressed = [0u8; PUBLIC_KEY_SIZE];
>             ecp::ECP::frombytes(&pk[..]).tobytes(&mut compressed, true);
>             Ok((PublicKey(compressed.to_vec()), PrivateKey(sk.to_vec())))
240a249,257
>     fn get_u32(n: &[u8]) -> u32 {
>         let mut res = 0u32;
>         for i in 0..4 {
>             res <<= 8;
>             res |= n[i] as u32;
>         }
>         res
>     }
>
375,376c392
<         let context = libsecp256k1::Secp256k1::new();
<         let sk = libsecp256k1::key::SecretKey::from_slice(&context, &s[..]);
---
>         let sk = libsecp256k1::key::SecretKey::from_slice(&s[..]);
378c394
<         let pk = libsecp256k1::key::PublicKey::from_slice(&context, &p[..]);
---
>         let pk = libsecp256k1::key::PublicKey::from_slice(&p[..]);
380c396
<         let pk = libsecp256k1::key::PublicKey::from_slice(&context, &scheme.serialize_uncompressed(&p)[..]);
---
>         let pk = libsecp256k1::key::PublicKey::from_slice(&scheme.serialize_uncompressed(&p)[..]);
399c415
<         let pk = libsecp256k1::key::PublicKey::from_slice(&context, hex::hex2bin(PUBLIC_KEY).unwrap().as_slice()).unwrap();
---
>         let pk = libsecp256k1::key::PublicKey::from_slice(hex::hex2bin(PUBLIC_KEY).unwrap().as_slice()).unwrap();
405,406c421,422
<         let mut signature = libsecp256k1::Signature::from_compact(&context, &hex::hex2bin(SIGNATURE_1).unwrap()[..]).unwrap();
<         signature.normalize_s(&context);
---
>         let mut signature = libsecp256k1::Signature::from_compact(&hex::hex2bin(SIGNATURE_1).unwrap()[..]).unwrap();
>         signature.normalize_s();
442c458
<                 let sk = libsecp256k1::key::SecretKey::from_slice(&context, hex::hex2bin(PRIVATE_KEY).unwrap().as_slice()).unwrap();
---
>                 let sk = libsecp256k1::key::SecretKey::from_slice(hex::hex2bin(PRIVATE_KEY).unwrap().as_slice()).unwrap();
447c463
<                 let sig_1 = context.sign(&msg, &sk).serialize_compact(&context);
---
>                 let sig_1 = context.sign(&msg, &sk).serialize_compact();

~~~~~~~~~~~~
CRYPTO-LIB
$ git log -n2
commit 0771d89d4292225af376970a95fbeb3037fe39eb (HEAD -> master, upstream/master, upstream/HEAD)
Merge: f09813e 5efb17c
Author: Michael Lodder <redmike7@gmail.com>
Date:   Mon Nov 5 15:50:18 2018 -0700

    Merge pull request #14 from mikelodder7/master

    Better documentation for Mac

commit 5efb17cbf632be15b8281298b6b186c215a8856f
Merge: 47eacb3 f09813e
Author: Michael Lodder <redmike7@gmail.com>
Date:   Mon Nov 5 15:50:09 2018 -0700

    Merge branch 'master' into master
~~~~~~~~~~~~~
URSA
$ git log -n2
commit 4516c05c895f854a2f731f2488d5ed304f8e221a (HEAD -> mikelodder7-z-mix)
Merge: 49a6a74 c38a23d
Author: Dan Middleton <dan.middleton@intel.com>
Date:   Tue Dec 18 11:30:06 2018 -0600

    Merge branch 'z-mix' of https://github.com/mikelodder7/ursa into mikelodder7-z-mix

commit c38a23d37f3380783fa9ac7ce1b139a562d81bfa
Author: Michael Lodder <redmike7@gmail.com>
Date:   Tue Dec 18 10:27:15 2018 -0700

    Remove libc dependency

    Signed-off-by: Michael Lodder <redmike7@gmail.com>

~~~~~~~~~~~~~~~