Browse Source

* Merging revisions 42867 from trunk:
------------------------------------------------------------------------
r42867 | michael | 2019-08-29 08:44:01 +0200 (Thu, 29 Aug 2019) | 1 line

Fix bug ID #36023, deprecate sslleay
------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42868 -

michael 5 years ago
parent
commit
7e962b39e2
2 changed files with 4 additions and 1 deletions
  1. 3 0
      packages/openssl/examples/test1.pas
  2. 1 1
      packages/openssl/src/openssl.pas

+ 3 - 0
packages/openssl/examples/test1.pas

@@ -16,5 +16,8 @@ begin
   Writeln('Load ',Bools[B],', missing functions: ');
   Writeln('Load ',Bools[B],', missing functions: ');
   if OpenSSL_unavailable_functions<>'' then
   if OpenSSL_unavailable_functions<>'' then
     Writeln(OpenSSL_unavailable_functions);
     Writeln(OpenSSL_unavailable_functions);
+  if b then
+    writeln('Version : ',OpenSSLGetVersion(0));
+
 end.
 end.
 
 

+ 1 - 1
packages/openssl/src/openssl.pas

@@ -1150,7 +1150,7 @@ var
   function EvpPkeyAssign(pkey: PEVP_PKEY; _type: cInt; key: Prsa): cInt;
   function EvpPkeyAssign(pkey: PEVP_PKEY; _type: cInt; key: Prsa): cInt;
   function EvpGetDigestByName(Name: String): PEVP_MD;
   function EvpGetDigestByName(Name: String): PEVP_MD;
   procedure EVPcleanup;
   procedure EVPcleanup;
-  function SSLeayversion(t: cInt): string;
+  function SSLeayversion(t: cInt): string;  deprecated 'For 1.1+ use OpenSSL_version';
   procedure ErrErrorString(e: cInt; var buf: string; len: cInt);
   procedure ErrErrorString(e: cInt; var buf: string; len: cInt);
   function ErrGetError: cInt;
   function ErrGetError: cInt;
   procedure ErrClearError;
   procedure ErrClearError;