Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing enums from cbindgen generated header #28

Merged
merged 2 commits into from
Apr 18, 2022
Merged

Fix missing enums from cbindgen generated header #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cacb38
nsm-lib: re-add missing exports from aws-nitro-enclaves-nsm-api
Apr 14, 2022
0e2882c
nsm-lib: update cbindgen
Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nsm-lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ aws-nitro-enclaves-nsm-api = { path = "../" }
serde_bytes = "0.11"

[build-dependencies]
cbindgen = { version = "0.15", default-features = false }
cbindgen = { version = "0.21", default-features = false }

[lib]
name = "nsm"
Expand Down
2 changes: 1 addition & 1 deletion nsm-lib/cbindgen.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ include_guard = "NSM_LIB_H"

[parse]
parse_deps = true
include = ["nsm-io"]
include = ["aws-nitro-enclaves-nsm-api"]

[enum]
rename_variants = "QualifiedScreamingSnakeCase"
3 changes: 2 additions & 1 deletion nsm-lib/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
//! This module implements wrappers over the NSM Rust API which enable
//! access to the API for non-Rust callers (ex.: C/C++ etc.).

use aws_nitro_enclaves_nsm_api::api::{Digest, ErrorCode, Request, Response};
pub use aws_nitro_enclaves_nsm_api::api::{Digest, ErrorCode};
use aws_nitro_enclaves_nsm_api::api::{Request, Response};
use aws_nitro_enclaves_nsm_api::driver::{nsm_exit, nsm_init, nsm_process_request};
use serde_bytes::ByteBuf;
use std::ptr::copy_nonoverlapping;
Expand Down