chore: Remove nspr_types

This moves bindgen closer to what neqo_crypto does. Some unions get generated 'better', i.e. with copy and clone traits, through this

Author: Not-Nik

bindings/bindings.toml

@@ -5,26 +5,6 @@
 # header with the types/variables/functions/enums declared for generation in
 # other headers.
 
-[nspr_types]
-types = [
-    "PRBool",
-    "PRIntn",
-    "PRInt16",
-    "PRInt32",
-    "PRInt64",
-    "PROffset32",
-    "PROffset64",
-    "PRSize",
-    "PRStatus",
-    "PRUintn",
-    "PRUint8",
-    "PRUint16",
-    "PRUint32",
-    "PRUint64",
-    "PRUword",
-]
-variables = ["PR_FALSE", "PR_TRUE"]
-
 [nss_prelude]
 types = ["SECItem", "SECItemArray", "SECItemStr", "SECStatus"]
 functions = ["SECITEM_FreeItem", "SECITEM_FreeArray"]
@@ -296,7 +276,7 @@ functions = ["PR_Close", "PR_CreateIOLayerStub", "PR_GetUniqueIdentity"]
 variables = ["PR_AF_INET"]
 # opaque is for the stuff we don't plan to use, but we need for function signatures.
 opaque = ["PRFileInfo", "PRFileInfo64", "PRFilePrivate", "PRIOVec"]
-enums = ["PRDescType", "PRSeekWhence"]
+enums = ["PRDescType", "PRStatus", "PRSeekWhence"]
 
 [nspr_time]
 types = ["PRTime"]

src/aead.rs

@@ -19,9 +19,8 @@ use crate::{
         CKA_ENCRYPT, CKA_NSS_MESSAGE, CKG_GENERATE_COUNTER_XOR, CKG_NO_GENERATE, CKM_AES_GCM,
         CKM_CHACHA20_POLY1305, CK_ATTRIBUTE_TYPE, CK_GENERATOR_FUNCTION, CK_MECHANISM_TYPE,
     },
-    prtypes::{PRUint16, PRUint64, PRUint8},
     scoped_ptr, secstatus_to_res,
-    ssl::SSLAeadContext,
+    ssl::{PRUint16, PRUint64, PRUint8, SSLAeadContext},
     SECItemBorrowed, SymKey,
 };
 

src/agent.rs

@@ -44,10 +44,9 @@ use crate::{
     null_safe_slice,
     p11::{self, hex_with_len, PrivateKey, PublicKey},
     prio,
-    prtypes::PRBool,
     replay::AntiReplay,
     secrets::SecretHolder,
-    ssl,
+    ssl::{self, PRBool},
     time::{Time, TimeHolder},
     SECItem, SECItemArray, SECItemBorrowed, SECStatus,
 };

src/agentio.rs

@@ -27,16 +27,17 @@ use crate::{
     err::{nspr, Error, PR_SetError, Res},
     null_safe_slice,
     p11::hex_with_len,
-    prio, prtypes,
+    prio,
     selfencrypt::hex,
-    ssl, PRInt32, PRInt64, PRIntn, PRUint16, PRUint8, SECStatus,
+    ssl::{self, PRInt32, PRInt64, PRIntn, PRUint16, PRUint8},
+    SECStatus,
 };
 
 // Alias common types.
 type PrFd = *mut prio::PRFileDesc;
-type PrStatus = prtypes::PRStatus;
-const PR_SUCCESS: PrStatus = prtypes::PR_SUCCESS;
-const PR_FAILURE: PrStatus = prtypes::PR_FAILURE;
+type PrStatus = prio::PRStatus::Type;
+const PR_SUCCESS: PrStatus = prio::PRStatus::PR_SUCCESS;
+const PR_FAILURE: PrStatus = prio::PRStatus::PR_FAILURE;
 
 /// Convert a pinned, boxed object into a void pointer.
 pub fn as_c_void<T: Unpin>(pin: &mut Pin<Box<T>>) -> *mut c_void {
@@ -352,16 +353,16 @@ unsafe extern "C" fn agent_getname(_fd: PrFd, addr: *mut prio::PRNetAddr) -> PrS
         return PR_FAILURE;
     };
     // Cast is safe because prio::PR_AF_INET is 2
-    a.inet.as_mut().family = prio::PR_AF_INET as PRUint16;
-    a.inet.as_mut().port = 0;
-    a.inet.as_mut().ip = 0;
+    a.inet.family = prio::PR_AF_INET as PRUint16;
+    a.inet.port = 0;
+    a.inet.ip = 0;
     PR_SUCCESS
 }
 
 unsafe extern "C" fn agent_getsockopt(_fd: PrFd, opt: *mut prio::PRSocketOptionData) -> PrStatus {
     if let Some(o) = opt.as_mut() {
         if o.option == prio::PRSockOption_PR_SockOpt_Nonblocking {
-            *o.value.non_blocking.as_mut() = 1;
+            o.value.non_blocking = 1;
             return PR_SUCCESS;
         }
     }

src/ec.rs

@@ -22,8 +22,9 @@ use crate::{
         PK11_ImportDERPrivateKeyInfoAndReturnKey, PK11_ImportPublicKey, PK11_PubDeriveWithKDF,
         PK11_ReadRawAttribute, SECKEY_DecodeDERSubjectPublicKeyInfo, Slot, KU_ALL,
     },
+    ssl::PRBool,
     util::SECItemMut,
-    PrivateKey, PublicKey, SECItem, SECItemBorrowed, PR_FALSE,
+    PrivateKey, PublicKey, SECItem, SECItemBorrowed,
 };
 //
 // Constants
@@ -181,7 +182,7 @@ pub fn import_ec_public_key_from_spki(spki: &[u8]) -> Result<PublicKey, Error> {
             crate::p11::SECKEY_ExtractPublicKey(spki.as_mut().ok_or(Error::InvalidInput)?)
                 .into_result()?;
 
-        let handle = PK11_ImportPublicKey(*slot, *pk, PR_FALSE);
+        let handle = PK11_ImportPublicKey(*slot, *pk, PRBool::from(false));
         if handle == pkcs11_bindings::CK_INVALID_HANDLE {
             return Err(Error::InvalidInput);
         }

src/ech.rs

@@ -19,7 +19,7 @@ use crate::{
     experimental_api, null_safe_slice,
     p11::{self, PrivateKey, PublicKey, SECKEYPrivateKey, SECKEYPublicKey, Slot},
     prio::PRFileDesc,
-    prtypes::PRBool,
+    ssl::PRBool,
     SECItem, SECItemBorrowed, SECItemMut,
 };
 pub use crate::{

src/err.rs

@@ -6,10 +6,7 @@
 
 use std::{os::raw::c_char, str::Utf8Error};
 
-use crate::{
-    nss_prelude::*,
-    prtypes::{PRInt32, PRUint32},
-};
+use crate::nss_prelude::*;
 
 include!(concat!(env!("OUT_DIR"), "/nspr_error.rs"));
 #[expect(non_snake_case, dead_code, reason = "Code is bindgen-generated.")]

src/ext.rs

@@ -22,9 +22,9 @@ use crate::{
     agentio::as_c_void,
     constants::{Extension, HandshakeMessage, TLS_HS_CLIENT_HELLO, TLS_HS_ENCRYPTED_EXTENSIONS},
     err::Res,
+    nss_prelude::PRBool,
     null_safe_slice,
     prio::PRFileDesc,
-    prtypes::PRBool,
     ssl::{
         SECFailure, SECSuccess, SSLAlertDescription, SSLExtensionHandler, SSLExtensionWriter,
         SSLHandshakeType,

src/lib.rs

@@ -99,7 +99,6 @@ pub mod nss_prelude {
     )]
     pub use _SECStatus::*;
 
-    pub use crate::prtypes::*;
     include!(concat!(env!("OUT_DIR"), "/nss_prelude.rs"));
 }
 pub use nss_prelude::{SECItem, SECItemArray, SECItemType, SECStatus};
@@ -110,15 +109,6 @@ mod nss {
     include!(concat!(env!("OUT_DIR"), "/nss_init.rs"));
 }
 
-pub mod prtypes;
-pub use prtypes::*;
-
-// Shadow these bindgen created values to correct their type.
-#[expect(clippy::cast_possible_wrap)]
-pub const PR_FALSE: PRBool = prtypes::PR_FALSE as PRBool;
-#[expect(clippy::cast_possible_wrap)]
-pub const PR_TRUE: PRBool = prtypes::PR_TRUE as PRBool;
-
 enum NssLoaded {
     External,
     NoDb,

src/p11.rs

@@ -51,16 +51,13 @@ mod nss_p11 {
         clippy::restriction,
         reason = "For included bindgen code."
     )]
-    use crate::{
-        nss_prelude::*,
-        prtypes::{PRBool, PRInt32, PRUint32, PRUint8, PRUword},
-    };
+    use crate::nss_prelude::*;
     include!(concat!(env!("OUT_DIR"), "/nss_p11.rs"));
 }
 
 pub use nss_p11::*;
 
-use crate::{null_safe_slice, prtypes::PRBool};
+use crate::null_safe_slice;
 
 scoped_ptr!(Certificate, CERTCertificate, CERT_DestroyCertificate);
 scoped_ptr!(CertList, CERTCertList, CERT_DestroyCertList);