Merge pull request #2120 from alex/improve-error-handling

fixes #2119 -- use ErrorStack abstraction in X.509 error handling
sfackler · Dec 6, 2023 · a3d3449 · a3d3449
2 parents c428588 + 3b38923
commit a3d3449
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
@@ -383,11 +383,6 @@ foreign_type_and_impl_send_sync! {
     pub struct X509Ref;
 }
 
-#[cfg(boringssl)]
-type X509LenTy = c_uint;
-#[cfg(not(boringssl))]
-type X509LenTy = c_int;
-
 impl X509Ref {
     /// Returns this certificate's subject name.
     #[corresponds(X509_get_subject_name)]
@@ -760,15 +755,16 @@ impl X509 {
                 let r =
                     ffi::PEM_read_bio_X509(bio.as_ptr(), ptr::null_mut(), None, ptr::null_mut());
                 if r.is_null() {
-                    let err = ffi::ERR_peek_last_error();
-                    if ffi::ERR_GET_LIB(err) as X509LenTy == ffi::ERR_LIB_PEM
-                        && ffi::ERR_GET_REASON(err) == ffi::PEM_R_NO_START_LINE
+                    let e = ErrorStack::get();
+                    let errors = e.errors();
+                    if !errors.is_empty()
+                        && errors[0].library_code() == ffi::ERR_LIB_PEM as libc::c_int
+                        && errors[0].reason_code() == ffi::PEM_R_NO_START_LINE as libc::c_int
                     {
-                        ffi::ERR_clear_error();
                         break;
                     }
 
-                    return Err(ErrorStack::get());
+                    return Err(e);
                 } else {
                     certs.push(X509(r));
                 }