Add new Rust crates to build files Added in https://boringssl-review.googlesource.com/c/boringssl/+/90427 Change-Id: Ic6981d2ccfa6a69a09c01f66331f079c6a6a6964 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/90707 Commit-Queue: Lily Chen <chlily@google.com> Reviewed-by: Xiangfei Ding <xfding@google.com> Auto-Submit: Lily Chen <chlily@google.com> Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com>
diff --git a/build.json b/build.json index 3dfd6de..2fc20e1 100644 --- a/build.json +++ b/build.json
@@ -1108,6 +1108,16 @@ "rust/bssl-crypto/src/*/*.rs" ] }, + "rust_bssl_macros": { + "srcs": [ + "rust/bssl-macros/src/*.rs" + ] + }, + "rust_bssl_x509": { + "srcs": [ + "rust/bssl-x509/src/*.rs" + ] + }, "modulewrapper": { "srcs": [ "util/fipstools/acvp/modulewrapper/main.cc",
diff --git a/gen/sources.bzl b/gen/sources.bzl index 006072f..8757a08 100644 --- a/gen/sources.bzl +++ b/gen/sources.bzl
@@ -2855,10 +2855,27 @@ "rust/bssl-crypto/src/x25519.rs", ] +rust_bssl_macros_sources = [ + "rust/bssl-macros/src/lib.rs", +] + rust_bssl_sys_sources = [ "rust/bssl-sys/src/lib.rs", ] +rust_bssl_x509_sources = [ + "rust/bssl-x509/src/certificates.rs", + "rust/bssl-x509/src/errors.rs", + "rust/bssl-x509/src/ffi.rs", + "rust/bssl-x509/src/keys.rs", + "rust/bssl-x509/src/lib.rs", + "rust/bssl-x509/src/oids.rs", + "rust/bssl-x509/src/params.rs", + "rust/bssl-x509/src/store.rs", + "rust/bssl-x509/src/tests.rs", + "rust/bssl-x509/src/verify.rs", +] + ssl_sources = [ "ssl/bio_ssl.cc", "ssl/d1_both.cc",
diff --git a/gen/sources.cmake b/gen/sources.cmake index 1483617..e6ae84d 100644 --- a/gen/sources.cmake +++ b/gen/sources.cmake
@@ -2914,12 +2914,33 @@ ) set( + RUST_BSSL_MACROS_SOURCES + + rust/bssl-macros/src/lib.rs +) + +set( RUST_BSSL_SYS_SOURCES rust/bssl-sys/src/lib.rs ) set( + RUST_BSSL_X509_SOURCES + + rust/bssl-x509/src/certificates.rs + rust/bssl-x509/src/errors.rs + rust/bssl-x509/src/ffi.rs + rust/bssl-x509/src/keys.rs + rust/bssl-x509/src/lib.rs + rust/bssl-x509/src/oids.rs + rust/bssl-x509/src/params.rs + rust/bssl-x509/src/store.rs + rust/bssl-x509/src/tests.rs + rust/bssl-x509/src/verify.rs +) + +set( SSL_SOURCES ssl/bio_ssl.cc
diff --git a/gen/sources.gni b/gen/sources.gni index 8212721..e215e39 100644 --- a/gen/sources.gni +++ b/gen/sources.gni
@@ -2855,10 +2855,27 @@ "rust/bssl-crypto/src/x25519.rs", ] +rust_bssl_macros_sources = [ + "rust/bssl-macros/src/lib.rs", +] + rust_bssl_sys_sources = [ "rust/bssl-sys/src/lib.rs", ] +rust_bssl_x509_sources = [ + "rust/bssl-x509/src/certificates.rs", + "rust/bssl-x509/src/errors.rs", + "rust/bssl-x509/src/ffi.rs", + "rust/bssl-x509/src/keys.rs", + "rust/bssl-x509/src/lib.rs", + "rust/bssl-x509/src/oids.rs", + "rust/bssl-x509/src/params.rs", + "rust/bssl-x509/src/store.rs", + "rust/bssl-x509/src/tests.rs", + "rust/bssl-x509/src/verify.rs", +] + ssl_sources = [ "ssl/bio_ssl.cc", "ssl/d1_both.cc",
diff --git a/gen/sources.json b/gen/sources.json index 28cc2b4..8104eb2 100644 --- a/gen/sources.json +++ b/gen/sources.json
@@ -2837,11 +2837,30 @@ "rust/bssl-crypto/src/x25519.rs" ] }, + "rust_bssl_macros": { + "srcs": [ + "rust/bssl-macros/src/lib.rs" + ] + }, "rust_bssl_sys": { "srcs": [ "rust/bssl-sys/src/lib.rs" ] }, + "rust_bssl_x509": { + "srcs": [ + "rust/bssl-x509/src/certificates.rs", + "rust/bssl-x509/src/errors.rs", + "rust/bssl-x509/src/ffi.rs", + "rust/bssl-x509/src/keys.rs", + "rust/bssl-x509/src/lib.rs", + "rust/bssl-x509/src/oids.rs", + "rust/bssl-x509/src/params.rs", + "rust/bssl-x509/src/store.rs", + "rust/bssl-x509/src/tests.rs", + "rust/bssl-x509/src/verify.rs" + ] + }, "ssl": { "srcs": [ "ssl/bio_ssl.cc",
diff --git a/gen/sources.mk b/gen/sources.mk index 06e0116..533f7fb 100644 --- a/gen/sources.mk +++ b/gen/sources.mk
@@ -2826,9 +2826,24 @@ rust/bssl-crypto/src/tls12_prf.rs \ rust/bssl-crypto/src/x25519.rs +boringssl_rust_bssl_macros_sources := \ + rust/bssl-macros/src/lib.rs + boringssl_rust_bssl_sys_sources := \ rust/bssl-sys/src/lib.rs +boringssl_rust_bssl_x509_sources := \ + rust/bssl-x509/src/certificates.rs \ + rust/bssl-x509/src/errors.rs \ + rust/bssl-x509/src/ffi.rs \ + rust/bssl-x509/src/keys.rs \ + rust/bssl-x509/src/lib.rs \ + rust/bssl-x509/src/oids.rs \ + rust/bssl-x509/src/params.rs \ + rust/bssl-x509/src/store.rs \ + rust/bssl-x509/src/tests.rs \ + rust/bssl-x509/src/verify.rs + boringssl_ssl_sources := \ ssl/bio_ssl.cc \ ssl/d1_both.cc \
diff --git a/util/generate_build_files.py b/util/generate_build_files.py index b0bb09f..5d1f7c5 100644 --- a/util/generate_build_files.py +++ b/util/generate_build_files.py
@@ -241,6 +241,8 @@ self.PrintVariableSection(out, 'pki_sources', files['pki']) self.PrintVariableSection(out, 'rust_bssl_sys', files['rust_bssl_sys']) self.PrintVariableSection(out, 'rust_bssl_crypto', files['rust_bssl_crypto']) + self.PrintVariableSection(out, 'rust_bssl_macros', files['rust_bssl_macros']) + self.PrintVariableSection(out, 'rust_bssl_x509', files['rust_bssl_x509']) self.PrintVariableSection(out, 'tool_sources', files['tool']) self.PrintVariableSection(out, 'tool_headers', files['tool_headers']) @@ -336,6 +338,8 @@ self.PrintVariableSection(out, 'rust_bssl_sys', files['rust_bssl_sys']) self.PrintVariableSection(out, 'rust_bssl_crypto', files['rust_bssl_crypto']) + self.PrintVariableSection(out, 'rust_bssl_macros', files['rust_bssl_macros']) + self.PrintVariableSection(out, 'rust_bssl_x509', files['rust_bssl_x509']) self.PrintVariableSection(out, 'ssl_sources', files['ssl'] + files['ssl_internal_headers']) self.PrintVariableSection(out, 'ssl_headers', files['ssl_headers']) @@ -643,6 +647,8 @@ 'pki_test_data': PrefixWithSrc(sources['pki_test']['data']), 'rust_bssl_crypto': PrefixWithSrc(sources['rust_bssl_crypto']['srcs']), 'rust_bssl_sys': PrefixWithSrc(sources['rust_bssl_sys']['srcs']), + 'rust_bssl_macros': PrefixWithSrc(sources['rust_bssl_macros']['srcs']), + 'rust_bssl_x509': PrefixWithSrc(sources['rust_bssl_x509']['srcs']), 'ssl': PrefixWithSrc(sources['ssl']['srcs']), 'ssl_headers': PrefixWithSrc(sources['ssl']['hdrs']), 'ssl_internal_headers': PrefixWithSrc(sources['ssl']['internal_hdrs']),