update dependencies

cgpuvm-attest/Cargo.toml

@@ -16,6 +16,7 @@ tracing = "0.1"
 thiserror = "1"
 
 [dependencies.ohttp]
-path= "../ohttp"
+git = "https://github.com/microsoft/ohttp.git"
+branch = "main"
 features = ["server"]
 default-features = false

cgpuvm-attest/src/err.rs

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 use thiserror::Error;
 
 #[derive(Error, Debug)]

cgpuvm-attest/src/lib.rs

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 pub mod err;
 
 use err::AttestError;

docker/client/Dockerfile

@@ -1,10 +1,7 @@
 FROM rust:1.75 AS builder
 
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -yq \
-ca-certificates coreutils curl git make mercurial \
-build-essential clang llvm libclang-dev lld \
-gyp ninja-build pkg-config zlib1g-dev libssl-dev
+RUN apt-get update && apt-get install -yq openssl libssl-dev
 
 WORKDIR /usr/src/ohttp
 COPY . .

ohttp-client/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ohttp-client"
-version = "0.5.3"
-authors = ["Martin Thomson <[email protected]>"]
+version = "0.1.0"
+authors = ["Kapil Vaswani <[email protected]>"]
 edition = "2021"
 
 [features]
@@ -30,12 +30,12 @@ infer = "0.16.0"
 path= "../verifier"
 
 [dependencies.bhttp]
-git = "https://github.com/kapilvgit/ohttp.git"
-branch = "kapilv/upstream"
+git = "https://github.com/microsoft/ohttp.git"
+branch = "main"
 features = ["bhttp", "http"]
 
 [dependencies.ohttp]
-git = "https://github.com/kapilvgit/ohttp.git"
-branch = "kapilv/upstream"
+git = "https://github.com/microsoft/ohttp.git"
+branch = "main"
 features = ["client"]
 default-features = false

ohttp-server/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ohttp-server"
-version = "0.5.3"
-authors = ["Martin Thomson <[email protected]>"]
+version = "0.1.0"
+authors = ["Kapil Vaswani <[email protected]>"]
 edition = "2021"
 
 [features]
@@ -32,15 +32,18 @@ tracing-subscriber = { version = "0.3.18", features = ["default", "json", "env-f
 thiserror = "1"
 uuid = { version = "1.0", features = ["v4"] }
 
+[dependencies.cgpuvm-attest]
+path= "../cgpuvm-attest"
+features = []
+
 [dependencies.bhttp]
-path= "../bhttp"
+git = "https://github.com/microsoft/ohttp.git"
+branch = "main"
 features = ["bhttp", "write-http"]
 
 [dependencies.ohttp]
-path= "../ohttp"
+git = "https://github.com/microsoft/ohttp.git"
+branch = "main"
 features = ["server"]
 default-features = false
 
-[dependencies.cgpuvm-attest]
-path= "../cgpuvm-attest"
-features = []

ohttp-server/src/err.rs

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 use thiserror::Error;
 
 #[derive(Error, Debug)]

ohttp-server/src/main.rs

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 #![deny(clippy::pedantic)]
 
 pub mod err;

scripts/service_wait.sh

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 #!/bin/bash
 
 SERVICE_HOST=$1