Ensure SSL_get_error works for accept-state SSLs

Author: ctz

src/lib.rs

@@ -1510,27 +1510,26 @@ impl Ssl {
     }
 
     fn get_error(&mut self) -> c_int {
-        match self.conn_mut() {
-            Some(conn) => {
-                if let Err(e) = conn.process_new_packets() {
-                    error::Error::from_rustls(e).raise();
-                    return SSL_ERROR_SSL;
-                }
-
-                let want = self.want();
+        // protocol errors take precedence
+        if let Some(conn) = self.conn_mut() {
+            if let Err(e) = conn.process_new_packets() {
+                error::Error::from_rustls(e).raise();
+                return SSL_ERROR_SSL;
+            }
+        }
 
-                if let Some(bio) = self.bio.as_ref() {
-                    if want.write && bio.write_would_block() {
-                        return SSL_ERROR_WANT_WRITE;
-                    } else if want.read && bio.read_would_block() {
-                        return SSL_ERROR_WANT_READ;
-                    }
-                }
+        // io errors remain
+        let want = self.want();
 
-                SSL_ERROR_NONE
+        if let Some(bio) = self.bio.as_ref() {
+            if want.write && bio.write_would_block() {
+                return SSL_ERROR_WANT_WRITE;
+            } else if want.read && bio.read_would_block() {
+                return SSL_ERROR_WANT_READ;
             }
-            None => SSL_ERROR_SSL,
         }
+
+        SSL_ERROR_NONE
     }
 
     fn load_verify_certs(ctx: &SslContext) -> Result<OwnedX509Store, error::Error> {