paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 14:29:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch from RDA to add S/MIME functions. Fix issue #39839

Browse Source 
(cherry picked from commit 7930b31da7)
This commit is contained in:
Michaël Van Canneyt 2022-07-20 08:52:47 +02:00 committed by marcoonthegit
parent 81fd514fc8
commit 85b617b27f
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/openssl/src/openssl.pas
View File

@ -150,6 +150,7 @@ type
PEVP_MD = SslPtr; PEVP_MD = SslPtr;
PBIO_METHOD = SslPtr; PBIO_METHOD = SslPtr;
PBIO = SslPtr; PBIO = SslPtr;
PPBIO = PSslPtr;
{ EVP_PKEY = SslPtr;} { EVP_PKEY = SslPtr;}
PRSA = SslPtr; PRSA = SslPtr;
PASN1_UTCTIME = SslPtr; PASN1_UTCTIME = SslPtr;
@ -1424,6 +1425,10 @@ var
function BIO_new_PKCS7(_out:PBIO; p7:PPKCS7):PBIO; function BIO_new_PKCS7(_out:PBIO; p7:PPKCS7):PBIO;
procedure ERR_load_PKCS7_strings; procedure ERR_load_PKCS7_strings;
// SMIME functions
function SMIME_write_PKCS7(_out: PBIO; p7: PPKCS7; data: PBIO; flags: longint): longint;
function SMIME_read_PKCS7(_in: PBIO; bcont: PPBIO): PPKCS7;
// BN functions // BN functions
function BN_new:PBIGNUM; function BN_new:PBIGNUM;
function BN_secure_new:PBIGNUM; function BN_secure_new:PBIGNUM;
@ -2139,7 +2144,9 @@ var
_PKCS7_add1_attrib_digest : function(si:PPKCS7_SIGNER_INFO; md:Pbyte; mdlen:longint):longint;cdecl; _PKCS7_add1_attrib_digest : function(si:PPKCS7_SIGNER_INFO; md:Pbyte; mdlen:longint):longint;cdecl;
_BIO_new_PKCS7 : function(_out:PBIO; p7:PPKCS7):PBIO;cdecl; _BIO_new_PKCS7 : function(_out:PBIO; p7:PPKCS7):PBIO;cdecl;
_ERR_load_PKCS7_strings : procedure;cdecl; _ERR_load_PKCS7_strings : procedure;cdecl;
// SMIME
_SMIME_write_PKCS7: function(_out: PBIO; p7: PPKCS7; data: PBIO; flags: longint): longint; cdecl;
_SMIME_read_PKCS7: function(_in: PBIO; bcont: PPBIO): PPKCS7; cdecl;
// BN // BN
_BN_new : function():PBIGNUM; cdecl; _BN_new : function():PBIGNUM; cdecl;
_BN_secure_new : function():PBIGNUM; cdecl; _BN_secure_new : function():PBIGNUM; cdecl;
@ -4493,6 +4500,23 @@ begin
_ERR_load_PKCS7_strings _ERR_load_PKCS7_strings
end; end;
// SMIME
function SMIME_write_PKCS7(_out: PBIO; p7: PPKCS7; data: PBIO; flags: longint): longint;
begin
if InitSSLInterface and Assigned(_SMIME_write_PKCS7) then
Result := _SMIME_write_PKCS7(_out, p7, data, flags)
else
Result := -1;
end;
function SMIME_read_PKCS7(_in: PBIO; bcont: PPBIO): PPKCS7;
begin
if InitSSLInterface and Assigned(_SMIME_read_PKCS7) then
Result := _SMIME_read_PKCS7(_in, bcont)
else
Result := nil;
end;
// BN // BN
function BN_new: PBIGNUM; function BN_new: PBIGNUM;
@ -5207,7 +5231,9 @@ begin
_PKCS7_add1_attrib_digest:=GetProcAddr(SSLUtilHandle,'PKCS7_add1_attrib_digest'); _PKCS7_add1_attrib_digest:=GetProcAddr(SSLUtilHandle,'PKCS7_add1_attrib_digest');
_BIO_new_PKCS7:=GetProcAddr(SSLUtilHandle,'BIO_new_PKCS7'); _BIO_new_PKCS7:=GetProcAddr(SSLUtilHandle,'BIO_new_PKCS7');
_ERR_load_PKCS7_strings:=GetProcAddr(SSLUtilHandle,'ERR_load_PKCS7_strings'); _ERR_load_PKCS7_strings:=GetProcAddr(SSLUtilHandle,'ERR_load_PKCS7_strings');
// SMIME
_SMIME_write_PKCS7 := GetProcAddr(SSLUtilHandle, 'SMIME_write_PKCS7');
_SMIME_read_PKCS7 := GetProcAddr(SSLUtilHandle, 'SMIME_read_PKCS7');
// BN // BN
_BN_new:=GetProcAddr(SSLUtilHandle,'BN_new'); _BN_new:=GetProcAddr(SSLUtilHandle,'BN_new');
_BN_secure_new:=GetProcAddr(SSLUtilHandle,'BN_secure_new'); _BN_secure_new:=GetProcAddr(SSLUtilHandle,'BN_secure_new');
@ -5365,7 +5391,9 @@ begin
_PKCS7_add1_attrib_digest:=nil; _PKCS7_add1_attrib_digest:=nil;
_BIO_new_PKCS7:=nil; _BIO_new_PKCS7:=nil;
_ERR_load_PKCS7_strings:=nil; _ERR_load_PKCS7_strings:=nil;
// SMIME
_SMIME_write_PKCS7 := nil;
_SMIME_read_PKCS7 := nil;
// BN // BN
_BN_new:=nil; _BN_new:=nil;
_BN_secure_new:=nil; _BN_secure_new:=nil;