mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-14 02:49:17 +02:00
Fixed compilation after r40846
git-svn-id: trunk@40847 -
This commit is contained in:
marcus
parent
c54d380f39
commit
7421d9301d
@ -134,7 +134,7 @@ type
|
||||
PSSL_METHOD = SslPtr;
|
||||
{ PX509 = SslPtr;}
|
||||
{ PX509_NAME = SslPtr;}
|
||||
PEVP_MD = SslPtr;
|
||||
PEVP_MD = SslPtr;
|
||||
PBIO_METHOD = SslPtr;
|
||||
PBIO = SslPtr;
|
||||
{ EVP_PKEY = SslPtr;}
|
||||
@ -155,16 +155,16 @@ type
|
||||
PDN = ^X509_NAME;
|
||||
|
||||
ASN1_STRING = record
|
||||
length: integer;
|
||||
asn1_type: integer;
|
||||
data: pointer;
|
||||
flags: longint;
|
||||
length: integer;
|
||||
asn1_type: integer;
|
||||
data: pointer;
|
||||
flags: longint;
|
||||
end;
|
||||
PASN1_STRING = ^ASN1_STRING;
|
||||
PASN1_TIME = PASN1_STRING;
|
||||
|
||||
X509_VAL = record
|
||||
notBefore: PASN1_TIME;
|
||||
notBefore: PASN1_TIME;
|
||||
notAfter: PASN1_TIME;
|
||||
end;
|
||||
PX509_VAL = ^X509_VAL;
|
||||
@ -210,24 +210,24 @@ type
|
||||
PPX509 = ^PX509;
|
||||
|
||||
DSA = record
|
||||
pad: integer;
|
||||
version: integer;
|
||||
write_params: integer;
|
||||
p: pointer;
|
||||
q: pointer;
|
||||
g: pointer;
|
||||
pub_key: pointer;
|
||||
priv_key: pointer;
|
||||
kinv: pointer;
|
||||
r: pointer;
|
||||
flags: integer;
|
||||
method_mont_p: PChar;
|
||||
references: integer;
|
||||
ex_data: record
|
||||
pad: integer;
|
||||
version: integer;
|
||||
write_params: integer;
|
||||
p: pointer;
|
||||
q: pointer;
|
||||
g: pointer;
|
||||
pub_key: pointer;
|
||||
priv_key: pointer;
|
||||
kinv: pointer;
|
||||
r: pointer;
|
||||
flags: integer;
|
||||
method_mont_p: PChar;
|
||||
references: integer;
|
||||
ex_data: record
|
||||
sk: pointer;
|
||||
dummy: integer;
|
||||
end;
|
||||
meth: pointer;
|
||||
meth: pointer;
|
||||
end;
|
||||
pDSA = ^DSA;
|
||||
|
||||
@ -403,14 +403,14 @@ type
|
||||
key_len: cint; //* Default value for variable length ciphers */
|
||||
iv_len: cint;
|
||||
flags: culong; //* Various flags */
|
||||
init: EVP_CIPHER_INIT_FUNC; //* init key */
|
||||
init: EVP_CIPHER_INIT_FUNC; //* init key */
|
||||
do_cipher: EVP_CIPHER_DO_CIPHER_FUNC;//* encrypt/decrypt data */
|
||||
cleanup: EVP_CIPHER_CLEANUP_FUNC; //* cleanup ctx */
|
||||
ctx_size: cint; //* how big ctx->cipher_data needs to be */
|
||||
ctx_size: cint; //* how big ctx->cipher_data needs to be */
|
||||
set_asn1_parameters: EVP_CIPHER_SET_ASN1_PARAMETERS_FUNC; //* Populate a ASN1_TYPE with parameters */
|
||||
get_asn1_parameters: EVP_CIPHER_GET_ASN1_PARAMETERS_FUNC; //* Get parameters from a ASN1_TYPE */
|
||||
ctrl: EVP_CIPHER_CTRL_FUNC; //* Miscellaneous operations */
|
||||
app_data: Pointer; //* Application data */
|
||||
app_data: Pointer; //* Application data */
|
||||
end;
|
||||
PEVP_CIPHER = ^EVP_CIPHER;
|
||||
|
||||
@ -427,7 +427,7 @@ type
|
||||
|
||||
app_data: Pointer; //* application stuff */
|
||||
key_len: cint; //* May change for variable length cipher */
|
||||
flags: culong; //* Various flags */
|
||||
flags: culong; //* Various flags */
|
||||
cipher_data: Pointer; //* per EVP data */
|
||||
final_used: cint;
|
||||
block_mask: cint;
|
||||
@ -685,12 +685,12 @@ const
|
||||
SSL_CTRL_SET_CHANNEL_ID = 119;
|
||||
|
||||
|
||||
DTLS_CTRL_GET_TIMEOUT = 73;
|
||||
DTLS_CTRL_GET_TIMEOUT = 73;
|
||||
DTLS_CTRL_HANDLE_TIMEOUT = 74;
|
||||
DTLS_CTRL_LISTEN = 75;
|
||||
SSL_CTRL_GET_RI_SUPPORT = 76;
|
||||
SSL_CTRL_CLEAR_OPTIONS = 77;
|
||||
SSL_CTRL_CLEAR_MODE = 78;
|
||||
DTLS_CTRL_LISTEN = 75;
|
||||
SSL_CTRL_GET_RI_SUPPORT = 76;
|
||||
SSL_CTRL_CLEAR_OPTIONS = 77;
|
||||
SSL_CTRL_CLEAR_MODE = 78;
|
||||
|
||||
TLSEXT_TYPE_server_name = 0;
|
||||
TLSEXT_TYPE_max_fragment_length = 1;
|
||||
@ -788,7 +788,7 @@ const
|
||||
OPENSSL_DES_DECRYPT = 0;
|
||||
OPENSSL_DES_ENCRYPT = 1;
|
||||
|
||||
X509_V_OK = 0;
|
||||
X509_V_OK = 0;
|
||||
X509_V_ILLEGAL = 1;
|
||||
X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT = 2;
|
||||
X509_V_ERR_UNABLE_TO_GET_CRL = 3;
|
||||
@ -827,7 +827,7 @@ const
|
||||
//The application is not happy
|
||||
X509_V_ERR_APPLICATION_VERIFICATION = 50;
|
||||
|
||||
SSL_FILETYPE_ASN1 = 2;
|
||||
SSL_FILETYPE_ASN1 = 2;
|
||||
SSL_FILETYPE_PEM = 1;
|
||||
EVP_PKEY_RSA = 6;
|
||||
|
||||
@ -891,73 +891,73 @@ const
|
||||
|
||||
// BIO
|
||||
|
||||
BIO_NOCLOSE = $00;
|
||||
BIO_CLOSE = $01;
|
||||
BIO_NOCLOSE = $00;
|
||||
BIO_CLOSE = $01;
|
||||
|
||||
//* modifiers */
|
||||
BIO_FP_READ = $02;
|
||||
BIO_FP_WRITE = $04;
|
||||
BIO_FP_APPEND = $08;
|
||||
BIO_FP_TEXT = $10;
|
||||
BIO_FP_READ = $02;
|
||||
BIO_FP_WRITE = $04;
|
||||
BIO_FP_APPEND = $08;
|
||||
BIO_FP_TEXT = $10;
|
||||
|
||||
BIO_C_SET_CONNECT = 100;
|
||||
BIO_C_DO_STATE_MACHINE = 101;
|
||||
BIO_C_SET_NBIO = 102;
|
||||
BIO_C_SET_PROXY_PARAM = 103;
|
||||
BIO_C_SET_FD = 104;
|
||||
BIO_C_GET_FD = 105;
|
||||
BIO_C_SET_FILE_PTR = 106;
|
||||
BIO_C_GET_FILE_PTR = 107;
|
||||
BIO_C_SET_FILENAME = 108;
|
||||
BIO_C_SET_SSL = 109;
|
||||
BIO_C_GET_SSL = 110;
|
||||
BIO_C_SET_MD = 111;
|
||||
BIO_C_GET_MD = 112;
|
||||
BIO_C_SET_NBIO = 102;
|
||||
BIO_C_SET_PROXY_PARAM = 103;
|
||||
BIO_C_SET_FD = 104;
|
||||
BIO_C_GET_FD = 105;
|
||||
BIO_C_SET_FILE_PTR = 106;
|
||||
BIO_C_GET_FILE_PTR = 107;
|
||||
BIO_C_SET_FILENAME = 108;
|
||||
BIO_C_SET_SSL = 109;
|
||||
BIO_C_GET_SSL = 110;
|
||||
BIO_C_SET_MD = 111;
|
||||
BIO_C_GET_MD = 112;
|
||||
BIO_C_GET_CIPHER_STATUS = 113;
|
||||
BIO_C_SET_BUF_MEM = 114;
|
||||
BIO_C_GET_BUF_MEM_PTR = 115;
|
||||
BIO_C_SET_BUF_MEM = 114;
|
||||
BIO_C_GET_BUF_MEM_PTR = 115;
|
||||
BIO_C_GET_BUFF_NUM_LINES = 116;
|
||||
BIO_C_SET_BUFF_SIZE = 117;
|
||||
BIO_C_SET_ACCEPT = 118;
|
||||
BIO_C_SSL_MODE = 119;
|
||||
BIO_C_GET_MD_CTX = 120;
|
||||
BIO_C_GET_PROXY_PARAM = 121;
|
||||
BIO_C_SET_BUFF_READ_DATA = 122; // data to read first */
|
||||
BIO_C_GET_CONNECT = 123;
|
||||
BIO_C_GET_ACCEPT = 124;
|
||||
BIO_C_SET_BUFF_SIZE = 117;
|
||||
BIO_C_SET_ACCEPT = 118;
|
||||
BIO_C_SSL_MODE = 119;
|
||||
BIO_C_GET_MD_CTX = 120;
|
||||
BIO_C_GET_PROXY_PARAM = 121;
|
||||
BIO_C_SET_BUFF_READ_DATA = 122; // data to read first */
|
||||
BIO_C_GET_CONNECT = 123;
|
||||
BIO_C_GET_ACCEPT = 124;
|
||||
BIO_C_SET_SSL_RENEGOTIATE_BYTES = 125;
|
||||
BIO_C_GET_SSL_NUM_RENEGOTIATES = 126;
|
||||
BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT = 127;
|
||||
BIO_C_FILE_SEEK = 128;
|
||||
BIO_C_GET_CIPHER_CTX = 129;
|
||||
BIO_C_SET_BUF_MEM_EOF_RETURN = 130;//*return end of input value*/
|
||||
BIO_C_SET_BIND_MODE = 131;
|
||||
BIO_C_GET_BIND_MODE = 132;
|
||||
BIO_C_FILE_TELL = 133;
|
||||
BIO_C_GET_SOCKS = 134;
|
||||
BIO_C_SET_SOCKS = 135;
|
||||
BIO_C_FILE_SEEK = 128;
|
||||
BIO_C_GET_CIPHER_CTX = 129;
|
||||
BIO_C_SET_BUF_MEM_EOF_RETURN = 130;//*return end of input value*/
|
||||
BIO_C_SET_BIND_MODE = 131;
|
||||
BIO_C_GET_BIND_MODE = 132;
|
||||
BIO_C_FILE_TELL = 133;
|
||||
BIO_C_GET_SOCKS = 134;
|
||||
BIO_C_SET_SOCKS = 135;
|
||||
|
||||
BIO_C_SET_WRITE_BUF_SIZE = 136;//* for BIO_s_bio */
|
||||
BIO_C_GET_WRITE_BUF_SIZE = 137;
|
||||
BIO_C_MAKE_BIO_PAIR = 138;
|
||||
BIO_C_DESTROY_BIO_PAIR = 139;
|
||||
BIO_C_GET_WRITE_GUARANTEE = 140;
|
||||
BIO_C_GET_READ_REQUEST = 141;
|
||||
BIO_C_SHUTDOWN_WR = 142;
|
||||
BIO_C_NREAD0 = 143;
|
||||
BIO_C_NREAD = 144;
|
||||
BIO_C_NWRITE0 = 145;
|
||||
BIO_C_NWRITE = 146;
|
||||
BIO_C_RESET_READ_REQUEST = 147;
|
||||
BIO_C_SET_MD_CTX = 148;
|
||||
BIO_C_SET_WRITE_BUF_SIZE = 136;//* for BIO_s_bio */
|
||||
BIO_C_GET_WRITE_BUF_SIZE = 137;
|
||||
BIO_C_MAKE_BIO_PAIR = 138;
|
||||
BIO_C_DESTROY_BIO_PAIR = 139;
|
||||
BIO_C_GET_WRITE_GUARANTEE = 140;
|
||||
BIO_C_GET_READ_REQUEST = 141;
|
||||
BIO_C_SHUTDOWN_WR = 142;
|
||||
BIO_C_NREAD0 = 143;
|
||||
BIO_C_NREAD = 144;
|
||||
BIO_C_NWRITE0 = 145;
|
||||
BIO_C_NWRITE = 146;
|
||||
BIO_C_RESET_READ_REQUEST = 147;
|
||||
BIO_C_SET_MD_CTX = 148;
|
||||
|
||||
BIO_C_SET_PREFIX = 149;
|
||||
BIO_C_GET_PREFIX = 150;
|
||||
BIO_C_SET_SUFFIX = 151;
|
||||
BIO_C_GET_SUFFIX = 152;
|
||||
BIO_C_SET_PREFIX = 149;
|
||||
BIO_C_GET_PREFIX = 150;
|
||||
BIO_C_SET_SUFFIX = 151;
|
||||
BIO_C_GET_SUFFIX = 152;
|
||||
|
||||
BIO_C_SET_EX_ARG = 153;
|
||||
BIO_C_GET_EX_ARG = 154;
|
||||
BIO_C_SET_EX_ARG = 153;
|
||||
BIO_C_GET_EX_ARG = 154;
|
||||
|
||||
BIO_CTRL_RESET = 1 ; { opt - rewind/zero etc }
|
||||
BIO_CTRL_EOF = 2 ; { opt - are we at the eof }
|
||||
@ -1368,7 +1368,7 @@ var
|
||||
// BN functions
|
||||
function BN_new:PBIGNUM;
|
||||
function BN_secure_new:PBIGNUM;
|
||||
procedure BN_clear_free(a:PBIGNUM);l
|
||||
procedure BN_clear_free(a:PBIGNUM);
|
||||
function BN_copy(a:PBIGNUM; b:PBIGNUM):PBIGNUM;
|
||||
procedure BN_swap(a:PBIGNUM; b:PBIGNUM);
|
||||
function BN_bin2bn(s:pcuchar; len:cint; ret:PBIGNUM):PBIGNUM;
|
||||
@ -1857,7 +1857,7 @@ var
|
||||
|
||||
// 3DES functions
|
||||
_DESsetoddparity: TDESsetoddparity = nil;
|
||||
_DESsetkey : TDESsetkey = nil;
|
||||
_DESsetkey : TDESsetkey = nil;
|
||||
_DESsetkeychecked: TDESsetkeychecked = nil;
|
||||
_DESecbencrypt: TDESecbencrypt = nil;
|
||||
//thread lock functions
|
||||
@ -2035,7 +2035,7 @@ var
|
||||
_PKCS7_get_attribute : function(si:PPKCS7_SIGNER_INFO; nid:longint):PASN1_TYPE;cdecl;
|
||||
_PKCS7_get_signed_attribute : function(si:PPKCS7_SIGNER_INFO; nid:longint):PASN1_TYPE;cdecl;
|
||||
_PKCS7_set_signed_attributes : function(p7si:PPKCS7_SIGNER_INFO; sk:Pstack_st_X509_ATTRIBUTE):longint;cdecl;
|
||||
_PKCS7_set_attributes : function(p7si:PPKCS7_SIGNlER_INFO; sk:Pstack_st_X509_ATTRIBUTE):longint;cdecl;
|
||||
_PKCS7_set_attributes : function(p7si:PPKCS7_SIGNER_INFO; sk:Pstack_st_X509_ATTRIBUTE):longint;cdecl;
|
||||
_PKCS7_sign : function(signcert:PX509; pkey:PEVP_PKEY; certs:Pstack_st_X509; data:PBIO; flags:longint):PPKCS7;cdecl;
|
||||
_PKCS7_sign_add_signer : function(p7:PPKCS7; signcert:PX509; pkey:PEVP_PKEY; md:PEVP_MD; flags:longint):PPKCS7_SIGNER_INFO;cdecl;
|
||||
_PKCS7_final : function(p7:PPKCS7; data:PBIO; flags:longint):longint;cdecl;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user