From cedba9da01fd0e862942a2e3a6bd13500a1b5ed7 Mon Sep 17 00:00:00 2001
From: pNext <843609378@qq.com>
Date: Thu, 5 Jan 2023 13:14:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dnss.rs=E4=B8=ADclippy?=
 =?UTF-8?q?=E5=89=A9=E4=BD=99=E7=9A=842=E4=B8=AA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rust/rust_project/src/vtls/nss.rs  | 2 ++
 rust/rust_project/src/vtls/vtls.rs | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rust/rust_project/src/vtls/nss.rs b/rust/rust_project/src/vtls/nss.rs
index 3a79868..79640c6 100644
--- a/rust/rust_project/src/vtls/nss.rs
+++ b/rust/rust_project/src/vtls/nss.rs
@@ -2261,6 +2261,7 @@ extern "C" fn check_issuer_cert(
     cert_issuer = unsafe { CERT_FindCertIssuer(cert, PR_Now(), certUsageObjectSigner) };
     proto_win = unsafe { SSL_RevealPinArg(sock) };
     issuer = unsafe { PK11_FindCertFromNickname(issuer_nickname, proto_win) };
+    #[allow(clippy::if_same_then_else)]
     if cert_issuer.is_null() || issuer.is_null() {
         res = SECFailure;
     } else if unsafe {
@@ -5601,6 +5602,7 @@ extern "C" fn nss_do_connect(
             if unsafe { PR_GetError() as i64 } == -(5998 as i64) {
                 return CURLE_AGAIN;
             } else {
+                #[allow(clippy::if_same_then_else)]
                 if SSL_SET_OPTION_certverifyresult == SSL_ERROR_BAD_CERT_DOMAIN as i64 {
                     result = CURLE_PEER_FAILED_VERIFICATION;
                 } else if SSL_SET_OPTION_certverifyresult != 0 as i64 {
diff --git a/rust/rust_project/src/vtls/vtls.rs b/rust/rust_project/src/vtls/vtls.rs
index ff1c61a..3fcdd01 100644
--- a/rust/rust_project/src/vtls/vtls.rs
+++ b/rust/rust_project/src/vtls/vtls.rs
@@ -2566,7 +2566,7 @@ pub static mut Curl_ssl: *const Curl_ssl = unsafe { &Curl_ssl_mesalink as *const
 ))]
 #[no_mangle]
 pub static mut Curl_ssl: *const Curl_ssl = unsafe { &Curl_ssl_bearssl as *const Curl_ssl };
-// TODO 这里的2得改掉，最好是省略数组长度，这里也得先注释了再测试
+// 这里对源码进行了修改
 const fn count_available_backends() -> usize {
     let mut num: usize = 1;
 
@@ -2820,7 +2820,7 @@ pub extern "C" fn curl_global_sslset(
     let mut i: i32 = 0;
     const count: usize = count_available_backends();
     if !avail.is_null() {
-        // TODO 这里最后的2也得根据开了多少个ssl进行更改
+        // 这里对源码进行了更改
         unsafe {
             *avail = &mut available_backends as *mut [*const Curl_ssl; count]
                 as *mut *const curl_ssl_backend
-- 
Gitee