Updated Test Programs

Author: MWASoftware

Test/openssl-client/TestClient.pas

@@ -29,10 +29,10 @@ interface
 
 uses
   Classes, SysUtils, {$IFDEF FPC}CustApp,{$ENDIF}IdIOHandler, IdHTTP,
-  IdSSL, IdSSLOpenSSL;
+  IdSSL, IdSSLOpenSSL, IdSSLOpenSSLX509;
 
 const
-  remoteSource = 'https://www.mwasoftware.co.uk/openssltest.txt';
+  remoteSource = 'https://test.mwasoftware.co.uk/openssltest.txt';
   sGetException = 'Error: Status = %d returned when GETting %s';
   rcAccept = 'Application/txt';
   {$if not declared(DirectorySeparator)}
@@ -82,6 +82,7 @@   TBasicHttpsClient = class(TCustomApplication)
     function CertificateType(Certificate: TIdX509): string;
     function ClientVerifyPeer(Certificate: TIdX509; AOk: Boolean; ADepth, AError: Integer): Boolean;
     procedure ShowCertificate(Certificate : TIdX509);
+    procedure HandleStatusInfo(const AMsg: String);
   protected
     procedure DoRun; override;
   public
@@ -102,7 +103,7 @@    TResponseTextBuffer = class(TMemoryStream)
 
 implementation
 
-uses IdSSLOpenSSLAPI;
+uses IdSSLOpenSSLAPI, IdSSLOpenSSLOptions, IdSSLOpenSSLSocket;
 
 {$IFDEF LOCAL_TCUSTOMAPP}
 function TCustomApplication.Exename: string;
@@ -207,6 +208,7 @@ function TBasicHttpsClient.GetSSLHandler(AOwner: TComponent): TIdIOHandler;
   else
     IOHandler.SSLOptions.VerifyMode := [];
   IOHandler.OnVerifyPeer := ClientVerifyPeer;
+  IOHandler.OnStatusInfo := HandleStatusInfo;
   FSSLHandler := IOHandler;
   Result := IOHandler;
 end;
@@ -286,6 +288,11 @@ procedure TBasicHttpsClient.ShowCertificate(Certificate : TIdX509);
   writeln;
 end;
 
+procedure TBasicHttpsClient.HandleStatusInfo(const AMsg: String);
+begin
+  writeln('Status Info: ',AMsg);
+end;
+
 procedure TBasicHttpsClient.DoRun;
 
 var i: integer;

Test/openssl-server/testserver.pas

@@ -23,7 +23,8 @@ interface
 uses
   Classes, SysUtils, {$IFDEF FPC}CustApp,{$ENDIF}IdIOHandler, IdHTTP,
   IdSSL, IdSSLOpenSSL,  IdHeaderList, IdContext,
-  IdCustomHTTPServer, IdHTTPServer, IdServerIOHandler, IdGlobal;
+  IdCustomHTTPServer, IdHTTPServer, IdServerIOHandler, IdGlobal,
+  IdSSLOpenSSLX509;
 
 const
   SSLServerPort = 8080;
@@ -77,6 +78,7 @@   TOpenSSLServerTest = class(TCustomApplication)
     function IsDirectoryEmpty(Path: string): boolean;
     procedure HandleCommandGet(AContext: TIdContext;
       ARequestInfo: TIdHTTPRequestInfo; AResponseInfo: TIdHTTPResponseInfo);
+    procedure HandleStatusInfo(const AMsg: String);
     procedure GetMyPassword(var Password: String);
     procedure QuerySSLPort(APort: TIdPort; var VUseSSL: Boolean);
     function CertificateType(Certificate: TIdX509): string;
@@ -103,7 +105,7 @@    TResponseTextBuffer = class(TMemoryStream)
 
 implementation
 
-uses IdSSLOpenSSLAPI;
+uses IdSSLOpenSSLAPI, IdSSLOpenSSLOptions;
 
 {$IFDEF LOCAL_TCUSTOMAPP}
 function TCustomApplication.Exename: string;
@@ -217,9 +219,12 @@ function TOpenSSLServerTest.GetSSLServerHandler(AOwner : TComponent
   IOHandler.SSLOptions.RootCertFile := MyRootCertFile;
   IOHandler.SSLOptions.CertFile := MyCertFile;
   IOHandler.SSLOptions.KeyFile := MyKeyFile;
+  {$IFDEF LEGACY_VERSION}
   IOHandler.SSLOptions.Method := sslvTLSv1_2;
+  {$ENDIF}
   IOHandler.OnGetPassword := GetMyPassword;
   IOHandler.OnVerifyPeer := ServerVerifyPeer;
+  IOHandler.OnStatusInfo := HandleStatusInfo;
   if FClientVerification then
   begin
     IOHandler.SSLOptions.VerifyMode := [sslvrfPeer,sslvrfFailIfNoPeerCert];
@@ -257,6 +262,11 @@ procedure TOpenSSLServerTest.HandleCommandGet(AContext: TIdContext;
   AResponseInfo.ContentStream.Position := 0;
 end;
 
+procedure TOpenSSLServerTest.HandleStatusInfo(const AMsg: String);
+begin
+  writeln('Server Status Info: ',AMsg);
+end;
+
 procedure TOpenSSLServerTest.GetMyPassword(var Password : String);
 begin
   Password := myPassword;
@@ -326,8 +336,6 @@ procedure TOpenSSLServerTest.DoRun;
       writeln('LibCrypto: ',GetIOpenSSLDDL.GetLibCryptoFilePath);
       writeln('LibSSL: ',GetIOpenSSLDDL.GetLibSSLFilePath);
     end;
-    if not LoadOpenSSLLibrary then
-      raise Exception.Create('OpenSSL Library Failed to load');
 
     if GetIOpenSSLDDL <> nil then
     with GetIOpenSSLDDL.GetFailedToLoadList do