Return X500Principal from getPeerPrincipal() and getLocalPrincipal()

Author: JeremiahM37

src/java/com/wolfssl/provider/jsse/WolfSSLEngine.java

@@ -321,8 +321,7 @@ protected synchronized void cacheRequestedServerNamesFromNetData() {
         List<SNIServerName> names;
         WolfSSLImplementSSLSession session;
 
-        if (this.engineHelper == null ||
-            this.engineHelper.getUseClientMode()) {
+        if (this.engineHelper == null || this.engineHelper.getUseClientMode()) {
             return;
         }
 

src/java/com/wolfssl/provider/jsse/WolfSSLImplementSSLSession.java

@@ -673,12 +673,11 @@ public Certificate[] getLocalCertificates() {
     public synchronized Principal getPeerPrincipal()
         throws SSLPeerUnverifiedException {
 
-        /* Use standard Java X509Certificate.getSubjectDN()
-         * for X500Name equals() compatibility */
+        /* Return X500Principal for proper equals() symmetry */
         Certificate[] certs = getPeerCertificates();
         if (certs != null && certs.length > 0 &&
             certs[0] instanceof X509Certificate) {
-            return ((X509Certificate) certs[0]).getSubjectDN();
+            return ((X509Certificate) certs[0]).getSubjectX500Principal();
         }
         throw new SSLPeerUnverifiedException("No peer certificate");
     }
@@ -699,7 +698,7 @@ public Principal getLocalPrincipal() {
         if (certs.length > 0){
             /* When chain of certificates exceeds one,
              * the user certifcate is the first */
-            localPrincipal = certs[0].getSubjectDN();
+            localPrincipal = certs[0].getSubjectX500Principal();
         }
 
         /* free native resources earlier than garbage collection if
@@ -1137,8 +1136,7 @@ public synchronized List<SNIServerName> getRequestedServerNames()
         byte[] sniRequestArr = null;
 
         if (this.ssl == null) {
-            if (this.sniServerNames != null &&
-                !this.sniServerNames.isEmpty()) {
+            if (this.sniServerNames != null && !this.sniServerNames.isEmpty()) {
                 return Collections.unmodifiableList(
                     new ArrayList<SNIServerName>(this.sniServerNames));
             }

src/java/com/wolfssl/provider/jsse/WolfSSLInternalVerifyCb.java

@@ -310,8 +310,7 @@ else if (sock != null) {
             }
         } catch (Exception e) {
             WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
-                () -> "Hostname verification error: " +
-                e.getMessage());
+                () -> "Hostname verification error: " + e.getMessage());
             this.verifyException = e;
             return 0;
         } finally {

src/test/com/wolfssl/provider/jsse/test/WolfSSLEngineTest.java

@@ -2843,8 +2843,7 @@ public void testBufferUnderflowPartialRecord()
         partialBuf.flip();
 
         ByteBuffer outBuf = ByteBuffer.allocate(
-            server.getSession()
-                .getApplicationBufferSize());
+            server.getSession().getApplicationBufferSize());
 
         /* Unwrap partial record: BUFFER_UNDERFLOW expected */
         result = server.unwrap(partialBuf, outBuf);

src/test/com/wolfssl/provider/jsse/test/WolfSSLTestFactory.java

@@ -870,8 +870,7 @@ public int CloseConnection(SSLEngine server, SSLEngine client,
         if (!s.toString().equals("NEED_WRAP") ||
                 !result.getStatus().name().equals("CLOSED") ) {
             throw new SSLException(
-                "Bad status: HS=" + s +
-                " status=" + result.getStatus());
+                "Bad status: HS=" + s + " status=" + result.getStatus());
         }
 
         /* server wraps its own close_notify */