* 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

@@ -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;