diff --git a/library/x509parse.c b/library/x509parse.c
index 74671a0..0ec5e68 100644
--- a/library/x509parse.c
+++ b/library/x509parse.c
@@ -2329,6 +2329,10 @@
         pem_free( &pem );
         return( ret );
     }
+    else if( ret == POLARSSL_ERR_PEM_PASSWORD_MISMATCH )
+        return( POLARSSL_ERR_X509_PASSWORD_MISMATCH );
+    else if( ret == POLARSSL_ERR_PEM_PASSWORD_REQUIRED )
+        return( POLARSSL_ERR_X509_PASSWORD_REQUIRED );
     else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
         return( ret );