From 0fc1640e1dd7d11340a27902deb88be1c0128375 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Sat, 1 May 2021 08:53:18 +0000
Subject: [PATCH] * Merging revisions r49156 from trunk:    
 ------------------------------------------------------------------------    
 r49156 | michael | 2021-04-10 08:08:39 +0200 (Sat, 10 Apr 2021) | 1 line

    * Fix getpeername, patch by BaldZhang for issue ID #38677
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@49303 -
---
 packages/openssl/src/fpopenssl.pp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/openssl/src/fpopenssl.pp b/packages/openssl/src/fpopenssl.pp
index 0660aeaff3..a5cbe4499c 100644
--- a/packages/openssl/src/fpopenssl.pp
+++ b/packages/openssl/src/fpopenssl.pp
@@ -657,14 +657,16 @@ var
 begin
   Result:='';
   S:=PeerSubject;
-  P:=Pos(S,'/CN=');
+  P:=Pos('/CN=', S);
   if (P>0) then
     begin
     Delete(S,1,P+3);
     P:=Pos('/',S);
     if (P>0) then
-      Result:=Copy(S,1,P-1);
-    end;
+      Result:=Copy(S,1,P-1)
+    else
+      Result := S;
+    end
 end;
 
 function TSSL.PeerNameHash: cardinal;