Skip to content

Commit dd3b926

Browse files
committed
Rust wrapper: merge wolfssl-sys crate into wolfssl crate
1 parent 50c5028 commit dd3b926

File tree

26 files changed

+732
-1118
lines changed

26 files changed

+732
-1118
lines changed

wrapper/rust/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.PHONY: all
22
all:
3-
+$(MAKE) -C wolfssl-sys
43
+$(MAKE) -C wolfssl
54

65
.PHONY: test
@@ -9,5 +8,4 @@ test:
98

109
.PHONY: clean
1110
clean:
12-
+$(MAKE) -C wolfssl-sys clean
1311
+$(MAKE) -C wolfssl clean

wrapper/rust/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Run tests with:
1717
| Repository Directory | Description |
1818
| --- | --- |
1919
| `/wrapper/rust` | Top level container for all Rust wrapper functionality. |
20-
| `/wrapper/rust/wolfssl` | Top level for the `wolfssl` library crate. This crate contains high-level Rust sources that use the bindings from the `wolfssl-sys` crate. |
20+
| `/wrapper/rust/wolfssl` | Top level for the `wolfssl` library crate. |
2121
| `/wrapper/rust/wolfssl/src` | Source directory for `wolfssl` crate top-level modules. |
2222
| `/wrapper/rust/wolfssl/src/wolfcrypt` | Source directory for submodules of `wolfssl::wolfcrypt` module. |
23-
| `/wrapper/rust/wolfssl-sys` | Top level for the `wolfssl-sys` library crate. This crate contains only automatically generated bindings to the `wolfssl` C library. |

wrapper/rust/include.am

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,11 @@
44

55
EXTRA_DIST += wrapper/rust/Makefile
66
EXTRA_DIST += wrapper/rust/README.md
7-
EXTRA_DIST += wrapper/rust/wolfssl-sys/Cargo.lock
8-
EXTRA_DIST += wrapper/rust/wolfssl-sys/Cargo.toml
9-
EXTRA_DIST += wrapper/rust/wolfssl-sys/Makefile
10-
EXTRA_DIST += wrapper/rust/wolfssl-sys/build.rs
11-
EXTRA_DIST += wrapper/rust/wolfssl-sys/headers.h
12-
EXTRA_DIST += wrapper/rust/wolfssl-sys/src/lib.rs
137
EXTRA_DIST += wrapper/rust/wolfssl/Cargo.lock
148
EXTRA_DIST += wrapper/rust/wolfssl/Cargo.toml
159
EXTRA_DIST += wrapper/rust/wolfssl/Makefile
1610
EXTRA_DIST += wrapper/rust/wolfssl/build.rs
11+
EXTRA_DIST += wrapper/rust/wolfssl/headers.h
1712
EXTRA_DIST += wrapper/rust/wolfssl/src/lib.rs
1813
EXTRA_DIST += wrapper/rust/wolfssl/src/wolfcrypt.rs
1914
EXTRA_DIST += wrapper/rust/wolfssl/src/wolfcrypt/aes.rs

wrapper/rust/wolfssl-sys/Cargo.lock

Lines changed: 0 additions & 293 deletions
This file was deleted.

wrapper/rust/wolfssl-sys/Cargo.toml

Lines changed: 0 additions & 17 deletions
This file was deleted.

wrapper/rust/wolfssl-sys/Makefile

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)