Merge branch 'jahway603'

hacked away to get SDP able to build/compile again, so great success!

README.md

@@ -1,6 +1,6 @@
 # SilentDragonPaper
 
-SilentDragonPaper is a paper wallet generator that can be compiled and run completely offline.
+SilentDragonPaper is a paper wallet generator that can be run completely offline.
 
 You can run it on an air-gapped computer to generate your shielded z-addresses, which will allow you to keep your keys completely offline.
 
@@ -39,6 +39,7 @@ SilentDragonPaper is built with Rust. To compile from source, you must [install
 
 ```
 cd SilentDragonPaper/cli
+cargo vendor
 cargo build --release --offline
 ```
 

build.sh

@@ -38,4 +38,5 @@ PATH=$(pwd)/../build/bin/:$PATH
 echo PATH=$PATH
 cargo --version
 rustc --version
+../build/bin/cargo vendor
 ../build/bin/cargo build --verbose --release --offline

cli/.cargo/config.toml

@@ -6,15 +6,5 @@ git = "https://git.hush.is/hush/librustzcash"
 rev = "5a48d179b8434a0318e7e19dda506e245a904092"
 replace-with = "vendored-sources"
 
-[source."https://github.com/RustCrypto/block-ciphers"]
-git = "https://github.com/RustCrypto/block-ciphers"
-rev = "aesni-v0.4.2"
-replace-with = "vendored-sources"
-
-[source."https://github.com/RustCrypto/traits"]
-git = "https://github.com/RustCrypto/traits"
-rev = "stream-cipher-v0.1.1"
-replace-with = "vendored-sources"
-
 [source.vendored-sources]
 directory = "vendor"

cli/Cargo.toml

@@ -9,13 +9,14 @@ edition = "2018"
 
 [patch.crates-io]
 aes = { path = "vendor/aes-0.2.0" }
-aes-soft = { git = "https://github.com/RustCrypto/block-ciphers", rev = "aes-soft-v0.2.0" }
+aes-soft = { path = "vendor/aes-soft" }
 aesni = { path = "vendor/aesni" }
-block-cipher-trait = { git = "https://github.com/RustCrypto/traits", rev = "block-cipher-trait-v0.5.3" }
-stream-cipher = { git = "https://github.com/RustCrypto/traits", rev = "stream-cipher-v0.1.1" }
-hmac = { path = "vendor/hmac-0.4.2" }
+block-cipher-trait = { path = "vendor/block-cipher-trait" }
 crypto-mac = { path = "vendor/crypto-mac-0.4.0" }
-    
+hmac = { path = "vendor/hmac-0.4.2" }
+stream-cipher = { path = "vendor/stream-cipher" }
+zcash_primitives = { path = "vendor/zcash_primitives" }
+
 [dependencies]
 clap = "2.33.0"
 silentdragonpaper = { path = "../lib" }