From f5de6551bcef413ebe940b05adca0ed338cb13f1 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Wed, 18 Aug 2021 18:19:41 +0800 Subject: [PATCH] loader: cargo: load packages that work with xous target Load versions of the dalek crates that support the xous target. Signed-off-by: Sean Cross --- loader/Cargo.lock | 52 ++++++++++++++++++++++++----------------------- loader/Cargo.toml | 33 ++++++++++++------------------ 2 files changed, 40 insertions(+), 45 deletions(-) diff --git a/loader/Cargo.lock b/loader/Cargo.lock index 5383ded1f..3fe0b6f90 100644 --- a/loader/Cargo.lock +++ b/loader/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "ansi_term" version = "0.11.0" @@ -11,9 +13,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.33" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fd36ffbb1fb7c834eac128ea8d0e310c5aeb635548f9d58861e1308d46e71c" +checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" [[package]] name = "atty" @@ -28,9 +30,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" @@ -65,7 +67,7 @@ dependencies = [ [[package]] name = "com_rs" version = "0.1.0" -source = "git+https://github.com/betrusted-io/com_rs?branch=main#4b45a42ad2d932550566d6c32ec1e1dd60e93c67" +source = "git+https://github.com/betrusted-io/com_rs?branch=main#8959b373adc359f03a0da7c000bd8208b47d90a7" [[package]] name = "convert_case" @@ -76,7 +78,7 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "curve25519-dalek" version = "3.1.0" -source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#c0ee5bf18c606b51bbffb02fde5801ac129b4e7d" +source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#93538aab361685775710cdb24c2093c2590e5911" dependencies = [ "byteorder", "digest", @@ -98,9 +100,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d0860415b12243916284c67a9be413e044ee6668247b99ba26d94b2bc06c8f6" +checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc" dependencies = [ "signature", ] @@ -120,7 +122,7 @@ dependencies = [ [[package]] name = "engine25519-as" version = "0.1.0" -source = "git+https://github.com/betrusted-io/engine25519-as.git?rev=6681e73c1fdc4a460b5ef9f9c7c91aef546d00f3#6681e73c1fdc4a460b5ef9f9c7c91aef546d00f3" +source = "git+https://github.com/betrusted-io/engine25519-as.git?rev=274b82899d28535ac6d4b7869e26eef2039578d5#274b82899d28535ac6d4b7869e26eef2039578d5" [[package]] name = "generic-array" @@ -134,9 +136,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] @@ -149,9 +151,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" +checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" [[package]] name = "loader" @@ -166,9 +168,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" [[package]] name = "opaque-debug" @@ -178,9 +180,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "proc-macro2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" +checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" dependencies = [ "unicode-xid", ] @@ -233,9 +235,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "subtle" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "svd2utra" @@ -249,9 +251,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" +checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" dependencies = [ "proc-macro2", "quote", @@ -260,9 +262,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" dependencies = [ "proc-macro2", "quote", @@ -340,9 +342,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "zeroize" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd" dependencies = [ "zeroize_derive", ] diff --git a/loader/Cargo.toml b/loader/Cargo.toml index 18a98ccdd..18eb661d7 100644 --- a/loader/Cargo.toml +++ b/loader/Cargo.toml @@ -6,23 +6,20 @@ edition = "2018" description = "Initial kernel loader for Xous" [dependencies] -utralib = {path = "utralib"} +utralib = { path = "utralib" } [dependencies.com_rs] -git="https://github.com/betrusted-io/com_rs" -branch="main" +git = "https://github.com/betrusted-io/com_rs" +branch = "main" [dependencies.curve25519-dalek] -git="https://github.com/betrusted-io/curve25519-dalek.git" -branch="main" -#path = "../../curve25519-dalek" package = "curve25519-dalek" -version = "3.1.0" +version = "3" default-features = false features = ["u32e_backend"] [dependencies.ed25519-dalek] -version="1.0.1" +version = "1.0.1" default-features = false #features = ["u32_backend"] @@ -36,13 +33,8 @@ earlyprintk = [] #default = ["debug-print"] default = [] -[profile.release] -codegen-units = 1 # 1 better optimizations -debug = true # symbols are nice and they don't increase the size on Flash -lto = "fat" - [target.'cfg(not(any(windows, unix)))'.dependencies] -utralib = { path = "utralib"} +utralib = { path = "utralib" } # patch key references into our local name space [patch.crates-io.sha2] @@ -54,9 +46,10 @@ default-features = false path = "utralib" [patch.crates-io.curve25519-dalek] -git="https://github.com/betrusted-io/curve25519-dalek.git" -branch="main" -package = "curve25519-dalek" -version = "3.1.0" -default-features = false -features = ["u32e_backend"] \ No newline at end of file +git = "https://github.com/betrusted-io/curve25519-dalek.git" +branch = "main" + +[profile.release] +codegen-units = 1 # 1 better optimizations +debug = true # symbols are nice and they don't increase the size on Flash +lto = "fat"