Skip to content

Commit cd13f85

Browse files
kp-max-likp-thomas-yau
kp-max-li
authored and
kp-thomas-yau
committed
CVPN-1521 change variable names from C enums
Variable names of some enums are changed after the 5.7.4 update. See this commit for details: wolfSSL/wolfssl@17870d4
1 parent 6be8b26 commit cd13f85

File tree

3 files changed

+25
-24
lines changed

3 files changed

+25
-24
lines changed

‎wolfssl-sys/wrapper.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
#include <wolfssl/wolfcrypt/settings.h>
66
#include <wolfssl/wolfcrypt/chacha20_poly1305.h>
77
#include <wolfssl/wolfcrypt/random.h>
8+
#include <wolfssl/wolfcrypt/error-crypt.h>

‎wolfssl/src/context.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ impl ContextBuilder {
118118
let is_dir = path.is_dir();
119119
let path = path
120120
.to_str()
121-
.ok_or_else(|| Error::fatal(wolfssl_sys::WOLFSSL_BAD_PATH))?;
121+
.ok_or_else(|| Error::fatal(wolfssl_sys::wolfSSL_ErrorCodes_WOLFSSL_BAD_PATH))?;
122122
let path = std::ffi::CString::new(path)
123-
.map_err(|_| Error::fatal(wolfssl_sys::WOLFSSL_BAD_PATH))?;
123+
.map_err(|_| Error::fatal(wolfssl_sys::wolfSSL_ErrorCodes_WOLFSSL_BAD_PATH))?;
124124
if is_dir {
125125
// SAFETY: [`wolfSSL_CTX_load_verify_locations`][0] ([also][1]) requires a valid `ctx` pointer from `wolfSSL_CTX_new()`.
126126
// If not NULL, then the pointer passed as the path argument must be a valid NULL-terminated C-style string,
@@ -244,9 +244,9 @@ impl ContextBuilder {
244244
Secret::Asn1File(path) => {
245245
let path = path
246246
.to_str()
247-
.ok_or_else(|| Error::fatal(wolfssl_sys::BAD_PATH_ERROR))?;
247+
.ok_or_else(|| Error::fatal(wolfssl_sys::wolfCrypt_ErrorCodes_BAD_PATH_ERROR))?;
248248
let file = std::ffi::CString::new(path)
249-
.map_err(|_| Error::fatal(wolfssl_sys::BAD_PATH_ERROR))?;
249+
.map_err(|_| Error::fatal(wolfssl_sys::wolfCrypt_ErrorCodes_BAD_PATH_ERROR))?;
250250
// SAFETY: [`wolfSSL_CTX_use_certificate_file`][0] ([also][1]) requires a valid `ctx` pointer from `wolfSSL_CTX_new()`.
251251
// The pointer passed as the path argument must be a valid NULL-terminated C-style string,
252252
// which is guaranteed by the use of `std::ffi::CString::as_c_str()` here.
@@ -278,9 +278,9 @@ impl ContextBuilder {
278278
Secret::PemFile(path) => {
279279
let path = path
280280
.to_str()
281-
.ok_or_else(|| Error::fatal(wolfssl_sys::BAD_PATH_ERROR))?;
281+
.ok_or_else(|| Error::fatal(wolfssl_sys::wolfCrypt_ErrorCodes_BAD_PATH_ERROR))?;
282282
let file = std::ffi::CString::new(path)
283-
.map_err(|_| Error::fatal(wolfssl_sys::BAD_PATH_ERROR))?;
283+
.map_err(|_| Error::fatal(wolfssl_sys::wolfCrypt_ErrorCodes_BAD_PATH_ERROR))?;
284284
// SAFETY: [`wolfSSL_CTX_use_certificate_file`][0] ([also][1]) requires a valid `ctx` pointer from `wolfSSL_CTX_new()`.
285285
// The pointer passed as the path argument must be a valid NULL-terminated C-style string,
286286
// which is guaranteed by the use of `std::ffi::CString::as_c_str()` here.
@@ -332,9 +332,9 @@ impl ContextBuilder {
332332
Secret::Asn1File(path) => {
333333
let path = path
334334
.to_str()
335-
.ok_or_else(|| Error::fatal(wolfssl_sys::BAD_PATH_ERROR))?;
335+
.ok_or_else(|| Error::fatal(wolfssl_sys::wolfCrypt_ErrorCodes_BAD_PATH_ERROR))?;
336336
let file = std::ffi::CString::new(path)
337-
.map_err(|_| Error::fatal(wolfssl_sys::BAD_PATH_ERROR))?;
337+
.map_err(|_| Error::fatal(wolfssl_sys::wolfCrypt_ErrorCodes_BAD_PATH_ERROR))?;
338338
// SAFETY: [`wolfSSL_CTX_use_PrivateKey_file`][0] ([also][1]) requires a valid `ctx` pointer from `wolfSSL_CTX_new()`.
339339
// The pointer passed as the path argument must be a valid NULL-terminated C-style string,
340340
// which is guaranteed by the use of `std::ffi::CString::as_c_str()` here.
@@ -366,9 +366,9 @@ impl ContextBuilder {
366366
Secret::PemFile(path) => {
367367
let path = path
368368
.to_str()
369-
.ok_or_else(|| Error::fatal(wolfssl_sys::BAD_PATH_ERROR))?;
369+
.ok_or_else(|| Error::fatal(wolfssl_sys::wolfCrypt_ErrorCodes_BAD_PATH_ERROR))?;
370370
let file = std::ffi::CString::new(path)
371-
.map_err(|_| Error::fatal(wolfssl_sys::BAD_PATH_ERROR))?;
371+
.map_err(|_| Error::fatal(wolfssl_sys::wolfCrypt_ErrorCodes_BAD_PATH_ERROR))?;
372372
// SAFETY: [`wolfSSL_CTX_use_PrivateKey_file`][0] ([also][1]) requires a valid `ctx` pointer from `wolfSSL_CTX_new()`.
373373
// The pointer passed as the path argument must be a valid NULL-terminated C-style string,
374374
// which is guaranteed by the use of `std::ffi::CString::as_c_str()` here.

‎wolfssl/src/ssl.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ impl<IOCB: IOCallbacks> Session<IOCB> {
393393
// [2]: https://www.wolfssl.com/documentation/manuals/wolfssl/chapter09.html#thread-safety
394394
match unsafe { wolfssl_sys::wolfSSL_negotiate(self.ssl.as_ptr()) } {
395395
wolfssl_sys::WOLFSSL_SUCCESS => Ok(Poll::Ready(())),
396-
x @ wolfssl_sys::WOLFSSL_FATAL_ERROR => match self.get_error(x) {
396+
x @ wolfssl_sys::wolfSSL_ErrorCodes_WOLFSSL_FATAL_ERROR => match self.get_error(x) {
397397
wolfssl_sys::WOLFSSL_ERROR_WANT_READ => Ok(Poll::PendingRead),
398398
wolfssl_sys::WOLFSSL_ERROR_WANT_WRITE => Ok(Poll::PendingWrite),
399399
wolfssl_sys::wolfSSL_ErrorCodes_APP_DATA_READY
@@ -434,7 +434,7 @@ impl<IOCB: IOCallbacks> Session<IOCB> {
434434
match unsafe { wolfssl_sys::wolfSSL_shutdown(self.ssl.as_ptr()) } {
435435
wolfssl_sys::WOLFSSL_SUCCESS => Ok(Poll::Ready(true)),
436436
wolfssl_sys::WOLFSSL_SHUTDOWN_NOT_DONE => Ok(Poll::Ready(false)),
437-
x @ wolfssl_sys::WOLFSSL_FATAL_ERROR => match self.get_error(x) {
437+
x @ wolfssl_sys::wolfSSL_ErrorCodes_WOLFSSL_FATAL_ERROR => match self.get_error(x) {
438438
wolfssl_sys::WOLFSSL_ERROR_WANT_READ => Ok(Poll::PendingRead),
439439
wolfssl_sys::WOLFSSL_ERROR_WANT_WRITE => Ok(Poll::PendingWrite),
440440
wolfssl_sys::wolfSSL_ErrorCodes_APP_DATA_READY
@@ -483,7 +483,7 @@ impl<IOCB: IOCallbacks> Session<IOCB> {
483483
data_in.advance(x as usize);
484484
Ok(Poll::Ready(x as usize))
485485
}
486-
x @ (0 | wolfssl_sys::WOLFSSL_FATAL_ERROR) => match self.get_error(x) {
486+
x @ (0 | wolfssl_sys::wolfSSL_ErrorCodes_WOLFSSL_FATAL_ERROR) => match self.get_error(x) {
487487
wolfssl_sys::WOLFSSL_ERROR_NONE => Ok(Poll::Ready(0)),
488488
wolfssl_sys::WOLFSSL_ERROR_WANT_READ => Ok(Poll::PendingRead),
489489
wolfssl_sys::WOLFSSL_ERROR_WANT_WRITE => Ok(Poll::PendingWrite),
@@ -534,7 +534,7 @@ impl<IOCB: IOCallbacks> Session<IOCB> {
534534
}
535535
Ok(Poll::Ready(x as usize))
536536
}
537-
x @ (0 | wolfssl_sys::WOLFSSL_FATAL_ERROR) => match self.get_error(x) {
537+
x @ (0 | wolfssl_sys::wolfSSL_ErrorCodes_WOLFSSL_FATAL_ERROR) => match self.get_error(x) {
538538
wolfssl_sys::WOLFSSL_ERROR_WANT_READ => Ok(Poll::PendingRead),
539539
wolfssl_sys::WOLFSSL_ERROR_WANT_WRITE => Ok(Poll::PendingWrite),
540540
wolfssl_sys::WOLFSSL_ERROR_NONE => Ok(Poll::Ready(0)),
@@ -600,7 +600,7 @@ impl<IOCB: IOCallbacks> Session<IOCB> {
600600
// [2]: https://www.wolfssl.com/documentation/manuals/wolfssl/chapter09.html#thread-safety
601601
match unsafe { wolfssl_sys::wolfSSL_Rehandshake(self.ssl.as_ptr()) } {
602602
wolfssl_sys::WOLFSSL_SUCCESS => Ok(Poll::Ready(())),
603-
x @ wolfssl_sys::WOLFSSL_FATAL_ERROR => match self.get_error(x) {
603+
x @ wolfssl_sys::wolfSSL_ErrorCodes_WOLFSSL_FATAL_ERROR => match self.get_error(x) {
604604
wolfssl_sys::WOLFSSL_ERROR_WANT_READ => Ok(Poll::PendingRead),
605605
wolfssl_sys::WOLFSSL_ERROR_WANT_WRITE => Ok(Poll::PendingWrite),
606606
wolfssl_sys::wolfSSL_ErrorCodes_APP_DATA_READY
@@ -636,7 +636,7 @@ impl<IOCB: IOCallbacks> Session<IOCB> {
636636
// [2]: https://www.wolfssl.com/documentation/manuals/wolfssl/chapter09.html#thread-safety
637637
match unsafe { wolfssl_sys::wolfSSL_update_keys(self.ssl.as_ptr()) } {
638638
wolfssl_sys::WOLFSSL_SUCCESS => Ok(Poll::Ready(())),
639-
e @ wolfssl_sys::BAD_FUNC_ARG => unreachable!("{e:?}"),
639+
e @ wolfssl_sys::wolfCrypt_ErrorCodes_BAD_FUNC_ARG => unreachable!("{e:?}"),
640640
wolfssl_sys::WOLFSSL_ERROR_WANT_WRITE => Ok(Poll::PendingWrite),
641641

642642
e => unreachable!("Received unknown code {e}"),
@@ -708,7 +708,7 @@ impl<IOCB: IOCallbacks> Session<IOCB> {
708708
// [1]: https://www.wolfssl.com/doxygen/ssl_8h.html#a07da5ada53a2a68ee8e7a6dab9b5f429
709709
// [2]: https://www.wolfssl.com/documentation/manuals/wolfssl/chapter09.html#thread-safety
710710
match unsafe { wolfssl_sys::wolfSSL_dtls_get_current_timeout(self.ssl.as_ptr()) } {
711-
e @ wolfssl_sys::NOT_COMPILED_IN => unreachable!("{e:?}"),
711+
e @ wolfssl_sys::wolfCrypt_ErrorCodes_NOT_COMPILED_IN => unreachable!("{e:?}"),
712712
x if x > 0 => Duration::from_secs(x as u64),
713713
e => unreachable!("{e:?}"),
714714
}
@@ -745,7 +745,7 @@ impl<IOCB: IOCallbacks> Session<IOCB> {
745745
wolfssl_sys::wolfSSL_dtls_set_timeout_init(self.ssl.as_ptr(), time.as_secs() as c_int)
746746
} {
747747
wolfssl_sys::WOLFSSL_SUCCESS => Ok(()),
748-
x @ wolfssl_sys::BAD_FUNC_ARG => Err(Error::fatal(x)),
748+
x @ wolfssl_sys::wolfCrypt_ErrorCodes_BAD_FUNC_ARG => Err(Error::fatal(x)),
749749
e => unreachable!("{e:?}"),
750750
}
751751
}
@@ -778,7 +778,7 @@ impl<IOCB: IOCallbacks> Session<IOCB> {
778778
wolfssl_sys::wolfSSL_dtls_set_timeout_max(self.ssl.as_ptr(), time.as_secs() as c_int)
779779
} {
780780
wolfssl_sys::WOLFSSL_SUCCESS => Ok(()),
781-
x @ wolfssl_sys::BAD_FUNC_ARG => Err(Error::fatal(x)),
781+
x @ wolfssl_sys::wolfCrypt_ErrorCodes_BAD_FUNC_ARG => Err(Error::fatal(x)),
782782
e => unreachable!("{e:?}"),
783783
}
784784
}
@@ -798,9 +798,9 @@ impl<IOCB: IOCallbacks> Session<IOCB> {
798798
// [1]: https://www.wolfssl.com/doxygen/ssl_8h.html#a86c630a78e966b768332c5b19e485a51
799799
// [2]: https://www.wolfssl.com/documentation/manuals/wolfssl/chapter09.html#thread-safety
800800
match unsafe { wolfssl_sys::wolfSSL_dtls_got_timeout(self.ssl.as_ptr()) } {
801-
e @ wolfssl_sys::NOT_COMPILED_IN => unreachable!("{e:?}"),
801+
e @ wolfssl_sys::wolfCrypt_ErrorCodes_NOT_COMPILED_IN => unreachable!("{e:?}"),
802802
wolfssl_sys::WOLFSSL_SUCCESS => Poll::Ready(false),
803-
x @ wolfssl_sys::WOLFSSL_FATAL_ERROR => match self.get_error(x) {
803+
x @ wolfssl_sys::wolfSSL_ErrorCodes_WOLFSSL_FATAL_ERROR => match self.get_error(x) {
804804
wolfssl_sys::WOLFSSL_ERROR_WANT_READ => Poll::PendingRead,
805805
wolfssl_sys::WOLFSSL_ERROR_WANT_WRITE => Poll::PendingWrite,
806806
_ => Poll::Ready(true),
@@ -1106,7 +1106,7 @@ impl<IOCB: IOCallbacks> Session<IOCB> {
11061106
)
11071107
} {
11081108
wolfssl_sys::WOLFSSL_SUCCESS => Ok(()),
1109-
e @ wolfssl_sys::BAD_FUNC_ARG => unreachable!("{e:?}"),
1109+
e @ wolfssl_sys::wolfCrypt_ErrorCodes_BAD_FUNC_ARG => unreachable!("{e:?}"),
11101110
e => Err(Error::fatal(e)),
11111111
}
11121112
}
@@ -1152,8 +1152,8 @@ impl<IOCB: IOCallbacks> Session<IOCB> {
11521152
)
11531153
} {
11541154
wolfssl_sys::WOLFSSL_SUCCESS => Ok(()),
1155-
wolfssl_sys::MEMORY_E => panic!("Memory Allocation Failed"),
1156-
e @ wolfssl_sys::BAD_FUNC_ARG => unreachable!("{e:?}"),
1155+
wolfssl_sys::wolfCrypt_ErrorCodes_MEMORY_E => panic!("Memory Allocation Failed"),
1156+
e @ wolfssl_sys::wolfCrypt_ErrorCodes_BAD_FUNC_ARG => unreachable!("{e:?}"),
11571157
e => unreachable!("{e:?}"),
11581158
}
11591159
}

0 commit comments

Comments
 (0)