diff --git a/Cargo.lock b/Cargo.lock index 05c6365..5050606 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -607,6 +607,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chacha20" version = "0.10.0" @@ -3905,7 +3911,7 @@ dependencies = [ "rand 0.8.5", "rsa", "serde", - "sha1", + "sha1 0.10.6", "sha2 0.10.9", "smallvec", "sqlx-core", diff --git a/Cargo.toml b/Cargo.toml index 89dd73f..efa0706 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,6 +53,6 @@ sha256 = "1.6.0" p256 = "0.13.2" k256 = "0.13.4" dsa = "0.6.3" -openssl = "0.10.78" +openssl = {version = "0.10.78", features = ["vendored"]} time = "0.3.47" hickory-resolver = { version = "0.24", features = ["tokio-runtime"] } diff --git a/Dockerfile b/Dockerfile index d868a5c..7c1b107 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM rust:alpine as builder -RUN apk add --no-cache musl-dev openssl-dev openssl-libs-static protobuf-dev lld +RUN apk add --no-cache musl-dev openssl-dev openssl-libs-static protobuf-dev lld perl make WORKDIR /app @@ -16,7 +16,7 @@ COPY . . RUN touch src/main.rs ENV SQLX_OFFLINE=true -RUN OPENSSL_LIB_DIR=/usr/lib OPENSSL_INCLUDE_DIR=/usr/include/openssl OPENSSL_STATIC=1 RUSTFLAGS="-C target-feature=+aes,+sse -C relocation-model=static -C linker=ld.lld" cargo build --profile prod --target x86_64-unknown-linux-musl +RUN RUSTFLAGS="-C target-feature=+aes,+sse -C relocation-model=static -C linker=ld.lld" cargo build --profile prod --target x86_64-unknown-linux-musl FROM scratch AS final diff --git a/src/nnid/provider.rs b/src/nnid/provider.rs index a178b53..973916a 100644 --- a/src/nnid/provider.rs +++ b/src/nnid/provider.rs @@ -57,8 +57,6 @@ pub async fn get_service_token(pool: &State, auth: Auth) -> R let token = create_token(pool, auth.pid, NEX_TOKEN, None).await; - - Ok( Xml( ServiceToken{ @@ -114,4 +112,4 @@ pub async fn get_nex_token(pool: &State, auth: Auth, game_ser } ) ) -} \ No newline at end of file +}