* PChar -> PAnsiChar

packages/gnutls/examples/httpget.pp

@@ -8,13 +8,13 @@ uses sysutils, ssockets, gnutls, uriparser;
 Const
   logLevel = 0; // Set to positive value to enable logging.
   // Correct this for your system.
-  DefaultCerts : PChar =  '/etc/ssl/certs/ca-certificates.crt';
+  DefaultCerts : PAnsiChar =  '/etc/ssl/certs/ca-certificates.crt';
 
   MAX_BUF = 1024*256;
   MSG = 'GET %s HTTP/1.0'#13#10'Host: %s'#13#10#13#10;
 
 
-Procedure MyLogFunc(level : longint; msg : PChar); cdecl;
+Procedure MyLogFunc(level : longint; msg : PAnsiChar); cdecl;
 begin
   writeln(StdErr,'Log[',Level:2,']: ',msg);
 end;
@@ -23,12 +23,12 @@ Var
   sock : TInetSocket;
   ret : integer;
   session : tgnutls_session_t;
-  buf : Array[0..MAX_BUF] of char;
+  buf : Array[0..MAX_BUF] of AnsiChar;
   cred : tgnutls_certificate_credentials_t;
-  errptr,desc : pchar;
+  errptr,desc : PAnsiChar;
   FN, URL,S, HostName : String;
   port : word;
-
+  A : AnsiString;
   uri : TURI;
 
 begin
@@ -95,15 +95,15 @@ begin
   Sock:=TINetSocket.Create(HostName,Port);
   gnutls_transport_set_int(session, Sock.Handle);
   gnutls_handshake_set_timeout(session,GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);
-
-  ret := gnutls_server_name_set(session, GNUTLS_NAME_DNS,pchar(HostName), length(HostName));
+  A:=HostName;
+  ret := gnutls_server_name_set(session, GNUTLS_NAME_DNS,PAnsiChar(A), length(A));
   if (ret <> GNUTLS_E_SUCCESS) then
     begin
     writeln(stderr, 'error: gnutls_server_name_set: ', gnutls_strerror(ret));
     halt(1);
     end;
   
-  gnutls_session_set_verify_cert(session,pchar(HostName),0);
+  gnutls_session_set_verify_cert(session,PAnsiChar(A),0);
   
   Repeat
     ret:=gnutls_handshake(session);
@@ -128,7 +128,8 @@ begin
     end;
   S:=Format(Msg,[FN,HostName]);
   Writeln(StdErr,'Sending request : ',S);
-  gnutls_record_send(session, Pchar(S), length(S));
+  A:=S;
+  gnutls_record_send(session, PAnsiChar(A), length(A));
   repeat
     ret := gnutls_record_recv(session, @buf, MAX_BUF);
     if (ret=0) then

packages/gnutls/src/gnutls.pp

@@ -1126,7 +1126,7 @@ Type
   Tgnutls_ext_parse_type_t =  Longint;
   tgnutls_certificate_verify_flags = Longint;
 
-  Tgnutls_pin_callback_t = function (userdata:pointer; attempt:longint; token_url:Pchar; token_label:Pchar; flags:dword; pin:Pchar; pin_max:Tsize_t):longint;cdecl;
+  Tgnutls_pin_callback_t = function (userdata:pointer; attempt:longint; token_url:PAnsiChar; token_label:PAnsiChar; flags:dword; pin:PAnsiChar; pin_max:Tsize_t):longint;cdecl;
   Tgnutls_supp_recv_func = function (session:Tgnutls_session_t; data:Pbyte; data_size:Tsize_t):longint;cdecl;
   Tgnutls_supp_send_func = function (session:Tgnutls_session_t; buf:Tgnutls_buffer_t):longint;cdecl;
   Tgnutls_ext_recv_func = function (session:Tgnutls_session_t; data:Pbyte; len:Tsize_t):longint;cdecl;
@@ -1134,9 +1134,9 @@ Type
   Tgnutls_ext_deinit_data_func = procedure (data:Tgnutls_ext_priv_data_t);cdecl;
   Tgnutls_ext_pack_func = function (data:Tgnutls_ext_priv_data_t; packed_data:Tgnutls_buffer_t):longint;cdecl;
   Tgnutls_ext_unpack_func = function (packed_data:Tgnutls_buffer_t; data:Pgnutls_ext_priv_data_t):longint;cdecl;
-  Tgnutls_tdb_store_func = function (db_name:Pchar; host:Pchar; service:Pchar; expiration:Ttime_t; pubkey:Pgnutls_datum_t):longint;cdecl;
-  Tgnutls_tdb_store_commitment_func = function (db_name:Pchar; host:Pchar; service:Pchar; expiration:Ttime_t; hash_algo:Tgnutls_digest_algorithm_t;  hash:Pgnutls_datum_t):longint;cdecl;
-  Tgnutls_tdb_verify_func = function (db_name:Pchar; host:Pchar; service:Pchar; pubkey:Pgnutls_datum_t):longint;cdecl;
+  Tgnutls_tdb_store_func = function (db_name:PAnsiChar; host:PAnsiChar; service:PAnsiChar; expiration:Ttime_t; pubkey:Pgnutls_datum_t):longint;cdecl;
+  Tgnutls_tdb_store_commitment_func = function (db_name:PAnsiChar; host:PAnsiChar; service:PAnsiChar; expiration:Ttime_t; hash_algo:Tgnutls_digest_algorithm_t;  hash:Pgnutls_datum_t):longint;cdecl;
+  Tgnutls_tdb_verify_func = function (db_name:PAnsiChar; host:PAnsiChar; service:PAnsiChar; pubkey:Pgnutls_datum_t):longint;cdecl;
   Tgnutls_pull_func = function (para1:Tgnutls_transport_ptr_t; para2:pointer; para3:Tsize_t):Tssize_t;cdecl;
   Tgnutls_push_func = function (para1:Tgnutls_transport_ptr_t; para2:pointer; para3:Tsize_t):Tssize_t;cdecl;
   Tgnutls_pull_timeout_func = function (para1:Tgnutls_transport_ptr_t; ms:dword):longint;cdecl;
@@ -1152,16 +1152,16 @@ Type
   Tgnutls_is_secure_function = function (para1:pointer):longint;cdecl;
   Tgnutls_free_function = procedure (para1:pointer);cdecl;
   Tgnutls_realloc_function = function (para1:pointer; para2:Tsize_t):pointer;cdecl;
-  Tgnutls_log_func = procedure (para1:longint; para2:Pchar);cdecl;
-  Tgnutls_audit_log_func = procedure (para1:Tgnutls_session_t; para2:Pchar);cdecl;
+  Tgnutls_log_func = procedure (para1:longint; para2:PAnsiChar);cdecl;
+  Tgnutls_audit_log_func = procedure (para1:Tgnutls_session_t; para2:PAnsiChar);cdecl;
 
   // Callback typedefs
     Tgnutls_status_request_ocsp_func = function (session:Tgnutls_session_t; ptr:pointer; ocsp_response:Pgnutls_datum_t):longint;cdecl;
   Tgnutls_params_function =  function(a : tgnutls_session_t; b: tgnutls_params_type_t; c : tgnutls_params_st ) : cInt; cdecl;
-  Tgnutls_srp_server_credentials_function = Function (a :tgnutls_session_t; username : pchar; salt : pgnutls_datum_t; verifier : pgnutls_datum_t; generator : pgnutls_datum_t; prime : pgnutls_datum_t) : cint ; cdecl;
-  Tgnutls_psk_server_credentials_function = Function (a : tgnutls_session_t; username : pchar; key : pgnutls_datum_t) : cInt; cdecl;
-  Tgnutls_psk_client_credentials_function = Function (a : tgnutls_session_t; username : ppchar; key : pgnutls_datum_t) : cint; cdecl;
-  Tgnutls_srp_client_credentials_function = Function (a : tgnutls_session_t; b : ppchar; c : ppchar): cint; cdecl;
+  Tgnutls_srp_server_credentials_function = Function (a :tgnutls_session_t; username : PAnsiChar; salt : pgnutls_datum_t; verifier : pgnutls_datum_t; generator : pgnutls_datum_t; prime : pgnutls_datum_t) : cint ; cdecl;
+  Tgnutls_psk_server_credentials_function = Function (a : tgnutls_session_t; username : PAnsiChar; key : pgnutls_datum_t) : cInt; cdecl;
+  Tgnutls_psk_client_credentials_function = Function (a : tgnutls_session_t; username : PPAnsiChar; key : pgnutls_datum_t) : cint; cdecl;
+  Tgnutls_srp_client_credentials_function = Function (a : tgnutls_session_t; b : PPAnsiChar; c : PPAnsiChar): cint; cdecl;
   Tgnutls_certificate_verify_function = function (a : tgnutls_session_t) : cint; cdecl;
   Tgnutls_db_store_func = function (para1:pointer; key:Tgnutls_datum_t; data:Tgnutls_datum_t):longint;cdecl;
   Tgnutls_db_remove_func = function (para1:pointer; key:Tgnutls_datum_t):longint;cdecl;
@@ -1191,11 +1191,11 @@ Type
   Tgnutls_x509_qualifier_t =  Longint;
   Pgnutls_x509_policy_st = ^Tgnutls_x509_policy_st;
   Tgnutls_x509_policy_st = record
-      oid : Pchar;
+      oid : PAnsiChar;
       qualifiers : dword;
       qualifier : array[0..7] of record
           _type : Tgnutls_x509_qualifier_t;
-          data : Pchar;
+          data : PAnsiChar;
           size : dword;
         end;
     end;
@@ -1237,7 +1237,7 @@ Type
 
   Pgnutls_x509_ext_st = ^Tgnutls_x509_ext_st;
   Tgnutls_x509_ext_st = record
-      oid : Pchar;
+      oid : PAnsiChar;
       critical : dword;
       data : Tgnutls_datum_t;
   end;
@@ -1265,7 +1265,7 @@ Type
       signing_time : Ttime_t;
       signed_attrs : Tgnutls_pkcs7_attrs_t;
       unsigned_attrs : Tgnutls_pkcs7_attrs_t;
-      pad : array[0..63] of char;
+      pad : array[0..63] of AnsiChar;
     end;
   Pgnutls_pkcs7_sign_flags = ^Tgnutls_pkcs7_sign_flags;
   Tgnutls_pkcs7_sign_flags =  Longint;
@@ -1492,7 +1492,7 @@ Var
   gnutls_realloc : Tgnutls_realloc_function;
   gnutls_calloc : Tgnutls_calloc_function;
   gnutls_free : Tgnutls_free_function;
-  gnutls_strdup : function (para1:Pchar):Pchar;cvar;external;
+  gnutls_strdup : function (para1:PAnsiChar):PAnsiChar;cvar;external;
   gnutls_srp_4096_group_prime : Tgnutls_datum_t;cvar;external;
   gnutls_srp_4096_group_generator : Tgnutls_datum_t;cvar;external;
   gnutls_srp_3072_group_prime : Tgnutls_datum_t;cvar;external;
@@ -1506,8 +1506,8 @@ Var
 
 
 var
-  gnutls_handshake_description_get_name : function(_type:Tgnutls_handshake_description_t):Pchar;cdecl;
-  gnutls_pk_algorithm_get_name : function(algorithm:Tgnutls_pk_algorithm_t):Pchar;cdecl;
+  gnutls_handshake_description_get_name : function(_type:Tgnutls_handshake_description_t):PAnsiChar;cdecl;
+  gnutls_pk_algorithm_get_name : function(algorithm:Tgnutls_pk_algorithm_t):PAnsiChar;cdecl;
   gnutls_init : function(session:Pgnutls_session_t; flags:dword):longint;cdecl;
   gnutls_deinit : procedure(session:Tgnutls_session_t);cdecl;
   gnutls_bye : function(session:Tgnutls_session_t; how:Tgnutls_close_request_t):longint;cdecl;
@@ -1517,14 +1517,14 @@ var
   gnutls_alert_get : function(session:Tgnutls_session_t):Tgnutls_alert_description_t;cdecl;
   gnutls_alert_send : function(session:Tgnutls_session_t; level:Tgnutls_alert_level_t; desc:Tgnutls_alert_description_t):longint;cdecl;
   gnutls_alert_send_appropriate : function(session:Tgnutls_session_t; err:longint):longint;cdecl;
-  gnutls_alert_get_name : function(alert:Tgnutls_alert_description_t):Pchar;cdecl;
-  gnutls_alert_get_strname : function(alert:Tgnutls_alert_description_t):Pchar;cdecl;
+  gnutls_alert_get_name : function(alert:Tgnutls_alert_description_t):PAnsiChar;cdecl;
+  gnutls_alert_get_strname : function(alert:Tgnutls_alert_description_t):PAnsiChar;cdecl;
   gnutls_pk_bits_to_sec_param : function(algo:Tgnutls_pk_algorithm_t; bits:dword):Tgnutls_sec_param_t;cdecl;
-  gnutls_sec_param_get_name : function(param:Tgnutls_sec_param_t):Pchar;cdecl;
+  gnutls_sec_param_get_name : function(param:Tgnutls_sec_param_t):PAnsiChar;cdecl;
   gnutls_sec_param_to_pk_bits : function(algo:Tgnutls_pk_algorithm_t; param:Tgnutls_sec_param_t):dword;cdecl;
   gnutls_sec_param_to_symmetric_bits : function(param:Tgnutls_sec_param_t):dword;cdecl;
-  gnutls_ecc_curve_get_name : function(curve:Tgnutls_ecc_curve_t):Pchar;cdecl;
-  gnutls_ecc_curve_get_oid : function(curve:Tgnutls_ecc_curve_t):Pchar;cdecl;
+  gnutls_ecc_curve_get_name : function(curve:Tgnutls_ecc_curve_t):PAnsiChar;cdecl;
+  gnutls_ecc_curve_get_oid : function(curve:Tgnutls_ecc_curve_t):PAnsiChar;cdecl;
   gnutls_ecc_curve_get_size : function(curve:Tgnutls_ecc_curve_t):longint;cdecl;
   gnutls_ecc_curve_get : function(session:Tgnutls_session_t):Tgnutls_ecc_curve_t;cdecl;
   gnutls_cipher_get : function(session:Tgnutls_session_t):Tgnutls_cipher_algorithm_t;cdecl;
@@ -1535,37 +1535,37 @@ var
   gnutls_sign_algorithm_get : function(session:Tgnutls_session_t):longint;cdecl;
   gnutls_sign_algorithm_get_client : function(session:Tgnutls_session_t):longint;cdecl;
   gnutls_sign_algorithm_get_requested : function(session:Tgnutls_session_t; indx:Tsize_t; algo:Pgnutls_sign_algorithm_t):longint;cdecl;
-  gnutls_cipher_get_name : function(algorithm:Tgnutls_cipher_algorithm_t):Pchar;cdecl;
-  gnutls_mac_get_name : function(algorithm:Tgnutls_mac_algorithm_t):Pchar;cdecl;
-  gnutls_digest_get_name : function(algorithm:Tgnutls_digest_algorithm_t):Pchar;cdecl;
-  gnutls_digest_get_oid : function(algorithm:Tgnutls_digest_algorithm_t):Pchar;cdecl;
-  gnutls_compression_get_name : function(algorithm:Tgnutls_compression_method_t):Pchar;cdecl;
-  gnutls_kx_get_name : function(algorithm:Tgnutls_kx_algorithm_t):Pchar;cdecl;
-  gnutls_certificate_type_get_name : function(_type:Tgnutls_certificate_type_t):Pchar;cdecl;
-  gnutls_pk_get_name : function(algorithm:Tgnutls_pk_algorithm_t):Pchar;cdecl;
-  gnutls_pk_get_oid : function(algorithm:Tgnutls_pk_algorithm_t):Pchar;cdecl;
-  gnutls_sign_get_name : function(algorithm:Tgnutls_sign_algorithm_t):Pchar;cdecl;
-  gnutls_sign_get_oid : function(algorithm:Tgnutls_sign_algorithm_t):Pchar;cdecl;
+  gnutls_cipher_get_name : function(algorithm:Tgnutls_cipher_algorithm_t):PAnsiChar;cdecl;
+  gnutls_mac_get_name : function(algorithm:Tgnutls_mac_algorithm_t):PAnsiChar;cdecl;
+  gnutls_digest_get_name : function(algorithm:Tgnutls_digest_algorithm_t):PAnsiChar;cdecl;
+  gnutls_digest_get_oid : function(algorithm:Tgnutls_digest_algorithm_t):PAnsiChar;cdecl;
+  gnutls_compression_get_name : function(algorithm:Tgnutls_compression_method_t):PAnsiChar;cdecl;
+  gnutls_kx_get_name : function(algorithm:Tgnutls_kx_algorithm_t):PAnsiChar;cdecl;
+  gnutls_certificate_type_get_name : function(_type:Tgnutls_certificate_type_t):PAnsiChar;cdecl;
+  gnutls_pk_get_name : function(algorithm:Tgnutls_pk_algorithm_t):PAnsiChar;cdecl;
+  gnutls_pk_get_oid : function(algorithm:Tgnutls_pk_algorithm_t):PAnsiChar;cdecl;
+  gnutls_sign_get_name : function(algorithm:Tgnutls_sign_algorithm_t):PAnsiChar;cdecl;
+  gnutls_sign_get_oid : function(algorithm:Tgnutls_sign_algorithm_t):PAnsiChar;cdecl;
   gnutls_cipher_get_key_size : function(algorithm:Tgnutls_cipher_algorithm_t):Tsize_t;cdecl;
   gnutls_mac_get_key_size : function(algorithm:Tgnutls_mac_algorithm_t):Tsize_t;cdecl;
   gnutls_sign_is_secure : function(algorithm:Tgnutls_sign_algorithm_t):longint;cdecl;
   gnutls_sign_get_hash_algorithm : function(sign:Tgnutls_sign_algorithm_t):Tgnutls_digest_algorithm_t;cdecl;
   gnutls_sign_get_pk_algorithm : function(sign:Tgnutls_sign_algorithm_t):Tgnutls_pk_algorithm_t;cdecl;
   gnutls_pk_to_sign : function(pk:Tgnutls_pk_algorithm_t; hash:Tgnutls_digest_algorithm_t):Tgnutls_sign_algorithm_t;cdecl;
-  gnutls_mac_get_id : function(name:Pchar):Tgnutls_mac_algorithm_t;cdecl;
-  gnutls_digest_get_id : function(name:Pchar):Tgnutls_digest_algorithm_t;cdecl;
-  gnutls_compression_get_id : function(name:Pchar):Tgnutls_compression_method_t;cdecl;
-  gnutls_cipher_get_id : function(name:Pchar):Tgnutls_cipher_algorithm_t;cdecl;
-  gnutls_kx_get_id : function(name:Pchar):Tgnutls_kx_algorithm_t;cdecl;
-  gnutls_protocol_get_id : function(name:Pchar):Tgnutls_protocol_t;cdecl;
-  gnutls_certificate_type_get_id : function(name:Pchar):Tgnutls_certificate_type_t;cdecl;
-  gnutls_pk_get_id : function(name:Pchar):Tgnutls_pk_algorithm_t;cdecl;
-  gnutls_sign_get_id : function(name:Pchar):Tgnutls_sign_algorithm_t;cdecl;
-  gnutls_ecc_curve_get_id : function(name:Pchar):Tgnutls_ecc_curve_t;cdecl;
-  gnutls_oid_to_digest : function(oid:Pchar):Tgnutls_digest_algorithm_t;cdecl;
-  gnutls_oid_to_pk : function(oid:Pchar):Tgnutls_pk_algorithm_t;cdecl;
-  gnutls_oid_to_sign : function(oid:Pchar):Tgnutls_sign_algorithm_t;cdecl;
-  gnutls_oid_to_ecc_curve : function(oid:Pchar):Tgnutls_ecc_curve_t;cdecl;
+  gnutls_mac_get_id : function(name:PAnsiChar):Tgnutls_mac_algorithm_t;cdecl;
+  gnutls_digest_get_id : function(name:PAnsiChar):Tgnutls_digest_algorithm_t;cdecl;
+  gnutls_compression_get_id : function(name:PAnsiChar):Tgnutls_compression_method_t;cdecl;
+  gnutls_cipher_get_id : function(name:PAnsiChar):Tgnutls_cipher_algorithm_t;cdecl;
+  gnutls_kx_get_id : function(name:PAnsiChar):Tgnutls_kx_algorithm_t;cdecl;
+  gnutls_protocol_get_id : function(name:PAnsiChar):Tgnutls_protocol_t;cdecl;
+  gnutls_certificate_type_get_id : function(name:PAnsiChar):Tgnutls_certificate_type_t;cdecl;
+  gnutls_pk_get_id : function(name:PAnsiChar):Tgnutls_pk_algorithm_t;cdecl;
+  gnutls_sign_get_id : function(name:PAnsiChar):Tgnutls_sign_algorithm_t;cdecl;
+  gnutls_ecc_curve_get_id : function(name:PAnsiChar):Tgnutls_ecc_curve_t;cdecl;
+  gnutls_oid_to_digest : function(oid:PAnsiChar):Tgnutls_digest_algorithm_t;cdecl;
+  gnutls_oid_to_pk : function(oid:PAnsiChar):Tgnutls_pk_algorithm_t;cdecl;
+  gnutls_oid_to_sign : function(oid:PAnsiChar):Tgnutls_sign_algorithm_t;cdecl;
+  gnutls_oid_to_ecc_curve : function(oid:PAnsiChar):Tgnutls_ecc_curve_t;cdecl;
   gnutls_ecc_curve_list : function:Pgnutls_ecc_curve_t;cdecl;
   gnutls_cipher_list : function:Pgnutls_cipher_algorithm_t;cdecl;
   gnutls_mac_list : function:Pgnutls_mac_algorithm_t;cdecl;
@@ -1576,12 +1576,12 @@ var
   gnutls_kx_list : function:Pgnutls_kx_algorithm_t;cdecl;
   gnutls_pk_list : function:Pgnutls_pk_algorithm_t;cdecl;
   gnutls_sign_list : function:Pgnutls_sign_algorithm_t;cdecl;
-  gnutls_cipher_suite_info : function(idx:Tsize_t; cs_id:Pbyte; kx:Pgnutls_kx_algorithm_t; cipher:Pgnutls_cipher_algorithm_t; mac:Pgnutls_mac_algorithm_t; min_version:Pgnutls_protocol_t):Pchar;cdecl;
+  gnutls_cipher_suite_info : function(idx:Tsize_t; cs_id:Pbyte; kx:Pgnutls_kx_algorithm_t; cipher:Pgnutls_cipher_algorithm_t; mac:Pgnutls_mac_algorithm_t; min_version:Pgnutls_protocol_t):PAnsiChar;cdecl;
   gnutls_error_is_fatal : function(error:longint):longint;cdecl;
   gnutls_error_to_alert : function(err:longint; level:Plongint):longint;cdecl;
   gnutls_perror : procedure(error:longint);cdecl;
-  gnutls_strerror : function(error:longint):Pchar;cdecl;
-  gnutls_strerror_name : function(error:longint):Pchar;cdecl;
+  gnutls_strerror : function(error:longint):PAnsiChar;cdecl;
+  gnutls_strerror_name : function(error:longint):PAnsiChar;cdecl;
   gnutls_handshake_set_private_extensions : procedure(session:Tgnutls_session_t; allow:longint);cdecl;
   gnutls_handshake_set_random : function(session:Tgnutls_session_t; random:Pgnutls_datum_t):longint;cdecl;
   gnutls_handshake_get_last_out : function(session:Tgnutls_session_t):Tgnutls_handshake_description_t;cdecl;
@@ -1613,9 +1613,9 @@ var
   gnutls_record_check_pending : function(session:Tgnutls_session_t):Tsize_t;cdecl;
   gnutls_record_check_corked : function(session:Tgnutls_session_t):Tsize_t;cdecl;
   gnutls_session_force_valid : procedure(session:Tgnutls_session_t);cdecl;
-  gnutls_prf : function(session:Tgnutls_session_t; label_size:Tsize_t; _label:Pchar; server_random_first:longint; extra_size:Tsize_t;  extra:Pchar; outsize:Tsize_t; outs :Pchar):longint;cdecl;
-  gnutls_prf_rfc5705 : function(session:Tgnutls_session_t; label_size:Tsize_t; _label:Pchar; context_size:Tsize_t; context:Pchar; outsize:Tsize_t; outs:Pchar):longint;cdecl;
-  gnutls_prf_raw : function(session:Tgnutls_session_t; label_size:Tsize_t; _label:Pchar; seed_size:Tsize_t; seed:Pchar;  outsize:Tsize_t; outs:Pchar):longint;cdecl;
+  gnutls_prf : function(session:Tgnutls_session_t; label_size:Tsize_t; _label:PAnsiChar; server_random_first:longint; extra_size:Tsize_t;  extra:PAnsiChar; outsize:Tsize_t; outs :PAnsiChar):longint;cdecl;
+  gnutls_prf_rfc5705 : function(session:Tgnutls_session_t; label_size:Tsize_t; _label:PAnsiChar; context_size:Tsize_t; context:PAnsiChar; outsize:Tsize_t; outs:PAnsiChar):longint;cdecl;
+  gnutls_prf_raw : function(session:Tgnutls_session_t; label_size:Tsize_t; _label:PAnsiChar; seed_size:Tsize_t; seed:PAnsiChar;  outsize:Tsize_t; outs:PAnsiChar):longint;cdecl;
   gnutls_server_name_set : function(session:Tgnutls_session_t; _type:Tgnutls_server_name_type_t; name:pointer; name_length:Tsize_t):longint;cdecl;
   gnutls_server_name_get : function(session:Tgnutls_session_t; data:pointer; data_length:Psize_t; _type:Pdword; indx:dword):longint;cdecl;
   gnutls_heartbeat_get_timeout : function(session:Tgnutls_session_t):dword;cdecl;
@@ -1625,27 +1625,27 @@ var
   gnutls_safe_renegotiation_status : function(session:Tgnutls_session_t):longint;cdecl;
   gnutls_session_ext_master_secret_status : function(session:Tgnutls_session_t):dword;cdecl;
   gnutls_session_etm_status : function(session:Tgnutls_session_t):dword;cdecl;
-  gnutls_supplemental_get_name : function(_type:Tgnutls_supplemental_data_format_type_t):Pchar;cdecl;
+  gnutls_supplemental_get_name : function(_type:Tgnutls_supplemental_data_format_type_t):PAnsiChar;cdecl;
   gnutls_session_ticket_key_generate : function(key:Pgnutls_datum_t):longint;cdecl;
   gnutls_session_ticket_enable_client : function(session:Tgnutls_session_t):longint;cdecl;
   gnutls_session_ticket_enable_server : function(session:Tgnutls_session_t; key:Pgnutls_datum_t):longint;cdecl;
   gnutls_srtp_set_profile : function(session:Tgnutls_session_t; profile:Tgnutls_srtp_profile_t):longint;cdecl;
-  gnutls_srtp_set_profile_direct : function(session:Tgnutls_session_t; profiles:Pchar; err_pos:PPchar):longint;cdecl;
+  gnutls_srtp_set_profile_direct : function(session:Tgnutls_session_t; profiles:PAnsiChar; err_pos:PPAnsiChar):longint;cdecl;
   gnutls_srtp_get_selected_profile : function(session:Tgnutls_session_t; profile:Pgnutls_srtp_profile_t):longint;cdecl;
-  gnutls_srtp_get_profile_name : function(profile:Tgnutls_srtp_profile_t):Pchar;cdecl;
-  gnutls_srtp_get_profile_id : function(name:Pchar; profile:Pgnutls_srtp_profile_t):longint;cdecl;
+  gnutls_srtp_get_profile_name : function(profile:Tgnutls_srtp_profile_t):PAnsiChar;cdecl;
+  gnutls_srtp_get_profile_id : function(name:PAnsiChar; profile:Pgnutls_srtp_profile_t):longint;cdecl;
   gnutls_srtp_get_keys : function(session:Tgnutls_session_t; key_material:pointer; key_material_size:dword; client_key:Pgnutls_datum_t; client_salt:Pgnutls_datum_t;  server_key:Pgnutls_datum_t; server_salt:Pgnutls_datum_t):longint;cdecl;
   gnutls_srtp_set_mki : function(session:Tgnutls_session_t; mki:Pgnutls_datum_t):longint;cdecl;
   gnutls_srtp_get_mki : function(session:Tgnutls_session_t; mki:Pgnutls_datum_t):longint;cdecl;
   gnutls_alpn_get_selected_protocol : function(session:Tgnutls_session_t; protocol:Pgnutls_datum_t):longint;cdecl;
   gnutls_alpn_set_protocols : function(session:Tgnutls_session_t; protocols:Pgnutls_datum_t; protocols_size:dword; flags:dword):longint;cdecl;
   gnutls_key_generate : function(key:Pgnutls_datum_t; key_size:dword):longint;cdecl;
-  gnutls_priority_init : function(priority_cache:Pgnutls_priority_t; priorities:Pchar; err_pos:PPchar):longint;cdecl;
+  gnutls_priority_init : function(priority_cache:Pgnutls_priority_t; priorities:PAnsiChar; err_pos:PPAnsiChar):longint;cdecl;
   gnutls_priority_deinit : procedure(priority_cache:Tgnutls_priority_t);cdecl;
   gnutls_priority_get_cipher_suite_index : function(pcache:Tgnutls_priority_t; idx:dword; sidx:Pdword):longint;cdecl;
-  gnutls_priority_string_list : function(iter:dword; flags:dword):Pchar;cdecl;
+  gnutls_priority_string_list : function(iter:dword; flags:dword):PAnsiChar;cdecl;
   gnutls_priority_set : function(session:Tgnutls_session_t; priority:Tgnutls_priority_t):longint;cdecl;
-  gnutls_priority_set_direct : function(session:Tgnutls_session_t; priorities:Pchar; err_pos:PPchar):longint;cdecl;
+  gnutls_priority_set_direct : function(session:Tgnutls_session_t; priorities:PAnsiChar; err_pos:PPAnsiChar):longint;cdecl;
   gnutls_priority_certificate_type_list : function(pcache:Tgnutls_priority_t; list:PPdword):longint;cdecl;
   gnutls_priority_sign_list : function(pcache:Tgnutls_priority_t; list:PPdword):longint;cdecl;
   gnutls_priority_protocol_list : function(pcache:Tgnutls_priority_t; list:PPdword):longint;cdecl;
@@ -1655,16 +1655,16 @@ var
   gnutls_priority_cipher_list : function(pcache:Tgnutls_priority_t; list:PPdword):longint;cdecl;
   gnutls_priority_mac_list : function(pcache:Tgnutls_priority_t; list:PPdword):longint;cdecl;
   gnutls_set_default_priority : function(session:Tgnutls_session_t):longint;cdecl;
-  gnutls_cipher_suite_get_name : function(kx_algorithm:Tgnutls_kx_algorithm_t; cipher_algorithm:Tgnutls_cipher_algorithm_t; mac_algorithm:Tgnutls_mac_algorithm_t):Pchar;cdecl;
+  gnutls_cipher_suite_get_name : function(kx_algorithm:Tgnutls_kx_algorithm_t; cipher_algorithm:Tgnutls_cipher_algorithm_t; mac_algorithm:Tgnutls_mac_algorithm_t):PAnsiChar;cdecl;
   gnutls_protocol_get_version : function(session:Tgnutls_session_t):Tgnutls_protocol_t;cdecl;
-  gnutls_protocol_get_name : function(version:Tgnutls_protocol_t):Pchar;cdecl;
+  gnutls_protocol_get_name : function(version:Tgnutls_protocol_t):PAnsiChar;cdecl;
   gnutls_session_set_data : function(session:Tgnutls_session_t; session_data:pointer; session_data_size:Tsize_t):longint;cdecl;
   gnutls_session_get_data : function(session:Tgnutls_session_t; session_data:pointer; session_data_size:Psize_t):longint;cdecl;
   gnutls_session_get_data2 : function(session:Tgnutls_session_t; data:Pgnutls_datum_t):longint;cdecl;
   gnutls_session_get_random : procedure(session:Tgnutls_session_t; client:Pgnutls_datum_t; server:Pgnutls_datum_t);cdecl;
-  gnutls_session_get_desc : function(session:Tgnutls_session_t):Pchar;cdecl;
+  gnutls_session_get_desc : function(session:Tgnutls_session_t):PAnsiChar;cdecl;
   gnutls_session_set_verify_function : procedure(session:Tgnutls_session_t; func:tgnutls_certificate_verify_function);cdecl;
-  gnutls_session_set_verify_cert : procedure(session:Tgnutls_session_t; hostname:Pchar; flags:dword);cdecl;
+  gnutls_session_set_verify_cert : procedure(session:Tgnutls_session_t; hostname:PAnsiChar; flags:dword);cdecl;
   gnutls_session_set_verify_cert2 : procedure(session:Tgnutls_session_t; data:Pgnutls_typed_vdata_st; elements:dword; flags:dword);cdecl;
   gnutls_session_get_verify_cert_status : function(para1:Tgnutls_session_t):dword;cdecl;
   gnutls_session_set_premaster : function(session:Tgnutls_session_t; entity:dword; version:Tgnutls_protocol_t; kx:Tgnutls_kx_algorithm_t; cipher:Tgnutls_cipher_algorithm_t;
@@ -1688,7 +1688,7 @@ var
   gnutls_handshake_set_hook_function : procedure(session:Tgnutls_session_t; htype:dword; post:longint; func:Tgnutls_handshake_hook_func);cdecl;
   gnutls_handshake_set_post_client_hello_function : procedure(session:Tgnutls_session_t; func:Tgnutls_handshake_post_client_hello_func);cdecl;
   gnutls_handshake_set_max_packet_length : procedure(session:Tgnutls_session_t; max:Tsize_t);cdecl;
-  gnutls_check_version : function(req_version:Pchar):Pchar;cdecl;
+  gnutls_check_version : function(req_version:PAnsiChar):PAnsiChar;cdecl;
   gnutls_credentials_clear : procedure(session:Tgnutls_session_t);cdecl;
   gnutls_credentials_set : function(session:Tgnutls_session_t; _type:Tgnutls_credentials_type_t; cred:pointer):longint;cdecl;
   gnutls_credentials_get : function(session:Tgnutls_session_t; _type:Tgnutls_credentials_type_t; cred:Ppointer):longint;cdecl;
@@ -1714,25 +1714,25 @@ var
   gnutls_certificate_set_flags : procedure(para1:Tgnutls_certificate_credentials_t; flags:dword);cdecl;
   gnutls_certificate_set_verify_limits : procedure(res:Tgnutls_certificate_credentials_t; max_bits:dword; max_depth:dword);cdecl;
   gnutls_certificate_set_x509_system_trust : function(cred:Tgnutls_certificate_credentials_t):longint;cdecl;
-  gnutls_certificate_set_x509_trust_file : function(cred:Tgnutls_certificate_credentials_t; cafile:Pchar; _type:Tgnutls_x509_crt_fmt_t):longint;cdecl;
-  gnutls_certificate_set_x509_trust_dir : function(cred:Tgnutls_certificate_credentials_t; ca_dir:Pchar; _type:Tgnutls_x509_crt_fmt_t):longint;cdecl;
+  gnutls_certificate_set_x509_trust_file : function(cred:Tgnutls_certificate_credentials_t; cafile:PAnsiChar; _type:Tgnutls_x509_crt_fmt_t):longint;cdecl;
+  gnutls_certificate_set_x509_trust_dir : function(cred:Tgnutls_certificate_credentials_t; ca_dir:PAnsiChar; _type:Tgnutls_x509_crt_fmt_t):longint;cdecl;
   gnutls_certificate_set_x509_trust_mem : function(res:Tgnutls_certificate_credentials_t; ca:Pgnutls_datum_t; _type:Tgnutls_x509_crt_fmt_t):longint;cdecl;
-  gnutls_certificate_set_x509_crl_file : function(res:Tgnutls_certificate_credentials_t; crlfile:Pchar; _type:Tgnutls_x509_crt_fmt_t):longint;cdecl;
+  gnutls_certificate_set_x509_crl_file : function(res:Tgnutls_certificate_credentials_t; crlfile:PAnsiChar; _type:Tgnutls_x509_crt_fmt_t):longint;cdecl;
   gnutls_certificate_set_x509_crl_mem : function(res:Tgnutls_certificate_credentials_t; CRL:Pgnutls_datum_t; _type:Tgnutls_x509_crt_fmt_t):longint;cdecl;
-  gnutls_certificate_set_x509_key_file : function(res:Tgnutls_certificate_credentials_t; certfile:Pchar; keyfile:Pchar; _type:Tgnutls_x509_crt_fmt_t):longint;cdecl;
-  gnutls_certificate_set_x509_key_file2 : function(res:Tgnutls_certificate_credentials_t; certfile:Pchar; keyfile:Pchar; _type:Tgnutls_x509_crt_fmt_t; pass:Pchar;
+  gnutls_certificate_set_x509_key_file : function(res:Tgnutls_certificate_credentials_t; certfile:PAnsiChar; keyfile:PAnsiChar; _type:Tgnutls_x509_crt_fmt_t):longint;cdecl;
+  gnutls_certificate_set_x509_key_file2 : function(res:Tgnutls_certificate_credentials_t; certfile:PAnsiChar; keyfile:PAnsiChar; _type:Tgnutls_x509_crt_fmt_t; pass:PAnsiChar;
       flags:dword):longint;cdecl;
   gnutls_certificate_set_x509_key_mem : function(res:Tgnutls_certificate_credentials_t; cert:Pgnutls_datum_t; key:Pgnutls_datum_t; _type:Tgnutls_x509_crt_fmt_t):longint;cdecl;
-  gnutls_certificate_set_x509_key_mem2 : function(res:Tgnutls_certificate_credentials_t; cert:Pgnutls_datum_t; key:Pgnutls_datum_t; _type:Tgnutls_x509_crt_fmt_t; pass:Pchar;
+  gnutls_certificate_set_x509_key_mem2 : function(res:Tgnutls_certificate_credentials_t; cert:Pgnutls_datum_t; key:Pgnutls_datum_t; _type:Tgnutls_x509_crt_fmt_t; pass:PAnsiChar;
       flags:dword):longint;cdecl;
   gnutls_certificate_send_x509_rdn_sequence : procedure(session:Tgnutls_session_t; status:longint);cdecl;
-  gnutls_certificate_set_x509_simple_pkcs12_file : function(res:Tgnutls_certificate_credentials_t; pkcs12file:Pchar; _type:Tgnutls_x509_crt_fmt_t; password:Pchar):longint;cdecl;
-  gnutls_certificate_set_x509_simple_pkcs12_mem : function(res:Tgnutls_certificate_credentials_t; p12blob:Pgnutls_datum_t; _type:Tgnutls_x509_crt_fmt_t; password:Pchar):longint;cdecl;
+  gnutls_certificate_set_x509_simple_pkcs12_file : function(res:Tgnutls_certificate_credentials_t; pkcs12file:PAnsiChar; _type:Tgnutls_x509_crt_fmt_t; password:PAnsiChar):longint;cdecl;
+  gnutls_certificate_set_x509_simple_pkcs12_mem : function(res:Tgnutls_certificate_credentials_t; p12blob:Pgnutls_datum_t; _type:Tgnutls_x509_crt_fmt_t; password:PAnsiChar):longint;cdecl;
   gnutls_certificate_set_x509_key : function(res:Tgnutls_certificate_credentials_t; cert_list:Pgnutls_x509_crt_t; cert_list_size:longint; key:Tgnutls_x509_privkey_t):longint;cdecl;
   gnutls_certificate_set_x509_trust : function(res:Tgnutls_certificate_credentials_t; ca_list:Pgnutls_x509_crt_t; ca_list_size:longint):longint;cdecl;
   gnutls_certificate_set_x509_crl : function(res:Tgnutls_certificate_credentials_t; crl_list:Pgnutls_x509_crl_t; crl_list_size:longint):longint;cdecl;
   gnutls_certificate_set_ocsp_status_request_function : procedure(res:Tgnutls_certificate_credentials_t; ocsp_func:Tgnutls_status_request_ocsp_func; ptr:pointer);cdecl;
-  gnutls_certificate_set_ocsp_status_request_file : function(res:Tgnutls_certificate_credentials_t; response_file:Pchar; flags:dword):longint;cdecl;
+  gnutls_certificate_set_ocsp_status_request_file : function(res:Tgnutls_certificate_credentials_t; response_file:PAnsiChar; flags:dword):longint;cdecl;
   gnutls_ocsp_status_request_enable_client : function(session:Tgnutls_session_t; responder_id:Pgnutls_datum_t; responder_id_size:Tsize_t; request_extensions:Pgnutls_datum_t):longint;cdecl;
   gnutls_ocsp_status_request_get : function(session:Tgnutls_session_t; response:Pgnutls_datum_t):longint;cdecl;
   gnutls_ocsp_status_request_is_checked : function(session:Tgnutls_session_t; flags:dword):longint;cdecl;
@@ -1773,35 +1773,35 @@ var
   gnutls_session_get_ptr : function(session:Tgnutls_session_t):pointer;cdecl;
   gnutls_openpgp_send_cert : procedure(session:Tgnutls_session_t; status:Tgnutls_openpgp_crt_status_t);cdecl;
   gnutls_fingerprint : function(algo:Tgnutls_digest_algorithm_t; data:Pgnutls_datum_t; result:pointer; result_size:Psize_t):longint;cdecl;
-  gnutls_random_art : function(_type:Tgnutls_random_art_t; key_type:Pchar; key_size:dword; fpr:pointer; fpr_size:Tsize_t;  art:Pgnutls_datum_t):longint;cdecl;
+  gnutls_random_art : function(_type:Tgnutls_random_art_t; key_type:PAnsiChar; key_size:dword; fpr:pointer; fpr_size:Tsize_t;  art:Pgnutls_datum_t):longint;cdecl;
   gnutls_srp_free_client_credentials : procedure(sc:Tgnutls_srp_client_credentials_t);cdecl;
   gnutls_srp_allocate_client_credentials : function(sc:Pgnutls_srp_client_credentials_t):longint;cdecl;
-  gnutls_srp_set_client_credentials : function(res:Tgnutls_srp_client_credentials_t; username:Pchar; password:Pchar):longint;cdecl;
+  gnutls_srp_set_client_credentials : function(res:Tgnutls_srp_client_credentials_t; username:PAnsiChar; password:PAnsiChar):longint;cdecl;
   gnutls_srp_free_server_credentials : procedure(sc:Tgnutls_srp_server_credentials_t);cdecl;
   gnutls_srp_allocate_server_credentials : function(sc:Pgnutls_srp_server_credentials_t):longint;cdecl;
-  gnutls_srp_set_server_credentials_file : function(res:Tgnutls_srp_server_credentials_t; password_file:Pchar; password_conf_file:Pchar):longint;cdecl;
-  gnutls_srp_server_get_username : function(session:Tgnutls_session_t):Pchar;cdecl;
+  gnutls_srp_set_server_credentials_file : function(res:Tgnutls_srp_server_credentials_t; password_file:PAnsiChar; password_conf_file:PAnsiChar):longint;cdecl;
+  gnutls_srp_server_get_username : function(session:Tgnutls_session_t):PAnsiChar;cdecl;
   gnutls_srp_set_prime_bits : procedure(session:Tgnutls_session_t; bits:dword);cdecl;
-  gnutls_srp_verifier : function(username:Pchar; password:Pchar; salt:Pgnutls_datum_t; generator:Pgnutls_datum_t; prime:Pgnutls_datum_t; res:Pgnutls_datum_t):longint;cdecl;
+  gnutls_srp_verifier : function(username:PAnsiChar; password:PAnsiChar; salt:Pgnutls_datum_t; generator:Pgnutls_datum_t; prime:Pgnutls_datum_t; res:Pgnutls_datum_t):longint;cdecl;
   gnutls_srp_set_server_credentials_function : procedure(cred:Tgnutls_srp_server_credentials_t; func:tgnutls_srp_server_credentials_function);cdecl;
   gnutls_srp_set_client_credentials_function : procedure(cred:Tgnutls_srp_client_credentials_t; func:tgnutls_srp_client_credentials_function);cdecl;
-  gnutls_srp_base64_encode : function(data:Pgnutls_datum_t; result:Pchar; result_size:Psize_t):longint;cdecl;
+  gnutls_srp_base64_encode : function(data:Pgnutls_datum_t; result:PAnsiChar; result_size:Psize_t):longint;cdecl;
   gnutls_srp_base64_encode2 : function(data:Pgnutls_datum_t; result:Pgnutls_datum_t):longint;cdecl;
-  gnutls_srp_base64_decode : function(b64_data:Pgnutls_datum_t; result:Pchar; result_size:Psize_t):longint;cdecl;
+  gnutls_srp_base64_decode : function(b64_data:Pgnutls_datum_t; result:PAnsiChar; result_size:Psize_t):longint;cdecl;
   gnutls_srp_base64_decode2 : function(b64_data:Pgnutls_datum_t; result:Pgnutls_datum_t):longint;cdecl;
   gnutls_srp_set_server_fake_salt_seed : procedure(sc:Tgnutls_srp_server_credentials_t; seed:Pgnutls_datum_t; salt_length:dword);cdecl;
   gnutls_psk_free_client_credentials : procedure(sc:Tgnutls_psk_client_credentials_t);cdecl;
   gnutls_psk_allocate_client_credentials : function(sc:Pgnutls_psk_client_credentials_t):longint;cdecl;
-  gnutls_psk_set_client_credentials : function(res:Tgnutls_psk_client_credentials_t; username:Pchar; key:Pgnutls_datum_t; flags:Tgnutls_psk_key_flags):longint;cdecl;
+  gnutls_psk_set_client_credentials : function(res:Tgnutls_psk_client_credentials_t; username:PAnsiChar; key:Pgnutls_datum_t; flags:Tgnutls_psk_key_flags):longint;cdecl;
   gnutls_psk_free_server_credentials : procedure(sc:Tgnutls_psk_server_credentials_t);cdecl;
   gnutls_psk_allocate_server_credentials : function(sc:Pgnutls_psk_server_credentials_t):longint;cdecl;
-  gnutls_psk_set_server_credentials_file : function(res:Tgnutls_psk_server_credentials_t; password_file:Pchar):longint;cdecl;
-  gnutls_psk_set_server_credentials_hint : function(res:Tgnutls_psk_server_credentials_t; hint:Pchar):longint;cdecl;
-  gnutls_psk_server_get_username : function(session:Tgnutls_session_t):Pchar;cdecl;
-  gnutls_psk_client_get_hint : function(session:Tgnutls_session_t):Pchar;cdecl;
+  gnutls_psk_set_server_credentials_file : function(res:Tgnutls_psk_server_credentials_t; password_file:PAnsiChar):longint;cdecl;
+  gnutls_psk_set_server_credentials_hint : function(res:Tgnutls_psk_server_credentials_t; hint:PAnsiChar):longint;cdecl;
+  gnutls_psk_server_get_username : function(session:Tgnutls_session_t):PAnsiChar;cdecl;
+  gnutls_psk_client_get_hint : function(session:Tgnutls_session_t):PAnsiChar;cdecl;
   gnutls_psk_set_server_credentials_function : procedure(cred:Tgnutls_psk_server_credentials_t; func:Tgnutls_psk_server_credentials_function);cdecl;
   gnutls_psk_set_client_credentials_function : procedure(cred:Tgnutls_psk_client_credentials_t; func:Tgnutls_psk_client_credentials_function);cdecl;
-  gnutls_hex_encode : function(data:Pgnutls_datum_t; result:Pchar; result_size:Psize_t):longint;cdecl;
+  gnutls_hex_encode : function(data:Pgnutls_datum_t; result:PAnsiChar; result_size:Psize_t):longint;cdecl;
   gnutls_hex_decode : function(hex_data:Pgnutls_datum_t; result:pointer; result_size:Psize_t):longint;cdecl;
   gnutls_hex_encode2 : function(data:Pgnutls_datum_t; result:Pgnutls_datum_t):longint;cdecl;
   gnutls_hex_decode2 : function(data:Pgnutls_datum_t; result:Pgnutls_datum_t):longint;cdecl;
@@ -1826,37 +1826,37 @@ var
   gnutls_certificate_expiration_time_peers : function(session:Tgnutls_session_t):Ttime_t;cdecl;
   gnutls_certificate_client_get_request_status : function(session:Tgnutls_session_t):longint;cdecl;
   gnutls_certificate_verify_peers2 : function(session:Tgnutls_session_t; status:Pdword):longint;cdecl;
-  gnutls_certificate_verify_peers3 : function(session:Tgnutls_session_t; hostname:Pchar; status:Pdword):longint;cdecl;
+  gnutls_certificate_verify_peers3 : function(session:Tgnutls_session_t; hostname:PAnsiChar; status:Pdword):longint;cdecl;
   gnutls_certificate_verify_peers : function(session:Tgnutls_session_t; data:Pgnutls_typed_vdata_st; elements:dword; status:Pdword):longint;cdecl;
   gnutls_certificate_verification_status_print : function(status:dword; _type:Tgnutls_certificate_type_t; outa:Pgnutls_datum_t; flags:dword):longint;cdecl;
-  gnutls_pem_base64_encode : function(msg:Pchar; data:Pgnutls_datum_t; result:Pchar; result_size:Psize_t):longint;cdecl;
-  gnutls_pem_base64_decode : function(header:Pchar; b64_data:Pgnutls_datum_t; result:Pbyte; result_size:Psize_t):longint;cdecl;
-  gnutls_pem_base64_encode2 : function(msg:Pchar; data:Pgnutls_datum_t; result:Pgnutls_datum_t):longint;cdecl;
-  gnutls_pem_base64_decode2 : function(header:Pchar; b64_data:Pgnutls_datum_t; result:Pgnutls_datum_t):longint;cdecl;
+  gnutls_pem_base64_encode : function(msg:PAnsiChar; data:Pgnutls_datum_t; result:PAnsiChar; result_size:Psize_t):longint;cdecl;
+  gnutls_pem_base64_decode : function(header:PAnsiChar; b64_data:Pgnutls_datum_t; result:Pbyte; result_size:Psize_t):longint;cdecl;
+  gnutls_pem_base64_encode2 : function(msg:PAnsiChar; data:Pgnutls_datum_t; result:Pgnutls_datum_t):longint;cdecl;
+  gnutls_pem_base64_decode2 : function(header:PAnsiChar; b64_data:Pgnutls_datum_t; result:Pgnutls_datum_t):longint;cdecl;
   gnutls_certificate_set_params_function : procedure(res:Tgnutls_certificate_credentials_t; func:Pgnutls_params_function);cdecl;
   gnutls_anon_set_params_function : procedure(res:Tgnutls_anon_server_credentials_t; func:Pgnutls_params_function);cdecl;
   gnutls_psk_set_params_function : procedure(res:Tgnutls_psk_server_credentials_t; func:Pgnutls_params_function);cdecl;
-  gnutls_hex2bin : function(hex_data:Pchar; hex_size:Tsize_t; bin_data:pointer; bin_size:Psize_t):longint;cdecl;
+  gnutls_hex2bin : function(hex_data:PAnsiChar; hex_size:Tsize_t; bin_data:pointer; bin_size:Psize_t):longint;cdecl;
   gnutls_tdb_init : function(tdb:Pgnutls_tdb_t):longint;cdecl;
   gnutls_tdb_set_store_func : procedure(tdb:Tgnutls_tdb_t; store:Tgnutls_tdb_store_func);cdecl;
   gnutls_tdb_set_store_commitment_func : procedure(tdb:Tgnutls_tdb_t; cstore:Tgnutls_tdb_store_commitment_func);cdecl;
   gnutls_tdb_set_verify_func : procedure(tdb:Tgnutls_tdb_t; verify:Tgnutls_tdb_verify_func);cdecl;
   gnutls_tdb_deinit : procedure(tdb:Tgnutls_tdb_t);cdecl;
-  gnutls_verify_stored_pubkey : function(db_name:Pchar; tdb:Tgnutls_tdb_t; host:Pchar; service:Pchar; cert_type:Tgnutls_certificate_type_t;
+  gnutls_verify_stored_pubkey : function(db_name:PAnsiChar; tdb:Tgnutls_tdb_t; host:PAnsiChar; service:PAnsiChar; cert_type:Tgnutls_certificate_type_t;
       cert:Pgnutls_datum_t; flags:dword):longint;cdecl;
-  gnutls_store_commitment : function(db_name:Pchar; tdb:Tgnutls_tdb_t; host:Pchar; service:Pchar; hash_algo:Tgnutls_digest_algorithm_t;
+  gnutls_store_commitment : function(db_name:PAnsiChar; tdb:Tgnutls_tdb_t; host:PAnsiChar; service:PAnsiChar; hash_algo:Tgnutls_digest_algorithm_t;
       hash:Pgnutls_datum_t; expiration:Ttime_t; flags:dword):longint;cdecl;
-  gnutls_store_pubkey : function(db_name:Pchar; tdb:Tgnutls_tdb_t; host:Pchar; service:Pchar; cert_type:Tgnutls_certificate_type_t;
+  gnutls_store_pubkey : function(db_name:PAnsiChar; tdb:Tgnutls_tdb_t; host:PAnsiChar; service:PAnsiChar; cert_type:Tgnutls_certificate_type_t;
       cert:Pgnutls_datum_t; expiration:Ttime_t; flags:dword):longint;cdecl;
-  gnutls_load_file : function(filename:Pchar; data:Pgnutls_datum_t):longint;cdecl;
-  gnutls_url_is_supported : function(url:Pchar):longint;cdecl;
+  gnutls_load_file : function(filename:PAnsiChar; data:Pgnutls_datum_t):longint;cdecl;
+  gnutls_url_is_supported : function(url:PAnsiChar):longint;cdecl;
   gnutls_certificate_set_pin_function : procedure(para1:Tgnutls_certificate_credentials_t; fn:Tgnutls_pin_callback_t; userdata:pointer);cdecl;
     gnutls_buffer_append_data : function(para1:Tgnutls_buffer_t; data:pointer; data_size:Tsize_t):longint;cdecl;
   gnutls_ext_set_data : procedure(session:Tgnutls_session_t; _type:dword; para3:Tgnutls_ext_priv_data_t);cdecl;
   gnutls_ext_get_data : function(session:Tgnutls_session_t; _type:dword; para3:Pgnutls_ext_priv_data_t):longint;cdecl;
-  gnutls_ext_register : function(name:Pchar; _type:longint; parse_type:Tgnutls_ext_parse_type_t; recv_func:Tgnutls_ext_recv_func; send_func:Tgnutls_ext_send_func;
+  gnutls_ext_register : function(name:PAnsiChar; _type:longint; parse_type:Tgnutls_ext_parse_type_t; recv_func:Tgnutls_ext_recv_func; send_func:Tgnutls_ext_send_func;
       deinit_func:Tgnutls_ext_deinit_data_func; pack_func:Tgnutls_ext_pack_func; unpack_func:Tgnutls_ext_unpack_func):longint;cdecl;
-  gnutls_supplemental_register : function(name:Pchar; _type:Tgnutls_supplemental_data_format_type_t; supp_recv_func:Tgnutls_supp_recv_func; supp_send_func:Tgnutls_supp_send_func):longint;cdecl;
+  gnutls_supplemental_register : function(name:PAnsiChar; _type:Tgnutls_supplemental_data_format_type_t; supp_recv_func:Tgnutls_supp_recv_func; supp_send_func:Tgnutls_supp_send_func):longint;cdecl;
   gnutls_supplemental_recv : procedure(session:Tgnutls_session_t; do_recv_supplemental:dword);cdecl;
   gnutls_supplemental_send : procedure(session:Tgnutls_session_t; do_send_supplemental:dword);cdecl;
   gnutls_fips140_mode_enabled : function:longint;cdecl;
@@ -1866,25 +1866,25 @@ var
   gnutls_x509_crt_import : function(cert:Tgnutls_x509_crt_t; data:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t):longint;cdecl;
   gnutls_x509_crt_list_import2 : function(certs:PPgnutls_x509_crt_t; size:Pdword; data:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t; flags:dword):longint;cdecl;
   gnutls_x509_crt_list_import : function(certs:Pgnutls_x509_crt_t; cert_max:Pdword; data:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t; flags:dword):longint;cdecl;
-  gnutls_x509_crt_import_url : function(crt:Tgnutls_x509_crt_t; url:Pchar; flags:dword):longint;cdecl;
+  gnutls_x509_crt_import_url : function(crt:Tgnutls_x509_crt_t; url:PAnsiChar; flags:dword):longint;cdecl;
   gnutls_x509_crt_export : function(cert:Tgnutls_x509_crt_t; format:Tgnutls_x509_crt_fmt_t; output_data:pointer; output_data_size:Psize_t):longint;cdecl;
   gnutls_x509_crt_export2 : function(cert:Tgnutls_x509_crt_t; format:Tgnutls_x509_crt_fmt_t; outd:Pgnutls_datum_t):longint;cdecl;
   gnutls_x509_crt_get_private_key_usage_period : function(cert:Tgnutls_x509_crt_t; activation:Ptime_t; expiration:Ptime_t; critical:Pdword):longint;cdecl;
-  gnutls_x509_crt_get_issuer_dn : function(cert:Tgnutls_x509_crt_t; buf:Pchar; buf_size:Psize_t):longint;cdecl;
+  gnutls_x509_crt_get_issuer_dn : function(cert:Tgnutls_x509_crt_t; buf:PAnsiChar; buf_size:Psize_t):longint;cdecl;
   gnutls_x509_crt_get_issuer_dn2 : function(cert:Tgnutls_x509_crt_t; dn:Pgnutls_datum_t):longint;cdecl;
   gnutls_x509_crt_get_issuer_dn_oid : function(cert:Tgnutls_x509_crt_t; indx:longint; oid:pointer; oid_size:Psize_t):longint;cdecl;
-  gnutls_x509_crt_get_issuer_dn_by_oid : function(cert:Tgnutls_x509_crt_t; oid:Pchar; indx:longint; raw_flag:dword; buf:pointer;
+  gnutls_x509_crt_get_issuer_dn_by_oid : function(cert:Tgnutls_x509_crt_t; oid:PAnsiChar; indx:longint; raw_flag:dword; buf:pointer;
       buf_size:Psize_t):longint;cdecl;
-  gnutls_x509_crt_get_dn : function(cert:Tgnutls_x509_crt_t; buf:Pchar; buf_size:Psize_t):longint;cdecl;
+  gnutls_x509_crt_get_dn : function(cert:Tgnutls_x509_crt_t; buf:PAnsiChar; buf_size:Psize_t):longint;cdecl;
   gnutls_x509_crt_get_dn2 : function(cert:Tgnutls_x509_crt_t; dn:Pgnutls_datum_t):longint;cdecl;
   gnutls_x509_crt_get_dn_oid : function(cert:Tgnutls_x509_crt_t; indx:longint; oid:pointer; oid_size:Psize_t):longint;cdecl;
-  gnutls_x509_crt_get_dn_by_oid : function(cert:Tgnutls_x509_crt_t; oid:Pchar; indx:longint; raw_flag:dword; buf:pointer;
+  gnutls_x509_crt_get_dn_by_oid : function(cert:Tgnutls_x509_crt_t; oid:PAnsiChar; indx:longint; raw_flag:dword; buf:pointer;
       buf_size:Psize_t):longint;cdecl;
-  gnutls_x509_crt_check_hostname : function(cert:Tgnutls_x509_crt_t; hostname:Pchar):longint;cdecl;
-  gnutls_x509_crt_check_hostname2 : function(cert:Tgnutls_x509_crt_t; hostname:Pchar; flags:dword):longint;cdecl;
-  gnutls_x509_crt_check_email : function(cert:Tgnutls_x509_crt_t; email:Pchar; flags:dword):longint;cdecl;
+  gnutls_x509_crt_check_hostname : function(cert:Tgnutls_x509_crt_t; hostname:PAnsiChar):longint;cdecl;
+  gnutls_x509_crt_check_hostname2 : function(cert:Tgnutls_x509_crt_t; hostname:PAnsiChar; flags:dword):longint;cdecl;
+  gnutls_x509_crt_check_email : function(cert:Tgnutls_x509_crt_t; email:PAnsiChar; flags:dword):longint;cdecl;
   gnutls_x509_crt_get_signature_algorithm : function(cert:Tgnutls_x509_crt_t):longint;cdecl;
-  gnutls_x509_crt_get_signature : function(cert:Tgnutls_x509_crt_t; sig:Pchar; sizeof_sig:Psize_t):longint;cdecl;
+  gnutls_x509_crt_get_signature : function(cert:Tgnutls_x509_crt_t; sig:PAnsiChar; sizeof_sig:Psize_t):longint;cdecl;
   gnutls_x509_crt_get_version : function(cert:Tgnutls_x509_crt_t):longint;cdecl;
   gnutls_x509_crt_get_key_id : function(crt:Tgnutls_x509_crt_t; flags:dword; output_data:Pbyte; output_data_size:Psize_t):longint;cdecl;
   gnutls_x509_crt_set_private_key_usage_period : function(crt:Tgnutls_x509_crt_t; activation:Ttime_t; expiration:Ttime_t):longint;cdecl;
@@ -1893,8 +1893,8 @@ var
   gnutls_x509_crt_get_authority_key_gn_serial : function(cert:Tgnutls_x509_crt_t; seq:dword; alt:pointer; alt_size:Psize_t; alt_type:Pdword;
       serial:pointer; serial_size:Psize_t; critical:Pdword):longint;cdecl;
   gnutls_x509_crt_get_subject_key_id : function(cert:Tgnutls_x509_crt_t; ret:pointer; ret_size:Psize_t; critical:Pdword):longint;cdecl;
-  gnutls_x509_crt_get_subject_unique_id : function(crt:Tgnutls_x509_crt_t; buf:Pchar; buf_size:Psize_t):longint;cdecl;
-  gnutls_x509_crt_get_issuer_unique_id : function(crt:Tgnutls_x509_crt_t; buf:Pchar; buf_size:Psize_t):longint;cdecl;
+  gnutls_x509_crt_get_subject_unique_id : function(crt:Tgnutls_x509_crt_t; buf:PAnsiChar; buf_size:Psize_t):longint;cdecl;
+  gnutls_x509_crt_get_issuer_unique_id : function(crt:Tgnutls_x509_crt_t; buf:PAnsiChar; buf_size:Psize_t):longint;cdecl;
   gnutls_x509_crt_set_pin_function : procedure(crt:Tgnutls_x509_crt_t; fn:Tgnutls_pin_callback_t; userdata:pointer);cdecl;
   gnutls_x509_crt_get_authority_info_access : function(crt:Tgnutls_x509_crt_t; seq:dword; what:longint; data:Pgnutls_datum_t; critical:Pdword):longint;cdecl;
   gnutls_x509_name_constraints_check : function(nc:Tgnutls_x509_name_constraints_t; _type:Tgnutls_x509_subject_alt_name_t; name:Pgnutls_datum_t):dword;cdecl;
@@ -1933,33 +1933,33 @@ var
   gnutls_x509_crt_get_key_usage : function(cert:Tgnutls_x509_crt_t; key_usage:Pdword; critical:Pdword):longint;cdecl;
   gnutls_x509_crt_set_key_usage : function(crt:Tgnutls_x509_crt_t; usage:dword):longint;cdecl;
   gnutls_x509_crt_set_authority_info_access : function(crt:Tgnutls_x509_crt_t; what:longint; data:Pgnutls_datum_t):longint;cdecl;
-  gnutls_x509_crt_get_proxy : function(cert:Tgnutls_x509_crt_t; critical:Pdword; pathlen:Plongint; policyLanguage:PPchar; policy:PPchar;
+  gnutls_x509_crt_get_proxy : function(cert:Tgnutls_x509_crt_t; critical:Pdword; pathlen:Plongint; policyLanguage:PPAnsiChar; policy:PPAnsiChar;
       sizeof_policy:Psize_t):longint;cdecl;
   gnutls_x509_policy_release : procedure(policy:Pgnutls_x509_policy_st);cdecl;
   gnutls_x509_crt_get_policy : function(crt:Tgnutls_x509_crt_t; indx:longint; policy:Pgnutls_x509_policy_st; critical:Pdword):longint;cdecl;
   gnutls_x509_crt_set_policy : function(crt:Tgnutls_x509_crt_t; policy:Pgnutls_x509_policy_st; critical:dword):longint;cdecl;
-  gnutls_x509_dn_oid_known : function(oid:Pchar):longint;cdecl;
-  gnutls_x509_dn_oid_name : function(oid:Pchar; flags:dword):Pchar;cdecl;
+  gnutls_x509_dn_oid_known : function(oid:PAnsiChar):longint;cdecl;
+  gnutls_x509_dn_oid_name : function(oid:PAnsiChar; flags:dword):PAnsiChar;cdecl;
   gnutls_x509_crt_get_extension_oid : function(cert:Tgnutls_x509_crt_t; indx:longint; oid:pointer; oid_size:Psize_t):longint;cdecl;
-  gnutls_x509_crt_get_extension_by_oid : function(cert:Tgnutls_x509_crt_t; oid:Pchar; indx:longint; buf:pointer; buf_size:Psize_t;
+  gnutls_x509_crt_get_extension_by_oid : function(cert:Tgnutls_x509_crt_t; oid:PAnsiChar; indx:longint; buf:pointer; buf_size:Psize_t;
       critical:Pdword):longint;cdecl;
   gnutls_x509_crq_get_signature_algorithm : function(crq:Tgnutls_x509_crq_t):longint;cdecl;
-  gnutls_x509_crq_get_extension_by_oid2 : function(crq:Tgnutls_x509_crq_t; oid:Pchar; indx:longint; output:Pgnutls_datum_t; critical:Pdword):longint;cdecl;
+  gnutls_x509_crq_get_extension_by_oid2 : function(crq:Tgnutls_x509_crq_t; oid:PAnsiChar; indx:longint; output:Pgnutls_datum_t; critical:Pdword):longint;cdecl;
   gnutls_x509_crt_get_extension_info : function(cert:Tgnutls_x509_crt_t; indx:longint; oid:pointer; oid_size:Psize_t; critical:Pdword):longint;cdecl;
   gnutls_x509_crt_get_extension_data : function(cert:Tgnutls_x509_crt_t; indx:longint; data:pointer; sizeof_data:Psize_t):longint;cdecl;
   gnutls_x509_crt_get_extension_data2 : function(cert:Tgnutls_x509_crt_t; indx:dword; data:Pgnutls_datum_t):longint;cdecl;
-  gnutls_x509_crt_set_extension_by_oid : function(crt:Tgnutls_x509_crt_t; oid:Pchar; buf:pointer; sizeof_buf:Tsize_t; critical:dword):longint;cdecl;
-  gnutls_x509_crt_set_dn : function(crt:Tgnutls_x509_crt_t; dn:Pchar; err:PPchar):longint;cdecl;
-  gnutls_x509_crt_set_dn_by_oid : function(crt:Tgnutls_x509_crt_t; oid:Pchar; raw_flag:dword; name:pointer; sizeof_name:dword):longint;cdecl;
-  gnutls_x509_crt_set_issuer_dn_by_oid : function(crt:Tgnutls_x509_crt_t; oid:Pchar; raw_flag:dword; name:pointer; sizeof_name:dword):longint;cdecl;
-  gnutls_x509_crt_set_issuer_dn : function(crt:Tgnutls_x509_crt_t; dn:Pchar; err:PPchar):longint;cdecl;
+  gnutls_x509_crt_set_extension_by_oid : function(crt:Tgnutls_x509_crt_t; oid:PAnsiChar; buf:pointer; sizeof_buf:Tsize_t; critical:dword):longint;cdecl;
+  gnutls_x509_crt_set_dn : function(crt:Tgnutls_x509_crt_t; dn:PAnsiChar; err:PPAnsiChar):longint;cdecl;
+  gnutls_x509_crt_set_dn_by_oid : function(crt:Tgnutls_x509_crt_t; oid:PAnsiChar; raw_flag:dword; name:pointer; sizeof_name:dword):longint;cdecl;
+  gnutls_x509_crt_set_issuer_dn_by_oid : function(crt:Tgnutls_x509_crt_t; oid:PAnsiChar; raw_flag:dword; name:pointer; sizeof_name:dword):longint;cdecl;
+  gnutls_x509_crt_set_issuer_dn : function(crt:Tgnutls_x509_crt_t; dn:PAnsiChar; err:PPAnsiChar):longint;cdecl;
   gnutls_x509_crt_set_version : function(crt:Tgnutls_x509_crt_t; version:dword):longint;cdecl;
   gnutls_x509_crt_set_key : function(crt:Tgnutls_x509_crt_t; key:Tgnutls_x509_privkey_t):longint;cdecl;
   gnutls_x509_crt_set_ca_status : function(crt:Tgnutls_x509_crt_t; ca:dword):longint;cdecl;
   gnutls_x509_crt_set_basic_constraints : function(crt:Tgnutls_x509_crt_t; ca:dword; pathLenConstraint:longint):longint;cdecl;
   gnutls_x509_crt_set_subject_unique_id : function(cert:Tgnutls_x509_crt_t; id:pointer; id_size:Tsize_t):longint;cdecl;
   gnutls_x509_crt_set_issuer_unique_id : function(cert:Tgnutls_x509_crt_t; id:pointer; id_size:Tsize_t):longint;cdecl;
-  gnutls_x509_crt_set_subject_alternative_name : function(crt:Tgnutls_x509_crt_t; _type:Tgnutls_x509_subject_alt_name_t; data_string:Pchar):longint;cdecl;
+  gnutls_x509_crt_set_subject_alternative_name : function(crt:Tgnutls_x509_crt_t; _type:Tgnutls_x509_subject_alt_name_t; data_string:PAnsiChar):longint;cdecl;
   gnutls_x509_crt_set_subject_alt_name : function(crt:Tgnutls_x509_crt_t; _type:Tgnutls_x509_subject_alt_name_t; data:pointer; data_size:dword; flags:dword):longint;cdecl;
   gnutls_x509_crt_set_issuer_alt_name : function(crt:Tgnutls_x509_crt_t; _type:Tgnutls_x509_subject_alt_name_t; data:pointer; data_size:dword; flags:dword):longint;cdecl;
   gnutls_x509_crt_sign : function(crt:Tgnutls_x509_crt_t; issuer:Tgnutls_x509_crt_t; issuer_key:Tgnutls_x509_privkey_t):longint;cdecl;
@@ -1969,14 +1969,14 @@ var
   gnutls_x509_crt_set_serial : function(cert:Tgnutls_x509_crt_t; serial:pointer; serial_size:Tsize_t):longint;cdecl;
   gnutls_x509_crt_set_subject_key_id : function(cert:Tgnutls_x509_crt_t; id:pointer; id_size:Tsize_t):longint;cdecl;
   gnutls_x509_crt_set_proxy_dn : function(crt:Tgnutls_x509_crt_t; eecrt:Tgnutls_x509_crt_t; raw_flag:dword; name:pointer; sizeof_name:dword):longint;cdecl;
-  gnutls_x509_crt_set_proxy : function(crt:Tgnutls_x509_crt_t; pathLenConstraint:longint; policyLanguage:Pchar; policy:Pchar; sizeof_policy:Tsize_t):longint;cdecl;
+  gnutls_x509_crt_set_proxy : function(crt:Tgnutls_x509_crt_t; pathLenConstraint:longint; policyLanguage:PAnsiChar; policy:PAnsiChar; sizeof_policy:Tsize_t):longint;cdecl;
   gnutls_x509_crt_print : function(cert:Tgnutls_x509_crt_t; format:Tgnutls_certificate_print_formats_t; outd:Pgnutls_datum_t):longint;cdecl;
   gnutls_x509_crl_print : function(crl:Tgnutls_x509_crl_t; format:Tgnutls_certificate_print_formats_t; outd:Pgnutls_datum_t):longint;cdecl;
   gnutls_x509_crt_get_raw_issuer_dn : function(cert:Tgnutls_x509_crt_t; start:Pgnutls_datum_t):longint;cdecl;
   gnutls_x509_crt_get_raw_dn : function(cert:Tgnutls_x509_crt_t; start:Pgnutls_datum_t):longint;cdecl;
-  gnutls_x509_rdn_get : function(idn:Pgnutls_datum_t; buf:Pchar; sizeof_buf:Psize_t):longint;cdecl;
+  gnutls_x509_rdn_get : function(idn:Pgnutls_datum_t; buf:PAnsiChar; sizeof_buf:Psize_t):longint;cdecl;
   gnutls_x509_rdn_get_oid : function(idn:Pgnutls_datum_t; indx:longint; buf:pointer; sizeof_buf:Psize_t):longint;cdecl;
-  gnutls_x509_rdn_get_by_oid : function(idn:Pgnutls_datum_t; oid:Pchar; indx:longint; raw_flag:dword; buf:pointer;
+  gnutls_x509_rdn_get_by_oid : function(idn:Pgnutls_datum_t; oid:PAnsiChar; indx:longint; raw_flag:dword; buf:pointer;
       sizeof_buf:Psize_t):longint;cdecl;
   gnutls_x509_crt_get_subject : function(cert:Tgnutls_x509_crt_t; dn:Pgnutls_x509_dn_t):longint;cdecl;
   gnutls_x509_crt_get_issuer : function(cert:Tgnutls_x509_crt_t; dn:Pgnutls_x509_dn_t):longint;cdecl;
@@ -1993,13 +1993,13 @@ var
   gnutls_x509_crl_export : function(crl:Tgnutls_x509_crl_t; format:Tgnutls_x509_crt_fmt_t; output_data:pointer; output_data_size:Psize_t):longint;cdecl;
   gnutls_x509_crl_export2 : function(crl:Tgnutls_x509_crl_t; format:Tgnutls_x509_crt_fmt_t; outd:Pgnutls_datum_t):longint;cdecl;
   gnutls_x509_crl_get_raw_issuer_dn : function(crl:Tgnutls_x509_crl_t; dn:Pgnutls_datum_t):longint;cdecl;
-  gnutls_x509_crl_get_issuer_dn : function(crl:Tgnutls_x509_crl_t; buf:Pchar; sizeof_buf:Psize_t):longint;cdecl;
+  gnutls_x509_crl_get_issuer_dn : function(crl:Tgnutls_x509_crl_t; buf:PAnsiChar; sizeof_buf:Psize_t):longint;cdecl;
   gnutls_x509_crl_get_issuer_dn2 : function(crl:Tgnutls_x509_crl_t; dn:Pgnutls_datum_t):longint;cdecl;
-  gnutls_x509_crl_get_issuer_dn_by_oid : function(crl:Tgnutls_x509_crl_t; oid:Pchar; indx:longint; raw_flag:dword; buf:pointer;
+  gnutls_x509_crl_get_issuer_dn_by_oid : function(crl:Tgnutls_x509_crl_t; oid:PAnsiChar; indx:longint; raw_flag:dword; buf:pointer;
       sizeof_buf:Psize_t):longint;cdecl;
   gnutls_x509_crl_get_dn_oid : function(crl:Tgnutls_x509_crl_t; indx:longint; oid:pointer; sizeof_oid:Psize_t):longint;cdecl;
   gnutls_x509_crl_get_signature_algorithm : function(crl:Tgnutls_x509_crl_t):longint;cdecl;
-  gnutls_x509_crl_get_signature : function(crl:Tgnutls_x509_crl_t; sig:Pchar; sizeof_sig:Psize_t):longint;cdecl;
+  gnutls_x509_crl_get_signature : function(crl:Tgnutls_x509_crl_t; sig:PAnsiChar; sizeof_sig:Psize_t):longint;cdecl;
   gnutls_x509_crl_get_version : function(crl:Tgnutls_x509_crl_t):longint;cdecl;
   gnutls_x509_crl_get_this_update : function(crl:Tgnutls_x509_crl_t):Ttime_t;cdecl;
   gnutls_x509_crl_get_next_update : function(crl:Tgnutls_x509_crl_t):Ttime_t;cdecl;
@@ -2035,19 +2035,19 @@ var
   gnutls_x509_crt_get_fingerprint : function(cert:Tgnutls_x509_crt_t; algo:Tgnutls_digest_algorithm_t; buf:pointer; buf_size:Psize_t):longint;cdecl;
   gnutls_x509_crt_get_key_purpose_oid : function(cert:Tgnutls_x509_crt_t; indx:longint; oid:pointer; oid_size:Psize_t; critical:Pdword):longint;cdecl;
   gnutls_x509_crt_set_key_purpose_oid : function(cert:Tgnutls_x509_crt_t; oid:pointer; critical:dword):longint;cdecl;
-  gnutls_pkcs_schema_get_name : function(schema:dword):Pchar;cdecl;
-  gnutls_pkcs_schema_get_oid : function(schema:dword):Pchar;cdecl;
+  gnutls_pkcs_schema_get_name : function(schema:dword):PAnsiChar;cdecl;
+  gnutls_pkcs_schema_get_oid : function(schema:dword):PAnsiChar;cdecl;
   gnutls_x509_privkey_init : function(key:Pgnutls_x509_privkey_t):longint;cdecl;
   gnutls_x509_privkey_deinit : procedure(key:Tgnutls_x509_privkey_t);cdecl;
   gnutls_x509_privkey_sec_param : function(key:Tgnutls_x509_privkey_t):Tgnutls_sec_param_t;cdecl;
   gnutls_x509_privkey_set_pin_function : procedure(key:Tgnutls_x509_privkey_t; fn:Tgnutls_pin_callback_t; userdata:pointer);cdecl;
   gnutls_x509_privkey_cpy : function(dst:Tgnutls_x509_privkey_t; src:Tgnutls_x509_privkey_t):longint;cdecl;
   gnutls_x509_privkey_import : function(key:Tgnutls_x509_privkey_t; data:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t):longint;cdecl;
-  gnutls_x509_privkey_import_pkcs8 : function(key:Tgnutls_x509_privkey_t; data:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t; password:Pchar; flags:dword):longint;cdecl;
-  gnutls_x509_privkey_import_openssl : function(key:Tgnutls_x509_privkey_t; data:Pgnutls_datum_t; password:Pchar):longint;cdecl;
+  gnutls_x509_privkey_import_pkcs8 : function(key:Tgnutls_x509_privkey_t; data:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t; password:PAnsiChar; flags:dword):longint;cdecl;
+  gnutls_x509_privkey_import_openssl : function(key:Tgnutls_x509_privkey_t; data:Pgnutls_datum_t; password:PAnsiChar):longint;cdecl;
   gnutls_pkcs8_info : function(data:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t; schema:Pdword; cipher:Pdword; salt:pointer;
-      salt_size:Pdword; iter_count:Pdword; oid:PPchar):longint;cdecl;
-  gnutls_x509_privkey_import2 : function(key:Tgnutls_x509_privkey_t; data:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t; password:Pchar; flags:dword):longint;cdecl;
+      salt_size:Pdword; iter_count:Pdword; oid:PPAnsiChar):longint;cdecl;
+  gnutls_x509_privkey_import2 : function(key:Tgnutls_x509_privkey_t; data:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t; password:PAnsiChar; flags:dword):longint;cdecl;
   gnutls_x509_privkey_import_rsa_raw : function(key:Tgnutls_x509_privkey_t; m:Pgnutls_datum_t; e:Pgnutls_datum_t; d:Pgnutls_datum_t; p:Pgnutls_datum_t;
       q:Pgnutls_datum_t; u:Pgnutls_datum_t):longint;cdecl;
   gnutls_x509_privkey_import_rsa_raw2 : function(key:Tgnutls_x509_privkey_t; m:Pgnutls_datum_t; e:Pgnutls_datum_t; d:Pgnutls_datum_t; p:Pgnutls_datum_t;
@@ -2065,9 +2065,9 @@ var
   gnutls_x509_privkey_verify_params : function(key:Tgnutls_x509_privkey_t):longint;cdecl;
   gnutls_x509_privkey_export : function(key:Tgnutls_x509_privkey_t; format:Tgnutls_x509_crt_fmt_t; output_data:pointer; output_data_size:Psize_t):longint;cdecl;
   gnutls_x509_privkey_export2 : function(key:Tgnutls_x509_privkey_t; format:Tgnutls_x509_crt_fmt_t; outd:Pgnutls_datum_t):longint;cdecl;
-  gnutls_x509_privkey_export_pkcs8 : function(key:Tgnutls_x509_privkey_t; format:Tgnutls_x509_crt_fmt_t; password:Pchar; flags:dword; output_data:pointer;
+  gnutls_x509_privkey_export_pkcs8 : function(key:Tgnutls_x509_privkey_t; format:Tgnutls_x509_crt_fmt_t; password:PAnsiChar; flags:dword; output_data:pointer;
       output_data_size:Psize_t):longint;cdecl;
-  gnutls_x509_privkey_export2_pkcs8 : function(key:Tgnutls_x509_privkey_t; format:Tgnutls_x509_crt_fmt_t; password:Pchar; flags:dword; outd:Pgnutls_datum_t):longint;cdecl;
+  gnutls_x509_privkey_export2_pkcs8 : function(key:Tgnutls_x509_privkey_t; format:Tgnutls_x509_crt_fmt_t; password:PAnsiChar; flags:dword; outd:Pgnutls_datum_t):longint;cdecl;
   gnutls_x509_privkey_export_rsa_raw2 : function(key:Tgnutls_x509_privkey_t; m:Pgnutls_datum_t; e:Pgnutls_datum_t; d:Pgnutls_datum_t; p:Pgnutls_datum_t;
       q:Pgnutls_datum_t; u:Pgnutls_datum_t; e1:Pgnutls_datum_t; e2:Pgnutls_datum_t):longint;cdecl;
   gnutls_x509_privkey_export_rsa_raw : function(key:Tgnutls_x509_privkey_t; m:Pgnutls_datum_t; e:Pgnutls_datum_t; d:Pgnutls_datum_t; p:Pgnutls_datum_t;
@@ -2082,20 +2082,20 @@ var
   gnutls_x509_crq_deinit : procedure(crq:Tgnutls_x509_crq_t);cdecl;
   gnutls_x509_crq_import : function(crq:Tgnutls_x509_crq_t; data:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t):longint;cdecl;
   gnutls_x509_crq_get_private_key_usage_period : function(cert:Tgnutls_x509_crq_t; activation:Ptime_t; expiration:Ptime_t; critical:Pdword):longint;cdecl;
-  gnutls_x509_crq_get_dn : function(crq:Tgnutls_x509_crq_t; buf:Pchar; sizeof_buf:Psize_t):longint;cdecl;
+  gnutls_x509_crq_get_dn : function(crq:Tgnutls_x509_crq_t; buf:PAnsiChar; sizeof_buf:Psize_t):longint;cdecl;
   gnutls_x509_crq_get_dn2 : function(crq:Tgnutls_x509_crq_t; dn:Pgnutls_datum_t):longint;cdecl;
   gnutls_x509_crq_get_dn_oid : function(crq:Tgnutls_x509_crq_t; indx:longint; oid:pointer; sizeof_oid:Psize_t):longint;cdecl;
-  gnutls_x509_crq_get_dn_by_oid : function(crq:Tgnutls_x509_crq_t; oid:Pchar; indx:longint; raw_flag:dword; buf:pointer;
+  gnutls_x509_crq_get_dn_by_oid : function(crq:Tgnutls_x509_crq_t; oid:PAnsiChar; indx:longint; raw_flag:dword; buf:pointer;
       sizeof_buf:Psize_t):longint;cdecl;
-  gnutls_x509_crq_set_dn : function(crq:Tgnutls_x509_crq_t; dn:Pchar; err:PPchar):longint;cdecl;
-  gnutls_x509_crq_set_dn_by_oid : function(crq:Tgnutls_x509_crq_t; oid:Pchar; raw_flag:dword; data:pointer; sizeof_data:dword):longint;cdecl;
+  gnutls_x509_crq_set_dn : function(crq:Tgnutls_x509_crq_t; dn:PAnsiChar; err:PPAnsiChar):longint;cdecl;
+  gnutls_x509_crq_set_dn_by_oid : function(crq:Tgnutls_x509_crq_t; oid:PAnsiChar; raw_flag:dword; data:pointer; sizeof_data:dword):longint;cdecl;
   gnutls_x509_crq_set_version : function(crq:Tgnutls_x509_crq_t; version:dword):longint;cdecl;
   gnutls_x509_crq_get_version : function(crq:Tgnutls_x509_crq_t):longint;cdecl;
   gnutls_x509_crq_set_key : function(crq:Tgnutls_x509_crq_t; key:Tgnutls_x509_privkey_t):longint;cdecl;
-  gnutls_x509_crq_set_challenge_password : function(crq:Tgnutls_x509_crq_t; pass:Pchar):longint;cdecl;
-  gnutls_x509_crq_get_challenge_password : function(crq:Tgnutls_x509_crq_t; pass:Pchar; sizeof_pass:Psize_t):longint;cdecl;
-  gnutls_x509_crq_set_attribute_by_oid : function(crq:Tgnutls_x509_crq_t; oid:Pchar; buf:pointer; sizeof_buf:Tsize_t):longint;cdecl;
-  gnutls_x509_crq_get_attribute_by_oid : function(crq:Tgnutls_x509_crq_t; oid:Pchar; indx:longint; buf:pointer; sizeof_buf:Psize_t):longint;cdecl;
+  gnutls_x509_crq_set_challenge_password : function(crq:Tgnutls_x509_crq_t; pass:PAnsiChar):longint;cdecl;
+  gnutls_x509_crq_get_challenge_password : function(crq:Tgnutls_x509_crq_t; pass:PAnsiChar; sizeof_pass:Psize_t):longint;cdecl;
+  gnutls_x509_crq_set_attribute_by_oid : function(crq:Tgnutls_x509_crq_t; oid:PAnsiChar; buf:pointer; sizeof_buf:Tsize_t):longint;cdecl;
+  gnutls_x509_crq_get_attribute_by_oid : function(crq:Tgnutls_x509_crq_t; oid:PAnsiChar; indx:longint; buf:pointer; sizeof_buf:Psize_t):longint;cdecl;
   gnutls_x509_crq_export : function(crq:Tgnutls_x509_crq_t; format:Tgnutls_x509_crt_fmt_t; output_data:pointer; output_data_size:Psize_t):longint;cdecl;
   gnutls_x509_crq_export2 : function(crq:Tgnutls_x509_crq_t; format:Tgnutls_x509_crt_fmt_t; outd:Pgnutls_datum_t):longint;cdecl;
   gnutls_x509_crt_set_crq : function(crt:Tgnutls_x509_crt_t; crq:Tgnutls_x509_crq_t):longint;cdecl;
@@ -2120,9 +2120,9 @@ var
   gnutls_x509_crq_get_subject_alt_name : function(crq:Tgnutls_x509_crq_t; seq:dword; ret:pointer; ret_size:Psize_t; ret_type:Pdword;
       critical:Pdword):longint;cdecl;
   gnutls_x509_crq_get_subject_alt_othername_oid : function(crq:Tgnutls_x509_crq_t; seq:dword; ret:pointer; ret_size:Psize_t):longint;cdecl;
-  gnutls_x509_crq_get_extension_by_oid : function(crq:Tgnutls_x509_crq_t; oid:Pchar; indx:longint; buf:pointer; sizeof_buf:Psize_t;
+  gnutls_x509_crq_get_extension_by_oid : function(crq:Tgnutls_x509_crq_t; oid:PAnsiChar; indx:longint; buf:pointer; sizeof_buf:Psize_t;
       critical:Pdword):longint;cdecl;
-  gnutls_x509_crt_get_extension_by_oid2 : function(cert:Tgnutls_x509_crt_t; oid:Pchar; indx:longint; output:Pgnutls_datum_t; critical:Pdword):longint;cdecl;
+  gnutls_x509_crt_get_extension_by_oid2 : function(cert:Tgnutls_x509_crt_t; oid:PAnsiChar; indx:longint; output:Pgnutls_datum_t; critical:Pdword):longint;cdecl;
   gnutls_x509_trust_list_init : function(list:Pgnutls_x509_trust_list_t; size:dword):longint;cdecl;
   gnutls_x509_trust_list_deinit : procedure(list:Tgnutls_x509_trust_list_t; all:dword);cdecl;
   gnutls_x509_trust_list_get_issuer : function(list:Tgnutls_x509_trust_list_t; cert:Tgnutls_x509_crt_t; issuer:Pgnutls_x509_crt_t; flags:dword):longint;cdecl;
@@ -2142,11 +2142,11 @@ var
       func:Tgnutls_verify_output_function):longint;cdecl;
   gnutls_x509_trust_list_add_trust_mem : function(list:Tgnutls_x509_trust_list_t; cas:Pgnutls_datum_t; crls:Pgnutls_datum_t; _type:Tgnutls_x509_crt_fmt_t; tl_flags:dword;
       tl_vflags:dword):longint;cdecl;
-  gnutls_x509_trust_list_add_trust_file : function(list:Tgnutls_x509_trust_list_t; ca_file:Pchar; crl_file:Pchar; _type:Tgnutls_x509_crt_fmt_t; tl_flags:dword;
+  gnutls_x509_trust_list_add_trust_file : function(list:Tgnutls_x509_trust_list_t; ca_file:PAnsiChar; crl_file:PAnsiChar; _type:Tgnutls_x509_crt_fmt_t; tl_flags:dword;
       tl_vflags:dword):longint;cdecl;
-  gnutls_x509_trust_list_add_trust_dir : function(list:Tgnutls_x509_trust_list_t; ca_dir:Pchar; crl_dir:Pchar; _type:Tgnutls_x509_crt_fmt_t; tl_flags:dword;
+  gnutls_x509_trust_list_add_trust_dir : function(list:Tgnutls_x509_trust_list_t; ca_dir:PAnsiChar; crl_dir:PAnsiChar; _type:Tgnutls_x509_crt_fmt_t; tl_flags:dword;
       tl_vflags:dword):longint;cdecl;
-  gnutls_x509_trust_list_remove_trust_file : function(list:Tgnutls_x509_trust_list_t; ca_file:Pchar; _type:Tgnutls_x509_crt_fmt_t):longint;cdecl;
+  gnutls_x509_trust_list_remove_trust_file : function(list:Tgnutls_x509_trust_list_t; ca_file:PAnsiChar; _type:Tgnutls_x509_crt_fmt_t):longint;cdecl;
   gnutls_x509_trust_list_remove_trust_mem : function(list:Tgnutls_x509_trust_list_t; cas:Pgnutls_datum_t; _type:Tgnutls_x509_crt_fmt_t):longint;cdecl;
   gnutls_x509_trust_list_add_system_trust : function(list:Tgnutls_x509_trust_list_t; tl_flags:dword; tl_vflags:dword):longint;cdecl;
   gnutls_certificate_set_trust_list : procedure(res:Tgnutls_certificate_credentials_t; tlist:Tgnutls_x509_trust_list_t; flags:dword);cdecl;
@@ -2175,9 +2175,9 @@ var
   gnutls_pkcs7_verify_direct : function(pkcs7:Tgnutls_pkcs7_t; signer:Tgnutls_x509_crt_t; idx:dword; data:Pgnutls_datum_t; flags:dword):longint;cdecl;
   gnutls_pkcs7_verify : function(pkcs7:Tgnutls_pkcs7_t; tl:Tgnutls_x509_trust_list_t; vdata:Pgnutls_typed_vdata_st; vdata_size:dword; idx:dword;
       data:Pgnutls_datum_t; flags:dword):longint;cdecl;
-  gnutls_pkcs7_add_attr : function(list:Pgnutls_pkcs7_attrs_t; oid:Pchar; data:Pgnutls_datum_t; flags:dword):longint;cdecl;
+  gnutls_pkcs7_add_attr : function(list:Pgnutls_pkcs7_attrs_t; oid:PAnsiChar; data:Pgnutls_datum_t; flags:dword):longint;cdecl;
   gnutls_pkcs7_attrs_deinit : procedure(list:Tgnutls_pkcs7_attrs_t);cdecl;
-  gnutls_pkcs7_get_attr : function(list:Tgnutls_pkcs7_attrs_t; idx:dword; oid:PPchar; data:Pgnutls_datum_t; flags:dword):longint;cdecl;
+  gnutls_pkcs7_get_attr : function(list:Tgnutls_pkcs7_attrs_t; idx:dword; oid:PPAnsiChar; data:Pgnutls_datum_t; flags:dword):longint;cdecl;
   gnutls_pkcs7_sign : function(pkcs7:Tgnutls_pkcs7_t; signer:Tgnutls_x509_crt_t; signer_key:Tgnutls_privkey_t; data:Pgnutls_datum_t; signed_attrs:Tgnutls_pkcs7_attrs_t;
       unsigned_attrs:Tgnutls_pkcs7_attrs_t; dig:Tgnutls_digest_algorithm_t; flags:dword):longint;cdecl;
   gnutls_pkcs7_get_crt_raw2 : function(pkcs7:Tgnutls_pkcs7_t; indx:longint; cert:Pgnutls_datum_t):longint;cdecl;
@@ -2198,9 +2198,9 @@ var
   gnutls_pubkey_import_openpgp_raw : function(pkey:Tgnutls_pubkey_t; data:Pgnutls_datum_t; format:Tgnutls_openpgp_crt_fmt_t; keyid:Tgnutls_openpgp_keyid_t; flags:dword):longint;cdecl;
   gnutls_pubkey_import_x509_raw : function(pkey:Tgnutls_pubkey_t; data:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t; flags:dword):longint;cdecl;
   gnutls_pubkey_import_privkey : function(key:Tgnutls_pubkey_t; pkey:Tgnutls_privkey_t; usage:dword; flags:dword):longint;cdecl;
-  gnutls_pubkey_import_tpm_url : function(pkey:Tgnutls_pubkey_t; url:Pchar; srk_password:Pchar; flags:dword):longint;cdecl;
-  gnutls_pubkey_import_url : function(key:Tgnutls_pubkey_t; url:Pchar; flags:dword):longint;cdecl;
-  gnutls_pubkey_import_tpm_raw : function(pkey:Tgnutls_pubkey_t; fdata:Pgnutls_datum_t; format:Tgnutls_tpmkey_fmt_t; srk_password:Pchar; flags:dword):longint;cdecl;
+  gnutls_pubkey_import_tpm_url : function(pkey:Tgnutls_pubkey_t; url:PAnsiChar; srk_password:PAnsiChar; flags:dword):longint;cdecl;
+  gnutls_pubkey_import_url : function(key:Tgnutls_pubkey_t; url:PAnsiChar; flags:dword):longint;cdecl;
+  gnutls_pubkey_import_tpm_raw : function(pkey:Tgnutls_pubkey_t; fdata:Pgnutls_datum_t; format:Tgnutls_tpmkey_fmt_t; srk_password:PAnsiChar; flags:dword):longint;cdecl;
   gnutls_pubkey_get_preferred_hash_algorithm : function(key:Tgnutls_pubkey_t; hash:Pgnutls_digest_algorithm_t; mand:Pdword):longint;cdecl;
   gnutls_pubkey_export_rsa_raw : function(key:Tgnutls_pubkey_t; m:Pgnutls_datum_t; e:Pgnutls_datum_t):longint;cdecl;
   gnutls_pubkey_export_rsa_raw2 : function(key:Tgnutls_pubkey_t; m:Pgnutls_datum_t; e:Pgnutls_datum_t; flags:dword):longint;cdecl;
@@ -2251,12 +2251,12 @@ var
   gnutls_privkey_export_x509 : function(pkey:Tgnutls_privkey_t; key:Pgnutls_x509_privkey_t):longint;cdecl;
   gnutls_privkey_export_openpgp : function(pkey:Tgnutls_privkey_t; key:Pgnutls_openpgp_privkey_t):longint;cdecl;
   gnutls_privkey_export_pkcs11 : function(pkey:Tgnutls_privkey_t; key:Pgnutls_pkcs11_privkey_t):longint;cdecl;
-  gnutls_privkey_import_openpgp_raw : function(pkey:Tgnutls_privkey_t; data:Pgnutls_datum_t; format:Tgnutls_openpgp_crt_fmt_t; keyid:Tgnutls_openpgp_keyid_t; password:Pchar):longint;cdecl;
-  gnutls_privkey_import_x509_raw : function(pkey:Tgnutls_privkey_t; data:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t; password:Pchar; flags:dword):longint;cdecl;
-  gnutls_privkey_import_tpm_raw : function(pkey:Tgnutls_privkey_t; fdata:Pgnutls_datum_t; format:Tgnutls_tpmkey_fmt_t; srk_password:Pchar; key_password:Pchar;
+  gnutls_privkey_import_openpgp_raw : function(pkey:Tgnutls_privkey_t; data:Pgnutls_datum_t; format:Tgnutls_openpgp_crt_fmt_t; keyid:Tgnutls_openpgp_keyid_t; password:PAnsiChar):longint;cdecl;
+  gnutls_privkey_import_x509_raw : function(pkey:Tgnutls_privkey_t; data:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t; password:PAnsiChar; flags:dword):longint;cdecl;
+  gnutls_privkey_import_tpm_raw : function(pkey:Tgnutls_privkey_t; fdata:Pgnutls_datum_t; format:Tgnutls_tpmkey_fmt_t; srk_password:PAnsiChar; key_password:PAnsiChar;
       flags:dword):longint;cdecl;
-  gnutls_privkey_import_tpm_url : function(pkey:Tgnutls_privkey_t; url:Pchar; srk_password:Pchar; key_password:Pchar; flags:dword):longint;cdecl;
-  gnutls_privkey_import_url : function(key:Tgnutls_privkey_t; url:Pchar; flags:dword):longint;cdecl;
+  gnutls_privkey_import_tpm_url : function(pkey:Tgnutls_privkey_t; url:PAnsiChar; srk_password:PAnsiChar; key_password:PAnsiChar; flags:dword):longint;cdecl;
+  gnutls_privkey_import_url : function(key:Tgnutls_privkey_t; url:PAnsiChar; flags:dword):longint;cdecl;
   gnutls_privkey_import_ext : function(pkey:Tgnutls_privkey_t; pk:Tgnutls_pk_algorithm_t; userdata:pointer; sign_func:Tgnutls_privkey_sign_func; decrypt_func:Tgnutls_privkey_decrypt_func;
       flags:dword):longint;cdecl;
   gnutls_privkey_import_ext2 : function(pkey:Tgnutls_privkey_t; pk:Tgnutls_pk_algorithm_t; userdata:pointer; sign_func:Tgnutls_privkey_sign_func; decrypt_func:Tgnutls_privkey_decrypt_func;
@@ -2298,7 +2298,7 @@ var
   gnutls_pcert_import_x509_list : function(pcert:Pgnutls_pcert_st; crt:Pgnutls_x509_crt_t; ncrt:Pdword; flags:dword):longint;cdecl;
   gnutls_pcert_export_x509 : function(pcert:Pgnutls_pcert_st; crt:Pgnutls_x509_crt_t):longint;cdecl;
   gnutls_pcert_list_import_x509_raw : function(pcerts:Pgnutls_pcert_st; pcert_max:Pdword; data:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t; flags:dword):longint;cdecl;
-  gnutls_pcert_list_import_x509_file : function(pcert_list:Pgnutls_pcert_st; pcert_list_size:Pdword; afile:Pchar; format:Tgnutls_x509_crt_fmt_t; pin_fn:Tgnutls_pin_callback_t;
+  gnutls_pcert_list_import_x509_file : function(pcert_list:Pgnutls_pcert_st; pcert_list_size:Pdword; afile:PAnsiChar; format:Tgnutls_x509_crt_fmt_t; pin_fn:Tgnutls_pin_callback_t;
       pin_fn_userdata:pointer; flags:dword):longint;cdecl;
   gnutls_pcert_import_x509_raw : function(pcert:Pgnutls_pcert_st; cert:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t; flags:dword):longint;cdecl;
   gnutls_pcert_import_openpgp_raw : function(pcert:Pgnutls_pcert_st; cert:Pgnutls_datum_t; format:Tgnutls_openpgp_crt_fmt_t; keyid:Tgnutls_openpgp_keyid_t; flags:dword):longint;cdecl;
@@ -2309,7 +2309,7 @@ var
   gnutls_pcert_import_rawpk_raw : function(pcert:Pgnutls_pcert_st; rawpubkey:Pgnutls_datum_t; format:Tgnutls_x509_crt_fmt_t; key_usage:dword; flags:dword):longint;cdecl;
   gnutls_certificate_set_retrieve_function2 : procedure(cred:Tgnutls_certificate_credentials_t; func:Pgnutls_certificate_retrieve_function2);cdecl;
   gnutls_certificate_set_retrieve_function3 : procedure(cred:Tgnutls_certificate_credentials_t; func:Pgnutls_certificate_retrieve_function3);cdecl;
-  gnutls_certificate_set_key : function(res:Tgnutls_certificate_credentials_t; names:PPchar; names_size:longint; pcert_list:Pgnutls_pcert_st; pcert_list_size:longint;      key:Tgnutls_privkey_t):longint;cdecl;
+  gnutls_certificate_set_key : function(res:Tgnutls_certificate_credentials_t; names:PPAnsiChar; names_size:longint; pcert_list:Pgnutls_pcert_st; pcert_list_size:longint;      key:Tgnutls_privkey_t):longint;cdecl;
   gnutls_pubkey_print : function(pubkey:Tgnutls_pubkey_t; format:Tgnutls_certificate_print_formats_t; aout:Pgnutls_datum_t):longint;cdecl;
 
 

packages/gnutls/src/gnutlssockets.pp

@@ -20,13 +20,13 @@ Type
   Private
     FSession : tgnutls_session_t;
     FCred : tgnutls_certificate_credentials_t;
-    FGNUTLSLastErrorString: string;
+    FGNUTLSLastErrorString: ansistring;
     FGNUTLSLastError : Integer;
-    FCurrentHostName : String;
-    FCurrentCypherlist : String;
+    FCurrentHostName : AnsiString;
+    FCurrentCypherlist : AnsiString;
     function LoadTrustedCertificate(aCertData: TSSLData): Boolean;
     function MaybeAllocateCredentials: Boolean;
-    procedure SetGNUTLSLastErrorString(AValue: string);
+    procedure SetGNUTLSLastErrorString(AValue: Ansistring);
     function SetTrustedCertificateDir(const aFileName: string): Boolean;
   Protected
     function LoadCertificate(aData, aKey: TSSLData): Boolean;
@@ -55,7 +55,7 @@ Type
     function BytesAvailable: Integer; override;
     // Result of last CheckSSL call.
     Function GNUTLSLastError: integer;
-    property GNUTLSLastErrorString: string read FGNUTLSLastErrorString write SetGNUTLSLastErrorString;
+    property GNUTLSLastErrorString: Ansistring read FGNUTLSLastErrorString write SetGNUTLSLastErrorString;
   end;
 
   { TGNUTLSX509Certificate }
@@ -260,7 +260,7 @@ begin
   Result:=TGNUTLSX509Certificate.Create;
 end;
 
-procedure TGNUTLSSocketHandler.SetGNUTLSLastErrorString(AValue: string);
+procedure TGNUTLSSocketHandler.SetGNUTLSLastErrorString(AValue: Ansistring);
 begin
   if FGNUTLSLastErrorString=AValue then Exit;
   FGNUTLSLastErrorString:=AValue;
@@ -280,11 +280,11 @@ begin
     FCurrentHostName:=(Socket as TInetSocket).Host;
     if SendHostAsSNI then
       begin
-      Result:=CheckOK(gnutls_server_name_set(FSession, GNUTLS_NAME_DNS,pchar(FCurrentHostName), length(FCurrentHostName)));
+      Result:=CheckOK(gnutls_server_name_set(FSession, GNUTLS_NAME_DNS,PAnsiChar(FCurrentHostName), length(FCurrentHostName)));
       if not Result then
         exit;
       end;
-    gnutls_session_set_verify_cert(Fsession,pchar(FCurrentHostName),0);
+    gnutls_session_set_verify_cert(Fsession,PAnsiChar(FCurrentHostName),0);
     end;
   if Not Result then
     exit;
@@ -303,7 +303,7 @@ end;
 Function TGNUTLSSocketHandler.FetchErrorInfo : Boolean;
 
 Var
-  P : Pchar;
+  P : PAnsiChar;
 
 begin
   FGNUTLSLastErrorString:='';
@@ -352,14 +352,16 @@ Const
 
 Var
   flags :Cint;
-  errPtr : Pchar;
+  errPtr : PAnsiChar;
+  A : AnsiString;
 
 begin
   Flags:=InitFlags[AsServer];
   Result:=CheckOK(gnutls_init(@FSession,Flags));
   if not Result then
     exit;
-  Result:=CheckOK(gnutls_priority_set_direct(FSession, PChar(GetCipherListString), @errptr));
+  A:=GetCipherListString;
+  Result:=CheckOK(gnutls_priority_set_direct(FSession, PAnsiChar(A), @errptr));
   if not Result then
     FGNUTLSLastErrorString:=FGNUTLSLastErrorString+', error at: '+StrPas(errPtr);
   If AsServer and CertificateData.NeedCertificateData  then
@@ -402,6 +404,7 @@ end;
 function TGNUTLSSocketHandler.LoadCertificate(aData,aKey : TSSLData) : Boolean;
 var
   key,cert : tgnutls_datum_t;
+  A,B: AnsiString;
 
 begin
   result:=MaybeAllocateCredentials;
@@ -417,10 +420,12 @@ begin
       Result:=CheckOK(gnutls_certificate_set_x509_key_mem(FCred,@cert,@key,GNUTLS_X509_FMT_DER));
     end
   else
-    begin
-    Result:=CheckOK(gnutls_certificate_set_x509_key_file (FCred, pChar(aData.FileName),PChar(aKey.FileName),GNUTLS_X509_FMT_PEM));
+  begin
+    A:=aData.FileName;
+    B:=aKey.FileName;
+    Result:=CheckOK(gnutls_certificate_set_x509_key_file (FCred, PAnsiChar(A),PAnsiChar(B),GNUTLS_X509_FMT_PEM));
     if not Result then
-      Result:=CheckOK(gnutls_certificate_set_x509_key_file (FCred, pChar(aData.FileName),PChar(aKey.FileName),GNUTLS_X509_FMT_DER));
+      Result:=CheckOK(gnutls_certificate_set_x509_key_file (FCred, PAnsiChar(A),PAnsiChar(B),GNUTLS_X509_FMT_DER));
     end;
   if Result then
     Result:=CheckOK(gnutls_credentials_set(FSession, GNUTLS_CRD_CERTIFICATE, FCred));
@@ -430,15 +435,16 @@ function TGNUTLSSocketHandler.LoadTrustedCertificate(aCertData : TSSLData) : Boo
 
 var
   ca : tgnutls_datum_t;
-
+  A : AnsiString;
 begin
   MaybeAllocateCredentials;
   Result:=False;
   if (aCertData.FileName<>'') then
     begin
-    Result:=CheckOK(gnutls_certificate_set_x509_trust_file(FCred,PChar(aCertData.FileName),GNUTLS_X509_FMT_PEM));
+    A:=aCertData.FileName;
+    Result:=CheckOK(gnutls_certificate_set_x509_trust_file(FCred,PAnsiChar(A),GNUTLS_X509_FMT_PEM));
     if not Result then
-      Result:=CheckOK(gnutls_certificate_set_x509_trust_file(FCred,PChar(aCertData.FileName),GNUTLS_X509_FMT_DER));
+      Result:=CheckOK(gnutls_certificate_set_x509_trust_file(FCred,PAnsiChar(A),GNUTLS_X509_FMT_DER));
     end;
   if (Length(aCertData.Value)>0) then
     begin
@@ -453,11 +459,12 @@ end;
 function TGNUTLSSocketHandler.SetTrustedCertificateDir(Const aFileName : string) : Boolean;
 
 Var
-  P : PChar;
-
+  P : PAnsiChar;
+  FN : AnsiString;
 begin
   MaybeAllocateCredentials;
-  P:=PAnsiChar(aFileName);
+  FN:=aFileName;
+  P:=PAnsiChar(FN);
   if DirectoryExists(aFileName) then
     begin
     Result:=CheckOK(gnutls_certificate_set_x509_trust_dir(FCred,P,GNUTLS_X509_FMT_PEM));