From: Ander Juaristi <a@juaristi.eus>
Date: Tue, 3 Mar 2020 11:49:32 +0000 (+0000)
Subject: Update files
X-Git-Tag: 3.6.13~10^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a738ed6722cd5d8ebdbc01bdbdeeb066c65b465;p=thirdparty%2Fgnutls.git

Update files

Signed-off-by: Ander Juaristi <a@juaristi.eus>
---

diff --git a/devel/libdane-latest-x86_64.abi b/devel/libdane-latest-x86_64.abi
index 9e66a95bee..6974f143a9 100644
--- a/devel/libdane-latest-x86_64.abi
+++ b/devel/libdane-latest-x86_64.abi
@@ -1,14 +1,6 @@
 <abi-corpus architecture='elf-amd-x86_64' soname='libgnutls-dane.so.0'>
   <elf-needed>
     <dependency name='libgnutls.so.30'/>
-    <dependency name='libp11-kit.so.0'/>
-    <dependency name='libidn2.so.0'/>
-    <dependency name='libunistring.so.2'/>
-    <dependency name='libdl.so.2'/>
-    <dependency name='libtasn1.so.6'/>
-    <dependency name='libnettle.so.7'/>
-    <dependency name='libhogweed.so.5'/>
-    <dependency name='libgmp.so.10'/>
     <dependency name='libunbound.so.8'/>
     <dependency name='libc.so.6'/>
   </elf-needed>
@@ -32,7 +24,7 @@
     <elf-symbol name='dane_verify_crt_raw' version='DANE_0_0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='dane_verify_session_crt' version='DANE_0_0' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='dane.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/libdane' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dane.c' comp-dir-path='/root/gnutls/libdane' language='LANG_C99'>
     <type-decl name='int' size-in-bits='32' id='type-id-1'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-2'/>
     <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-3' visibility='default' id='type-id-4'>
@@ -65,7 +57,7 @@
     <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-9'/>
     <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-11'/>
     <typedef-decl name='dane_state_t' type-id='type-id-11' id='type-id-12'/>
-    <class-decl name='gnutls_session_int' size-in-bits='52736' is-struct='yes' visibility='default' id='type-id-13'>
+    <class-decl name='gnutls_session_int' size-in-bits='52800' is-struct='yes' visibility='default' id='type-id-13'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='security_parameters' type-id='type-id-14' visibility='default'/>
       </data-member>
@@ -75,7 +67,7 @@
       <data-member access='public' layout-offset-in-bits='2304'>
         <var-decl name='internals' type-id='type-id-16' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='30080'>
+      <data-member access='public' layout-offset-in-bits='30144'>
         <var-decl name='key' type-id='type-id-17' visibility='default'/>
       </data-member>
     </class-decl>
@@ -615,6 +607,9 @@
         <var-decl name='key_shares' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='280'>
+        <var-decl name='multi_ocsp' type-id='type-id-79' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='288'>
         <var-decl name='tls_sig_sem' type-id='type-id-24' visibility='default'/>
       </data-member>
     </class-decl>
@@ -917,7 +912,7 @@
       <subrange length='4' type-id='type-id-44' id='type-id-140'/>
 
     </array-type-def>
-    <class-decl name='__anonymous_struct__' size-in-bits='27776' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-16' visibility='default' id='type-id-141'>
+    <class-decl name='__anonymous_struct__' size-in-bits='27840' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-16' visibility='default' id='type-id-141'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='record_buffer' type-id='type-id-142' visibility='default'/>
       </data-member>
@@ -1120,240 +1115,243 @@
         <var-decl name='h_post' type-id='type-id-164' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
-        <var-decl name='selected_cert_list' type-id='type-id-165' visibility='default'/>
+        <var-decl name='keylog_func' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10560'>
-        <var-decl name='selected_cert_list_length' type-id='type-id-19' visibility='default'/>
+        <var-decl name='selected_cert_list' type-id='type-id-166' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10624'>
-        <var-decl name='selected_key' type-id='type-id-166' visibility='default'/>
+        <var-decl name='selected_cert_list_length' type-id='type-id-19' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10688'>
-        <var-decl name='selected_ocsp' type-id='type-id-167' visibility='default'/>
+        <var-decl name='selected_key' type-id='type-id-167' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10752'>
-        <var-decl name='selected_ocsp_length' type-id='type-id-19' visibility='default'/>
+        <var-decl name='selected_ocsp' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10816'>
-        <var-decl name='selected_ocsp_func' type-id='type-id-168' visibility='default'/>
+        <var-decl name='selected_ocsp_length' type-id='type-id-19' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10880'>
-        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-105' visibility='default'/>
+        <var-decl name='selected_ocsp_func' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10944'>
+        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-105' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='11008'>
         <var-decl name='selected_need_free' type-id='type-id-79' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='10952'>
-        <var-decl name='default_record_version' type-id='type-id-169' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='11016'>
+        <var-decl name='default_record_version' type-id='type-id-170' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='10968'>
-        <var-decl name='default_hello_version' type-id='type-id-169' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='11032'>
+        <var-decl name='default_hello_version' type-id='type-id-170' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11008'>
+      <data-member access='public' layout-offset-in-bits='11072'>
         <var-decl name='user_ptr' type-id='type-id-105' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11072'>
+      <data-member access='public' layout-offset-in-bits='11136'>
         <var-decl name='direction' type-id='type-id-79' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11080'>
+      <data-member access='public' layout-offset-in-bits='11144'>
         <var-decl name='ignore_rdn_sequence' type-id='type-id-79' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11088'>
-        <var-decl name='rsa_pms_version' type-id='type-id-169' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='11152'>
+        <var-decl name='rsa_pms_version' type-id='type-id-170' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11104'>
+      <data-member access='public' layout-offset-in-bits='11168'>
         <var-decl name='errnum' type-id='type-id-1' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11136'>
+      <data-member access='public' layout-offset-in-bits='11200'>
         <var-decl name='initial_negotiation_completed' type-id='type-id-79' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11200'>
+      <data-member access='public' layout-offset-in-bits='11264'>
         <var-decl name='post_negotiation_lock' type-id='type-id-105' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11264'>
+      <data-member access='public' layout-offset-in-bits='11328'>
         <var-decl name='transport' type-id='type-id-78' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11328'>
-        <var-decl name='dtls' type-id='type-id-170' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='11392'>
+        <var-decl name='dtls' type-id='type-id-171' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11904'>
+      <data-member access='public' layout-offset-in-bits='11968'>
         <var-decl name='handshake_suspicious_loops' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11936'>
+      <data-member access='public' layout-offset-in-bits='12000'>
         <var-decl name='handshake_in_progress' type-id='type-id-79' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11944'>
+      <data-member access='public' layout-offset-in-bits='12008'>
         <var-decl name='premaster_set' type-id='type-id-79' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11968'>
+      <data-member access='public' layout-offset-in-bits='12032'>
         <var-decl name='cb_tls_unique_len' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12000'>
-        <var-decl name='cb_tls_unique' type-id='type-id-171' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='12064'>
+        <var-decl name='cb_tls_unique' type-id='type-id-172' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12288'>
-        <var-decl name='handshake_start_time' type-id='type-id-172' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='12352'>
+        <var-decl name='handshake_start_time' type-id='type-id-173' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12416'>
-        <var-decl name='handshake_abs_timeout' type-id='type-id-172' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='12480'>
+        <var-decl name='handshake_abs_timeout' type-id='type-id-173' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12544'>
+      <data-member access='public' layout-offset-in-bits='12608'>
         <var-decl name='ertt' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12576'>
+      <data-member access='public' layout-offset-in-bits='12640'>
         <var-decl name='handshake_timeout_ms' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12608'>
+      <data-member access='public' layout-offset-in-bits='12672'>
         <var-decl name='record_timeout_ms' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12672'>
+      <data-member access='public' layout-offset-in-bits='12736'>
         <var-decl name='post_handshake_cr_context' type-id='type-id-3' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12800'>
+      <data-member access='public' layout-offset-in-bits='12864'>
         <var-decl name='post_handshake_hash_buffer' type-id='type-id-143' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13056'>
+      <data-member access='public' layout-offset-in-bits='13120'>
         <var-decl name='hsk_flags' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13120'>
-        <var-decl name='last_key_update' type-id='type-id-172' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='13184'>
+        <var-decl name='last_key_update' type-id='type-id-173' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13248'>
+      <data-member access='public' layout-offset-in-bits='13312'>
         <var-decl name='key_update_count' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13312'>
+      <data-member access='public' layout-offset-in-bits='13376'>
         <var-decl name='full_client_hello' type-id='type-id-143' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13568'>
+      <data-member access='public' layout-offset-in-bits='13632'>
         <var-decl name='extensions_offset' type-id='type-id-1' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13632'>
+      <data-member access='public' layout-offset-in-bits='13696'>
         <var-decl name='hb_local_data' type-id='type-id-143' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13888'>
+      <data-member access='public' layout-offset-in-bits='13952'>
         <var-decl name='hb_remote_data' type-id='type-id-143' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14144'>
-        <var-decl name='hb_ping_start' type-id='type-id-172' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14208'>
+        <var-decl name='hb_ping_start' type-id='type-id-173' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14272'>
-        <var-decl name='hb_ping_sent' type-id='type-id-172' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='14400'>
-        <var-decl name='hb_actual_retrans_timeout_ms' type-id='type-id-2' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='14432'>
-        <var-decl name='hb_retrans_timeout_ms' type-id='type-id-2' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14336'>
+        <var-decl name='hb_ping_sent' type-id='type-id-173' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14464'>
-        <var-decl name='hb_total_timeout_ms' type-id='type-id-2' visibility='default'/>
+        <var-decl name='hb_actual_retrans_timeout_ms' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14496'>
-        <var-decl name='ocsp_check_ok' type-id='type-id-79' visibility='default'/>
+        <var-decl name='hb_retrans_timeout_ms' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14528'>
-        <var-decl name='hb_state' type-id='type-id-173' visibility='default'/>
+        <var-decl name='hb_total_timeout_ms' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14560'>
-        <var-decl name='recv_state' type-id='type-id-174' visibility='default'/>
+        <var-decl name='ocsp_check_ok' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14592'>
-        <var-decl name='sc_random_set' type-id='type-id-79' visibility='default'/>
+        <var-decl name='hb_state' type-id='type-id-174' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='14624'>
+        <var-decl name='recv_state' type-id='type-id-175' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14656'>
-        <var-decl name='flags' type-id='type-id-84' visibility='default'/>
+        <var-decl name='sc_random_set' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14720'>
-        <var-decl name='verify_callback' type-id='type-id-175' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-84' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14784'>
-        <var-decl name='vc_data' type-id='type-id-176' visibility='default'/>
+        <var-decl name='verify_callback' type-id='type-id-176' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14848'>
-        <var-decl name='vc_sdata' type-id='type-id-177' visibility='default'/>
+        <var-decl name='vc_data' type-id='type-id-177' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15040'>
+      <data-member access='public' layout-offset-in-bits='14912'>
+        <var-decl name='vc_sdata' type-id='type-id-178' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='15104'>
         <var-decl name='vc_elements' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15072'>
+      <data-member access='public' layout-offset-in-bits='15136'>
         <var-decl name='vc_status' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15104'>
+      <data-member access='public' layout-offset-in-bits='15168'>
         <var-decl name='additional_verify_flags' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15136'>
+      <data-member access='public' layout-offset-in-bits='15200'>
         <var-decl name='cert_hash' type-id='type-id-23' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15392'>
+      <data-member access='public' layout-offset-in-bits='15456'>
         <var-decl name='cert_hash_set' type-id='type-id-79' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15400'>
-        <var-decl name='saved_username' type-id='type-id-178' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='15464'>
+        <var-decl name='saved_username' type-id='type-id-179' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16432'>
+      <data-member access='public' layout-offset-in-bits='16496'>
         <var-decl name='saved_username_set' type-id='type-id-79' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16448'>
-        <var-decl name='tfo' type-id='type-id-179' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='17664'>
-        <var-decl name='rsup' type-id='type-id-180' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='16512'>
+        <var-decl name='tfo' type-id='type-id-180' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17728'>
-        <var-decl name='rsup_size' type-id='type-id-2' visibility='default'/>
+        <var-decl name='rsup' type-id='type-id-181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17792'>
-        <var-decl name='rexts' type-id='type-id-181' visibility='default'/>
+        <var-decl name='rsup_size' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17856'>
-        <var-decl name='rexts_size' type-id='type-id-2' visibility='default'/>
+        <var-decl name='rexts' type-id='type-id-182' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17920'>
-        <var-decl name='ext_data' type-id='type-id-182' visibility='default'/>
+        <var-decl name='rexts_size' type-id='type-id-2' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='17984'>
+        <var-decl name='ext_data' type-id='type-id-183' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24064'>
+      <data-member access='public' layout-offset-in-bits='24128'>
         <var-decl name='used_exts' type-id='type-id-26' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24096'>
-        <var-decl name='ext_msg' type-id='type-id-183' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24160'>
+        <var-decl name='ext_msg' type-id='type-id-184' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24128'>
+      <data-member access='public' layout-offset-in-bits='24192'>
         <var-decl name='max_recv_size' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24192'>
+      <data-member access='public' layout-offset-in-bits='24256'>
         <var-decl name='cand_ec_group' type-id='type-id-28' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24256'>
+      <data-member access='public' layout-offset-in-bits='24320'>
         <var-decl name='cand_dh_group' type-id='type-id-28' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24320'>
+      <data-member access='public' layout-offset-in-bits='24384'>
         <var-decl name='cand_group' type-id='type-id-28' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24384'>
-        <var-decl name='hrr_cs' type-id='type-id-169' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24448'>
+        <var-decl name='hrr_cs' type-id='type-id-170' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24416'>
+      <data-member access='public' layout-offset-in-bits='24480'>
         <var-decl name='session_ticket_renew' type-id='type-id-1' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24448'>
-        <var-decl name='tls13_ticket' type-id='type-id-184' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='27584'>
-        <var-decl name='early_data_received' type-id='type-id-26' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24512'>
+        <var-decl name='tls13_ticket' type-id='type-id-185' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27648'>
-        <var-decl name='anti_replay' type-id='type-id-185' visibility='default'/>
+        <var-decl name='early_data_received' type-id='type-id-26' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27712'>
+        <var-decl name='anti_replay' type-id='type-id-186' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='27776'>
         <var-decl name='epoch_lock' type-id='type-id-105' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='mbuffer_head_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-186'>
+    <class-decl name='mbuffer_head_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-187'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-187' visibility='default'/>
+        <var-decl name='head' type-id='type-id-188' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tail' type-id='type-id-187' visibility='default'/>
+        <var-decl name='tail' type-id='type-id-188' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='length' type-id='type-id-2' visibility='default'/>
@@ -1362,12 +1360,12 @@
         <var-decl name='byte_length' type-id='type-id-103' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='mbuffer_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-188'>
+    <class-decl name='mbuffer_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-189'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-187' visibility='default'/>
+        <var-decl name='next' type-id='type-id-188' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-187' visibility='default'/>
+        <var-decl name='prev' type-id='type-id-188' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='mark' type-id='type-id-103' visibility='default'/>
@@ -1382,7 +1380,7 @@
         <var-decl name='uhead_mark' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='type' type-id='type-id-189' visibility='default'/>
+        <var-decl name='type' type-id='type-id-190' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='record_sequence' type-id='type-id-84' visibility='default'/>
@@ -1391,14 +1389,14 @@
         <var-decl name='epoch' type-id='type-id-19' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='htype' type-id='type-id-190' visibility='default'/>
+        <var-decl name='htype' type-id='type-id-191' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <var-decl name='handshake_sequence' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-187'/>
-    <enum-decl name='content_type_t' id='type-id-191'>
+    <pointer-type-def type-id='type-id-189' size-in-bits='64' id='type-id-188'/>
+    <enum-decl name='content_type_t' id='type-id-192'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_CHANGE_CIPHER_SPEC' value='20'/>
       <enumerator name='GNUTLS_ALERT' value='21'/>
@@ -1406,8 +1404,8 @@
       <enumerator name='GNUTLS_APPLICATION_DATA' value='23'/>
       <enumerator name='GNUTLS_HEARTBEAT' value='24'/>
     </enum-decl>
-    <typedef-decl name='content_type_t' type-id='type-id-191' id='type-id-189'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-192'>
+    <typedef-decl name='content_type_t' type-id='type-id-192' id='type-id-190'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-193'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_HANDSHAKE_HELLO_REQUEST' value='0'/>
       <enumerator name='GNUTLS_HANDSHAKE_CLIENT_HELLO' value='1'/>
@@ -1430,15 +1428,15 @@
       <enumerator name='GNUTLS_HANDSHAKE_CLIENT_HELLO_V2' value='1024'/>
       <enumerator name='GNUTLS_HANDSHAKE_HELLO_RETRY_REQUEST' value='1025'/>
     </enum-decl>
-    <typedef-decl name='gnutls_handshake_description_t' type-id='type-id-192' id='type-id-190'/>
-    <typedef-decl name='mbuffer_st' type-id='type-id-188' id='type-id-193'/>
-    <typedef-decl name='mbuffer_head_st' type-id='type-id-186' id='type-id-142'/>
-    <class-decl name='gnutls_buffer_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-194'>
+    <typedef-decl name='gnutls_handshake_description_t' type-id='type-id-193' id='type-id-191'/>
+    <typedef-decl name='mbuffer_st' type-id='type-id-189' id='type-id-194'/>
+    <typedef-decl name='mbuffer_head_st' type-id='type-id-187' id='type-id-142'/>
+    <class-decl name='gnutls_buffer_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-195'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='allocd' type-id='type-id-195' visibility='default'/>
+        <var-decl name='allocd' type-id='type-id-196' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='data' type-id='type-id-195' visibility='default'/>
+        <var-decl name='data' type-id='type-id-196' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='max_length' type-id='type-id-103' visibility='default'/>
@@ -1447,22 +1445,22 @@
         <var-decl name='length' type-id='type-id-103' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-195'/>
-    <typedef-decl name='gnutls_buffer_st' type-id='type-id-194' id='type-id-143'/>
-    <enum-decl name='send_ticket_state_t' id='type-id-196'>
+    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-196'/>
+    <typedef-decl name='gnutls_buffer_st' type-id='type-id-195' id='type-id-143'/>
+    <enum-decl name='send_ticket_state_t' id='type-id-197'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='TICKET_STATE0' value='0'/>
       <enumerator name='TICKET_STATE1' value='1'/>
     </enum-decl>
-    <typedef-decl name='send_ticket_state_t' type-id='type-id-196' id='type-id-144'/>
-    <enum-decl name='bye_state_t' id='type-id-197'>
+    <typedef-decl name='send_ticket_state_t' type-id='type-id-197' id='type-id-144'/>
+    <enum-decl name='bye_state_t' id='type-id-198'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='BYE_STATE0' value='0'/>
       <enumerator name='BYE_STATE1' value='1'/>
       <enumerator name='BYE_STATE2' value='2'/>
     </enum-decl>
-    <typedef-decl name='bye_state_t' type-id='type-id-197' id='type-id-145'/>
-    <enum-decl name='reauth_state_t' id='type-id-198'>
+    <typedef-decl name='bye_state_t' type-id='type-id-198' id='type-id-145'/>
+    <enum-decl name='reauth_state_t' id='type-id-199'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='REAUTH_STATE0' value='0'/>
       <enumerator name='REAUTH_STATE1' value='1'/>
@@ -1471,8 +1469,8 @@
       <enumerator name='REAUTH_STATE4' value='4'/>
       <enumerator name='REAUTH_STATE5' value='5'/>
     </enum-decl>
-    <typedef-decl name='reauth_state_t' type-id='type-id-198' id='type-id-146'/>
-    <enum-decl name='handshake_state_t' id='type-id-199'>
+    <typedef-decl name='reauth_state_t' type-id='type-id-199' id='type-id-146'/>
+    <enum-decl name='handshake_state_t' id='type-id-200'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='STATE0' value='0'/>
       <enumerator name='STATE1' value='1'/>
@@ -1526,46 +1524,46 @@
       <enumerator name='STATE115' value='115'/>
       <enumerator name='STATE150' value='116'/>
     </enum-decl>
-    <typedef-decl name='handshake_state_t' type-id='type-id-199' id='type-id-147'/>
-    <class-decl name='gnutls_priority_st' size-in-bits='41792' is-struct='yes' visibility='default' id='type-id-200'>
+    <typedef-decl name='handshake_state_t' type-id='type-id-200' id='type-id-147'/>
+    <class-decl name='gnutls_priority_st' size-in-bits='41792' is-struct='yes' visibility='default' id='type-id-201'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='protocol' type-id='type-id-201' visibility='default'/>
+        <var-decl name='protocol' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2080'>
-        <var-decl name='client_ctype' type-id='type-id-201' visibility='default'/>
+        <var-decl name='client_ctype' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4160'>
-        <var-decl name='server_ctype' type-id='type-id-201' visibility='default'/>
+        <var-decl name='server_ctype' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6240'>
-        <var-decl name='_cipher' type-id='type-id-201' visibility='default'/>
+        <var-decl name='_cipher' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
-        <var-decl name='_mac' type-id='type-id-201' visibility='default'/>
+        <var-decl name='_mac' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10400'>
-        <var-decl name='_kx' type-id='type-id-201' visibility='default'/>
+        <var-decl name='_kx' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12480'>
-        <var-decl name='_sign_algo' type-id='type-id-201' visibility='default'/>
+        <var-decl name='_sign_algo' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14560'>
-        <var-decl name='_supported_ecc' type-id='type-id-201' visibility='default'/>
+        <var-decl name='_supported_ecc' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16640'>
-        <var-decl name='groups' type-id='type-id-202' visibility='default'/>
+        <var-decl name='groups' type-id='type-id-203' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='20800'>
-        <var-decl name='sigalg' type-id='type-id-203' visibility='default'/>
+        <var-decl name='sigalg' type-id='type-id-204' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24960'>
-        <var-decl name='cs' type-id='type-id-204' visibility='default'/>
+        <var-decl name='cs' type-id='type-id-205' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41408'>
         <var-decl name='no_extensions' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41440'>
-        <var-decl name='sr' type-id='type-id-205' visibility='default'/>
+        <var-decl name='sr' type-id='type-id-206' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41472'>
         <var-decl name='min_record_version' type-id='type-id-79' visibility='default'/>
@@ -1595,7 +1593,7 @@
         <var-decl name='fallback' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41600'>
-        <var-decl name='level' type-id='type-id-206' visibility='default'/>
+        <var-decl name='level' type-id='type-id-207' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41632'>
         <var-decl name='_allow_large_records' type-id='type-id-79' visibility='default'/>
@@ -1622,26 +1620,26 @@
         <var-decl name='_dh_prime_bits' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41728'>
-        <var-decl name='usage_cnt' type-id='type-id-207' visibility='default'/>
+        <var-decl name='usage_cnt' type-id='type-id-208' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='2080' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-201' visibility='default' id='type-id-208'>
+    <class-decl name='__anonymous_struct__' size-in-bits='2080' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-202' visibility='default' id='type-id-209'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='priorities' type-id='type-id-209' visibility='default'/>
+        <var-decl name='priorities' type-id='type-id-210' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
         <var-decl name='num_priorities' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='2048' id='type-id-209'>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='2048' id='type-id-210'>
       <subrange length='64' type-id='type-id-44' id='type-id-96'/>
 
     </array-type-def>
-    <typedef-decl name='priority_st' type-id='type-id-208' id='type-id-201'/>
-    <class-decl name='group_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-210'>
+    <typedef-decl name='priority_st' type-id='type-id-209' id='type-id-202'/>
+    <class-decl name='group_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-211'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-211' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
         <var-decl name='size' type-id='type-id-2' visibility='default'/>
@@ -1651,20 +1649,20 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='4096' id='type-id-211'>
+    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='4096' id='type-id-212'>
       <subrange length='64' type-id='type-id-44' id='type-id-96'/>
 
     </array-type-def>
-    <typedef-decl name='group_list_st' type-id='type-id-210' id='type-id-202'/>
-    <class-decl name='sign_algo_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-212'>
+    <typedef-decl name='group_list_st' type-id='type-id-211' id='type-id-203'/>
+    <class-decl name='sign_algo_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-213'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-213' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-214' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
         <var-decl name='size' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='gnutls_sign_entry_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-214'>
+    <class-decl name='gnutls_sign_entry_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-215'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-34' visibility='default'/>
       </data-member>
@@ -1678,7 +1676,7 @@
         <var-decl name='pk' type-id='type-id-67' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='hash' type-id='type-id-215' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-216' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <var-decl name='priv_pk' type-id='type-id-67' visibility='default'/>
@@ -1693,13 +1691,13 @@
         <var-decl name='curve' type-id='type-id-66' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='aid' type-id='type-id-216' visibility='default'/>
+        <var-decl name='aid' type-id='type-id-217' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='slevel' type-id='type-id-217' visibility='default'/>
+        <var-decl name='slevel' type-id='type-id-218' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-218'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-219'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_DIG_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_DIG_NULL' value='1'/>
@@ -1722,61 +1720,61 @@
       <enumerator name='GNUTLS_DIG_SHAKE_128' value='209'/>
       <enumerator name='GNUTLS_DIG_SHAKE_256' value='210'/>
     </enum-decl>
-    <typedef-decl name='gnutls_digest_algorithm_t' type-id='type-id-218' id='type-id-215'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='24' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-219' visibility='default' id='type-id-220'>
+    <typedef-decl name='gnutls_digest_algorithm_t' type-id='type-id-219' id='type-id-216'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='24' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-220' visibility='default' id='type-id-221'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='id' type-id='type-id-169' visibility='default'/>
+        <var-decl name='id' type-id='type-id-170' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
         <var-decl name='tls_sem' type-id='type-id-24' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='16' id='type-id-169'>
+    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='16' id='type-id-170'>
       <subrange length='2' type-id='type-id-44' id='type-id-46'/>
 
     </array-type-def>
-    <typedef-decl name='sign_algorithm_st' type-id='type-id-220' id='type-id-219'/>
-    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-216'/>
-    <enum-decl name='hash_security_level_t' id='type-id-221'>
+    <typedef-decl name='sign_algorithm_st' type-id='type-id-221' id='type-id-220'/>
+    <qualified-type-def type-id='type-id-220' const='yes' id='type-id-217'/>
+    <enum-decl name='hash_security_level_t' id='type-id-222'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='_SECURE' value='0'/>
       <enumerator name='_INSECURE_FOR_CERTS' value='1'/>
       <enumerator name='_INSECURE' value='2'/>
     </enum-decl>
-    <typedef-decl name='hash_security_level_t' type-id='type-id-221' id='type-id-217'/>
-    <qualified-type-def type-id='type-id-214' const='yes' id='type-id-222'/>
-    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-223'/>
+    <typedef-decl name='hash_security_level_t' type-id='type-id-222' id='type-id-218'/>
+    <qualified-type-def type-id='type-id-215' const='yes' id='type-id-223'/>
+    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-224'/>
 
-    <array-type-def dimensions='1' type-id='type-id-223' size-in-bits='4096' id='type-id-213'>
+    <array-type-def dimensions='1' type-id='type-id-224' size-in-bits='4096' id='type-id-214'>
       <subrange length='64' type-id='type-id-44' id='type-id-96'/>
 
     </array-type-def>
-    <typedef-decl name='sign_algo_list_st' type-id='type-id-212' id='type-id-203'/>
-    <class-decl name='ciphersuite_list_st' size-in-bits='16448' is-struct='yes' visibility='default' id='type-id-224'>
+    <typedef-decl name='sign_algo_list_st' type-id='type-id-213' id='type-id-204'/>
+    <class-decl name='ciphersuite_list_st' size-in-bits='16448' is-struct='yes' visibility='default' id='type-id-225'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-225' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-226' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16384'>
         <var-decl name='size' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_cipher_suite_entry_st' type-id='type-id-33' id='type-id-226'/>
+    <typedef-decl name='gnutls_cipher_suite_entry_st' type-id='type-id-33' id='type-id-227'/>
 
-    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='16384' id='type-id-225'>
-      <subrange length='256' type-id='type-id-44' id='type-id-227'/>
+    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='16384' id='type-id-226'>
+      <subrange length='256' type-id='type-id-44' id='type-id-228'/>
 
     </array-type-def>
-    <typedef-decl name='ciphersuite_list_st' type-id='type-id-224' id='type-id-204'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-228'>
+    <typedef-decl name='ciphersuite_list_st' type-id='type-id-225' id='type-id-205'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-229'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='SR_DISABLED' value='0'/>
       <enumerator name='SR_UNSAFE' value='1'/>
       <enumerator name='SR_PARTIAL' value='2'/>
       <enumerator name='SR_SAFE' value='3'/>
     </enum-decl>
-    <typedef-decl name='safe_renegotiation_t' type-id='type-id-228' id='type-id-205'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-229'>
+    <typedef-decl name='safe_renegotiation_t' type-id='type-id-229' id='type-id-206'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-230'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_SEC_PARAM_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_SEC_PARAM_INSECURE' value='5'/>
@@ -1791,15 +1789,15 @@
       <enumerator name='GNUTLS_SEC_PARAM_FUTURE' value='50'/>
       <enumerator name='GNUTLS_SEC_PARAM_MAX' value='50'/>
     </enum-decl>
-    <typedef-decl name='gnutls_sec_param_t' type-id='type-id-229' id='type-id-206'/>
-    <type-decl name='atomic_uint' size-in-bits='32' id='type-id-207'/>
-    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-148'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-230' visibility='default' id='type-id-231'>
+    <typedef-decl name='gnutls_sec_param_t' type-id='type-id-230' id='type-id-207'/>
+    <type-decl name='atomic_uint' size-in-bits='32' id='type-id-208'/>
+    <pointer-type-def type-id='type-id-201' size-in-bits='64' id='type-id-148'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-231' visibility='default' id='type-id-232'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='htype' type-id='type-id-190' visibility='default'/>
+        <var-decl name='htype' type-id='type-id-191' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='rtype' type-id='type-id-190' visibility='default'/>
+        <var-decl name='rtype' type-id='type-id-191' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='length' type-id='type-id-26' visibility='default'/>
@@ -1814,7 +1812,7 @@
         <var-decl name='end_offset' type-id='type-id-26' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='header' type-id='type-id-232' visibility='default'/>
+        <var-decl name='header' type-id='type-id-233' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <var-decl name='header_size' type-id='type-id-1' visibility='default'/>
@@ -1824,17 +1822,17 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='96' id='type-id-232'>
-      <subrange length='12' type-id='type-id-44' id='type-id-233'/>
+    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='96' id='type-id-233'>
+      <subrange length='12' type-id='type-id-44' id='type-id-234'/>
 
     </array-type-def>
-    <typedef-decl name='handshake_buffer_st' type-id='type-id-231' id='type-id-230'/>
+    <typedef-decl name='handshake_buffer_st' type-id='type-id-232' id='type-id-231'/>
 
-    <array-type-def dimensions='1' type-id='type-id-230' size-in-bits='3456' id='type-id-149'>
-      <subrange length='6' type-id='type-id-44' id='type-id-234'/>
+    <array-type-def dimensions='1' type-id='type-id-231' size-in-bits='3456' id='type-id-149'>
+      <subrange length='6' type-id='type-id-44' id='type-id-235'/>
 
     </array-type-def>
-    <enum-decl name='record_send_state_t' id='type-id-235'>
+    <enum-decl name='record_send_state_t' id='type-id-236'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='RECORD_SEND_NORMAL' value='0'/>
       <enumerator name='RECORD_SEND_CORKED' value='1'/>
@@ -1843,71 +1841,71 @@
       <enumerator name='RECORD_SEND_KEY_UPDATE_2' value='4'/>
       <enumerator name='RECORD_SEND_KEY_UPDATE_3' value='5'/>
     </enum-decl>
-    <typedef-decl name='record_send_state_t' type-id='type-id-235' id='type-id-150'/>
-    <class-decl name='mod_auth_st_int' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-236'>
+    <typedef-decl name='record_send_state_t' type-id='type-id-236' id='type-id-150'/>
+    <class-decl name='mod_auth_st_int' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-237'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-34' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='gnutls_generate_server_certificate' type-id='type-id-237' visibility='default'/>
+        <var-decl name='gnutls_generate_server_certificate' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='gnutls_generate_client_certificate' type-id='type-id-237' visibility='default'/>
+        <var-decl name='gnutls_generate_client_certificate' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='gnutls_generate_server_kx' type-id='type-id-237' visibility='default'/>
+        <var-decl name='gnutls_generate_server_kx' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='gnutls_generate_client_kx' type-id='type-id-237' visibility='default'/>
+        <var-decl name='gnutls_generate_client_kx' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='gnutls_generate_client_crt_vrfy' type-id='type-id-237' visibility='default'/>
+        <var-decl name='gnutls_generate_client_crt_vrfy' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='gnutls_generate_server_crt_request' type-id='type-id-237' visibility='default'/>
+        <var-decl name='gnutls_generate_server_crt_request' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='gnutls_process_server_certificate' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_process_server_certificate' type-id='type-id-239' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='gnutls_process_client_certificate' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_process_client_certificate' type-id='type-id-239' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='gnutls_process_server_kx' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_process_server_kx' type-id='type-id-239' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='gnutls_process_client_kx' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_process_client_kx' type-id='type-id-239' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='gnutls_process_client_crt_vrfy' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_process_client_crt_vrfy' type-id='type-id-239' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='gnutls_process_server_crt_request' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_process_server_crt_request' type-id='type-id-239' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-239'/>
-    <typedef-decl name='gnutls_session_t' type-id='type-id-239' id='type-id-240'/>
-    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-241'/>
-    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-237'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-240'/>
+    <typedef-decl name='gnutls_session_t' type-id='type-id-240' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-242'/>
     <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-238'/>
-    <qualified-type-def type-id='type-id-236' const='yes' id='type-id-244'/>
-    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-151'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-245'>
+    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-239'/>
+    <qualified-type-def type-id='type-id-237' const='yes' id='type-id-245'/>
+    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-151'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-246'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_CERT_IGNORE' value='0'/>
       <enumerator name='GNUTLS_CERT_REQUEST' value='1'/>
       <enumerator name='GNUTLS_CERT_REQUIRE' value='2'/>
     </enum-decl>
-    <typedef-decl name='gnutls_certificate_request_t' type-id='type-id-245' id='type-id-152'/>
+    <typedef-decl name='gnutls_certificate_request_t' type-id='type-id-246' id='type-id-152'/>
     <typedef-decl name='gnutls_transport_ptr_t' type-id='type-id-105' id='type-id-158'/>
-    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-247'/>
-    <typedef-decl name='gnutls_pull_timeout_func' type-id='type-id-247' id='type-id-153'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-58' id='type-id-248'/>
-    <typedef-decl name='ssize_t' type-id='type-id-248' id='type-id-249'/>
-    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-251'/>
-    <typedef-decl name='gnutls_pull_func' type-id='type-id-251' id='type-id-154'/>
-    <typedef-decl name='gnutls_push_func' type-id='type-id-251' id='type-id-155'/>
-    <class-decl name='iovec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-252'>
+    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-248'/>
+    <typedef-decl name='gnutls_pull_timeout_func' type-id='type-id-248' id='type-id-153'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-58' id='type-id-249'/>
+    <typedef-decl name='ssize_t' type-id='type-id-249' id='type-id-250'/>
+    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-252'/>
+    <typedef-decl name='gnutls_pull_func' type-id='type-id-252' id='type-id-154'/>
+    <typedef-decl name='gnutls_push_func' type-id='type-id-252' id='type-id-155'/>
+    <class-decl name='iovec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-253'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='iov_base' type-id='type-id-105' visibility='default'/>
       </data-member>
@@ -1915,29 +1913,31 @@
         <var-decl name='iov_len' type-id='type-id-103' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='giovec_t' type-id='type-id-252' id='type-id-253'/>
-    <qualified-type-def type-id='type-id-253' const='yes' id='type-id-254'/>
-    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
-    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-257'/>
-    <typedef-decl name='gnutls_vec_push_func' type-id='type-id-257' id='type-id-156'/>
-    <pointer-type-def type-id='type-id-258' size-in-bits='64' id='type-id-259'/>
-    <typedef-decl name='gnutls_errno_func' type-id='type-id-259' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-261'/>
-    <typedef-decl name='gnutls_db_store_func' type-id='type-id-261' id='type-id-159'/>
-    <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-263'/>
-    <typedef-decl name='gnutls_db_retr_func' type-id='type-id-263' id='type-id-160'/>
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-265'/>
-    <typedef-decl name='gnutls_db_remove_func' type-id='type-id-265' id='type-id-161'/>
-    <pointer-type-def type-id='type-id-266' size-in-bits='64' id='type-id-267'/>
-    <typedef-decl name='gnutls_handshake_simple_hook_func' type-id='type-id-267' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-269'/>
-    <typedef-decl name='gnutls_handshake_hook_func' type-id='type-id-269' id='type-id-163'/>
-    <type-decl name='short int' size-in-bits='16' id='type-id-270'/>
-    <typedef-decl name='__int16_t' type-id='type-id-270' id='type-id-271'/>
-    <typedef-decl name='int16_t' type-id='type-id-271' id='type-id-164'/>
-    <class-decl name='gnutls_pcert_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-272'>
+    <typedef-decl name='giovec_t' type-id='type-id-253' id='type-id-254'/>
+    <qualified-type-def type-id='type-id-254' const='yes' id='type-id-255'/>
+    <pointer-type-def type-id='type-id-255' size-in-bits='64' id='type-id-256'/>
+    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
+    <typedef-decl name='gnutls_vec_push_func' type-id='type-id-258' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
+    <typedef-decl name='gnutls_errno_func' type-id='type-id-260' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-262'/>
+    <typedef-decl name='gnutls_db_store_func' type-id='type-id-262' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-264'/>
+    <typedef-decl name='gnutls_db_retr_func' type-id='type-id-264' id='type-id-160'/>
+    <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-266'/>
+    <typedef-decl name='gnutls_db_remove_func' type-id='type-id-266' id='type-id-161'/>
+    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-268'/>
+    <typedef-decl name='gnutls_handshake_simple_hook_func' type-id='type-id-268' id='type-id-162'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-270'/>
+    <typedef-decl name='gnutls_handshake_hook_func' type-id='type-id-270' id='type-id-163'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-271'/>
+    <typedef-decl name='__int16_t' type-id='type-id-271' id='type-id-272'/>
+    <typedef-decl name='int16_t' type-id='type-id-272' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-274'/>
+    <typedef-decl name='gnutls_keylog_func' type-id='type-id-274' id='type-id-165'/>
+    <class-decl name='gnutls_pcert_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-275'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pubkey' type-id='type-id-273' visibility='default'/>
+        <var-decl name='pubkey' type-id='type-id-276' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cert' type-id='type-id-3' visibility='default'/>
@@ -1946,14 +1946,14 @@
         <var-decl name='type' type-id='type-id-27' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='gnutls_pubkey_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-274'/>
-    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-275'/>
-    <typedef-decl name='gnutls_pubkey_t' type-id='type-id-275' id='type-id-273'/>
-    <typedef-decl name='gnutls_pcert_st' type-id='type-id-272' id='type-id-276'/>
-    <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-165'/>
-    <class-decl name='gnutls_privkey_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-277'/>
-    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-166'/>
-    <class-decl name='gnutls_ocsp_data_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-278'>
+    <class-decl name='gnutls_pubkey_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-277'/>
+    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-278'/>
+    <typedef-decl name='gnutls_pubkey_t' type-id='type-id-278' id='type-id-276'/>
+    <typedef-decl name='gnutls_pcert_st' type-id='type-id-275' id='type-id-279'/>
+    <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-166'/>
+    <class-decl name='gnutls_privkey_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-280'/>
+    <pointer-type-def type-id='type-id-280' size-in-bits='64' id='type-id-167'/>
+    <class-decl name='gnutls_ocsp_data_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-281'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='version' type-id='type-id-2' visibility='default'/>
       </data-member>
@@ -1964,19 +1964,19 @@
         <var-decl name='exptime' type-id='type-id-25' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='padding' type-id='type-id-279' visibility='default'/>
+        <var-decl name='padding' type-id='type-id-282' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='256' id='type-id-279'>
+    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='256' id='type-id-282'>
       <subrange length='32' type-id='type-id-44' id='type-id-57'/>
 
     </array-type-def>
-    <typedef-decl name='gnutls_ocsp_data_st' type-id='type-id-278' id='type-id-280'/>
-    <pointer-type-def type-id='type-id-280' size-in-bits='64' id='type-id-167'/>
-    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
-    <typedef-decl name='gnutls_status_request_ocsp_func' type-id='type-id-282' id='type-id-168'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-170' visibility='default' id='type-id-283'>
+    <typedef-decl name='gnutls_ocsp_data_st' type-id='type-id-281' id='type-id-283'/>
+    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-168'/>
+    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-285'/>
+    <typedef-decl name='gnutls_status_request_ocsp_func' type-id='type-id-285' id='type-id-169'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-171' visibility='default' id='type-id-286'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='dcookie' type-id='type-id-3' visibility='default'/>
       </data-member>
@@ -2008,35 +2008,35 @@
         <var-decl name='async_term' type-id='type-id-25' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='last_retransmit' type-id='type-id-172' visibility='default'/>
+        <var-decl name='last_retransmit' type-id='type-id-173' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='packets_dropped' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-172'>
+    <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-173'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tv_sec' type-id='type-id-59' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tv_nsec' type-id='type-id-284' visibility='default'/>
+        <var-decl name='tv_nsec' type-id='type-id-287' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__syscall_slong_t' type-id='type-id-58' id='type-id-284'/>
-    <typedef-decl name='dtls_st' type-id='type-id-283' id='type-id-170'/>
+    <typedef-decl name='__syscall_slong_t' type-id='type-id-58' id='type-id-287'/>
+    <typedef-decl name='dtls_st' type-id='type-id-286' id='type-id-171'/>
 
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='288' id='type-id-171'>
-      <subrange length='36' type-id='type-id-44' id='type-id-285'/>
+    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='288' id='type-id-172'>
+      <subrange length='36' type-id='type-id-44' id='type-id-288'/>
 
     </array-type-def>
-    <enum-decl name='heartbeat_state_t' id='type-id-286'>
+    <enum-decl name='heartbeat_state_t' id='type-id-289'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='SHB_SEND1' value='0'/>
       <enumerator name='SHB_SEND2' value='1'/>
       <enumerator name='SHB_RECV' value='2'/>
     </enum-decl>
-    <typedef-decl name='heartbeat_state_t' type-id='type-id-286' id='type-id-173'/>
-    <enum-decl name='recv_state_t' id='type-id-287'>
+    <typedef-decl name='heartbeat_state_t' type-id='type-id-289' id='type-id-174'/>
+    <enum-decl name='recv_state_t' id='type-id-290'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='RECV_STATE_0' value='0'/>
       <enumerator name='RECV_STATE_DTLS_RETRANSMIT' value='1'/>
@@ -2048,12 +2048,12 @@
       <enumerator name='RECV_STATE_REHANDSHAKE' value='7'/>
       <enumerator name='RECV_STATE_REAUTH' value='8'/>
     </enum-decl>
-    <typedef-decl name='recv_state_t' type-id='type-id-287' id='type-id-174'/>
-    <typedef-decl name='gnutls_certificate_verify_function' type-id='type-id-266' id='type-id-288'/>
-    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-175'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-177' visibility='default' id='type-id-289'>
+    <typedef-decl name='recv_state_t' type-id='type-id-290' id='type-id-175'/>
+    <typedef-decl name='gnutls_certificate_verify_function' type-id='type-id-267' id='type-id-291'/>
+    <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-176'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-178' visibility='default' id='type-id-292'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-290' visibility='default'/>
+        <var-decl name='type' type-id='type-id-293' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data' type-id='type-id-5' visibility='default'/>
@@ -2062,7 +2062,7 @@
         <var-decl name='size' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-291'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-294'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_DT_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_DT_DNS_HOSTNAME' value='1'/>
@@ -2070,15 +2070,15 @@
       <enumerator name='GNUTLS_DT_RFC822NAME' value='3'/>
       <enumerator name='GNUTLS_DT_IP_ADDRESS' value='4'/>
     </enum-decl>
-    <typedef-decl name='gnutls_vdata_types_t' type-id='type-id-291' id='type-id-290'/>
-    <typedef-decl name='gnutls_typed_vdata_st' type-id='type-id-289' id='type-id-177'/>
-    <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-176'/>
+    <typedef-decl name='gnutls_vdata_types_t' type-id='type-id-294' id='type-id-293'/>
+    <typedef-decl name='gnutls_typed_vdata_st' type-id='type-id-292' id='type-id-178'/>
+    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-177'/>
 
-    <array-type-def dimensions='1' type-id='type-id-40' size-in-bits='1032' id='type-id-178'>
-      <subrange length='129' type-id='type-id-44' id='type-id-292'/>
+    <array-type-def dimensions='1' type-id='type-id-40' size-in-bits='1032' id='type-id-179'>
+      <subrange length='129' type-id='type-id-44' id='type-id-295'/>
 
     </array-type-def>
-    <class-decl name='tfo_st' size-in-bits='1216' is-struct='yes' visibility='default' id='type-id-293'>
+    <class-decl name='tfo_st' size-in-bits='1216' is-struct='yes' visibility='default' id='type-id-296'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fd' type-id='type-id-1' visibility='default'/>
       </data-member>
@@ -2089,42 +2089,42 @@
         <var-decl name='connect_only' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='connect_addr' type-id='type-id-294' visibility='default'/>
+        <var-decl name='connect_addr' type-id='type-id-297' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='connect_addrlen' type-id='type-id-295' visibility='default'/>
+        <var-decl name='connect_addrlen' type-id='type-id-298' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='sockaddr_storage' size-in-bits='1024' is-struct='yes' visibility='default' id='type-id-294'>
+    <class-decl name='sockaddr_storage' size-in-bits='1024' is-struct='yes' visibility='default' id='type-id-297'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ss_family' type-id='type-id-296' visibility='default'/>
+        <var-decl name='ss_family' type-id='type-id-299' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='__ss_padding' type-id='type-id-297' visibility='default'/>
+        <var-decl name='__ss_padding' type-id='type-id-300' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <var-decl name='__ss_align' type-id='type-id-44' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='sa_family_t' type-id='type-id-31' id='type-id-296'/>
+    <typedef-decl name='sa_family_t' type-id='type-id-31' id='type-id-299'/>
 
-    <array-type-def dimensions='1' type-id='type-id-40' size-in-bits='944' id='type-id-297'>
-      <subrange length='118' type-id='type-id-44' id='type-id-298'/>
+    <array-type-def dimensions='1' type-id='type-id-40' size-in-bits='944' id='type-id-300'>
+      <subrange length='118' type-id='type-id-44' id='type-id-301'/>
 
     </array-type-def>
-    <typedef-decl name='__socklen_t' type-id='type-id-2' id='type-id-299'/>
-    <typedef-decl name='socklen_t' type-id='type-id-299' id='type-id-295'/>
-    <typedef-decl name='tfo_st' type-id='type-id-293' id='type-id-179'/>
-    <class-decl name='gnutls_supplemental_entry_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-300'/>
-    <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-180'/>
-    <class-decl name='hello_ext_entry_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-301'/>
-    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-181'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-302'>
+    <typedef-decl name='__socklen_t' type-id='type-id-2' id='type-id-302'/>
+    <typedef-decl name='socklen_t' type-id='type-id-302' id='type-id-298'/>
+    <typedef-decl name='tfo_st' type-id='type-id-296' id='type-id-180'/>
+    <class-decl name='gnutls_supplemental_entry_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-303'/>
+    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-181'/>
+    <class-decl name='hello_ext_entry_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-182'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-305'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='priv' type-id='type-id-303' visibility='default'/>
+        <var-decl name='priv' type-id='type-id-306' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='resumed_priv' type-id='type-id-303' visibility='default'/>
+        <var-decl name='resumed_priv' type-id='type-id-306' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='set' type-id='type-id-24' visibility='default'/>
@@ -2133,13 +2133,13 @@
         <var-decl name='resumed_set' type-id='type-id-24' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_ext_priv_data_t' type-id='type-id-105' id='type-id-303'/>
+    <typedef-decl name='gnutls_ext_priv_data_t' type-id='type-id-105' id='type-id-306'/>
 
-    <array-type-def dimensions='1' type-id='type-id-302' size-in-bits='6144' id='type-id-182'>
+    <array-type-def dimensions='1' type-id='type-id-305' size-in-bits='6144' id='type-id-183'>
       <subrange length='32' type-id='type-id-44' id='type-id-57'/>
 
     </array-type-def>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-304'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-307'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_EXT_FLAG_OVERRIDE_INTERNAL' value='1'/>
       <enumerator name='GNUTLS_EXT_FLAG_CLIENT_HELLO' value='2'/>
@@ -2151,13 +2151,13 @@
       <enumerator name='GNUTLS_EXT_FLAG_TLS' value='128'/>
       <enumerator name='GNUTLS_EXT_FLAG_DTLS' value='256'/>
     </enum-decl>
-    <typedef-decl name='gnutls_ext_flags_t' type-id='type-id-304' id='type-id-183'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='3136' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-184' visibility='default' id='type-id-305'>
+    <typedef-decl name='gnutls_ext_flags_t' type-id='type-id-307' id='type-id-184'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='3136' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-185' visibility='default' id='type-id-308'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='arrival_time' type-id='type-id-172' visibility='default'/>
+        <var-decl name='arrival_time' type-id='type-id-173' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='creation_time' type-id='type-id-172' visibility='default'/>
+        <var-decl name='creation_time' type-id='type-id-173' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='lifetime' type-id='type-id-26' visibility='default'/>
@@ -2166,7 +2166,7 @@
         <var-decl name='age_add' type-id='type-id-26' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='nonce' type-id='type-id-306' visibility='default'/>
+        <var-decl name='nonce' type-id='type-id-309' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
         <var-decl name='nonce_size' type-id='type-id-103' visibility='default'/>
@@ -2182,24 +2182,24 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='2040' id='type-id-306'>
-      <subrange length='255' type-id='type-id-44' id='type-id-307'/>
+    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='2040' id='type-id-309'>
+      <subrange length='255' type-id='type-id-44' id='type-id-310'/>
 
     </array-type-def>
-    <typedef-decl name='tls13_ticket_st' type-id='type-id-305' id='type-id-184'/>
-    <class-decl name='gnutls_anti_replay_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-308'/>
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-309'/>
-    <typedef-decl name='gnutls_anti_replay_t' type-id='type-id-309' id='type-id-185'/>
+    <typedef-decl name='tls13_ticket_st' type-id='type-id-308' id='type-id-185'/>
+    <class-decl name='gnutls_anti_replay_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-311'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-312'/>
+    <typedef-decl name='gnutls_anti_replay_t' type-id='type-id-312' id='type-id-186'/>
     <typedef-decl name='internals_st' type-id='type-id-141' id='type-id-16'/>
-    <class-decl name='gnutls_key_st' size-in-bits='22656' is-struct='yes' visibility='default' id='type-id-310'>
+    <class-decl name='gnutls_key_st' size-in-bits='22656' is-struct='yes' visibility='default' id='type-id-313'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='kshare' type-id='type-id-311' visibility='default'/>
+        <var-decl name='kshare' type-id='type-id-314' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11520'>
-        <var-decl name='proto' type-id='type-id-312' visibility='default'/>
+        <var-decl name='proto' type-id='type-id-315' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='20096'>
-        <var-decl name='binders' type-id='type-id-313' visibility='default'/>
+        <var-decl name='binders' type-id='type-id-316' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='20608'>
         <var-decl name='key' type-id='type-id-3' visibility='default'/>
@@ -2217,32 +2217,32 @@
         <var-decl name='auth_info' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22336'>
-        <var-decl name='auth_info_type' type-id='type-id-314' visibility='default'/>
+        <var-decl name='auth_info_type' type-id='type-id-317' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22368'>
         <var-decl name='auth_info_size' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22400'>
-        <var-decl name='cred' type-id='type-id-315' visibility='default'/>
+        <var-decl name='cred' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22464'>
-        <var-decl name='totp' type-id='type-id-316' visibility='default'/>
+        <var-decl name='totp' type-id='type-id-319' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='11520' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-311'>
+    <class-decl name='__anonymous_struct__' size-in-bits='11520' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-314'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ecdh_params' type-id='type-id-317' visibility='default'/>
+        <var-decl name='ecdh_params' type-id='type-id-320' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='ecdhx_params' type-id='type-id-317' visibility='default'/>
+        <var-decl name='ecdhx_params' type-id='type-id-320' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7680'>
-        <var-decl name='dh_params' type-id='type-id-317' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-320' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='3840' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-317' visibility='default' id='type-id-318'>
+    <class-decl name='__anonymous_struct__' size-in-bits='3840' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-320' visibility='default' id='type-id-321'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-319' visibility='default'/>
+        <var-decl name='params' type-id='type-id-322' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <var-decl name='params_nr' type-id='type-id-2' visibility='default'/>
@@ -2260,7 +2260,7 @@
         <var-decl name='dh_group' type-id='type-id-63' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1184'>
-        <var-decl name='gost_params' type-id='type-id-320' visibility='default'/>
+        <var-decl name='gost_params' type-id='type-id-323' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <var-decl name='raw_pub' type-id='type-id-3' visibility='default'/>
@@ -2272,25 +2272,25 @@
         <var-decl name='seed_size' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='seed' type-id='type-id-321' visibility='default'/>
+        <var-decl name='seed' type-id='type-id-324' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3552'>
-        <var-decl name='palgo' type-id='type-id-215' visibility='default'/>
+        <var-decl name='palgo' type-id='type-id-216' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3584'>
-        <var-decl name='spki' type-id='type-id-322' visibility='default'/>
+        <var-decl name='spki' type-id='type-id-325' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
         <var-decl name='algo' type-id='type-id-67' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='bigint_t' type-id='type-id-105' id='type-id-323'/>
+    <typedef-decl name='bigint_t' type-id='type-id-105' id='type-id-326'/>
 
-    <array-type-def dimensions='1' type-id='type-id-323' size-in-bits='1024' id='type-id-319'>
+    <array-type-def dimensions='1' type-id='type-id-326' size-in-bits='1024' id='type-id-322'>
       <subrange length='16' type-id='type-id-44' id='type-id-97'/>
 
     </array-type-def>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-324'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-327'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_TC26_Z' value='1'/>
@@ -2299,18 +2299,18 @@
       <enumerator name='GNUTLS_GOST_PARAMSET_CP_C' value='4'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_CP_D' value='5'/>
     </enum-decl>
-    <typedef-decl name='gnutls_gost_paramset_t' type-id='type-id-324' id='type-id-320'/>
+    <typedef-decl name='gnutls_gost_paramset_t' type-id='type-id-327' id='type-id-323'/>
 
-    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='2048' id='type-id-321'>
-      <subrange length='256' type-id='type-id-44' id='type-id-227'/>
+    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='2048' id='type-id-324'>
+      <subrange length='256' type-id='type-id-44' id='type-id-228'/>
 
     </array-type-def>
-    <class-decl name='gnutls_x509_spki_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-325'>
+    <class-decl name='gnutls_x509_spki_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-328'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pk' type-id='type-id-67' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='rsa_pss_dig' type-id='type-id-215' visibility='default'/>
+        <var-decl name='rsa_pss_dig' type-id='type-id-216' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='salt_size' type-id='type-id-2' visibility='default'/>
@@ -2319,23 +2319,23 @@
         <var-decl name='legacy' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='dsa_dig' type-id='type-id-215' visibility='default'/>
+        <var-decl name='dsa_dig' type-id='type-id-216' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <var-decl name='flags' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_x509_spki_st' type-id='type-id-325' id='type-id-322'/>
-    <typedef-decl name='gnutls_pk_params_st' type-id='type-id-318' id='type-id-317'/>
-    <union-decl name='__anonymous_union__' size-in-bits='8576' is-anonymous='yes' visibility='default' id='type-id-312'>
+    <typedef-decl name='gnutls_x509_spki_st' type-id='type-id-328' id='type-id-325'/>
+    <typedef-decl name='gnutls_pk_params_st' type-id='type-id-321' id='type-id-320'/>
+    <union-decl name='__anonymous_union__' size-in-bits='8576' is-anonymous='yes' visibility='default' id='type-id-315'>
       <data-member access='private'>
-        <var-decl name='tls13' type-id='type-id-326' visibility='default'/>
+        <var-decl name='tls13' type-id='type-id-329' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='tls12' type-id='type-id-327' visibility='default'/>
+        <var-decl name='tls12' type-id='type-id-330' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='4128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-326'>
+    <class-decl name='__anonymous_struct__' size-in-bits='4128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-329'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='temp_secret' type-id='type-id-93' visibility='default'/>
       </data-member>
@@ -2364,69 +2364,69 @@
         <var-decl name='ap_rms' type-id='type-id-93' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='8576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-327'>
+    <class-decl name='__anonymous_struct__' size-in-bits='8576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-330'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ecdh' type-id='type-id-328' visibility='default'/>
+        <var-decl name='ecdh' type-id='type-id-331' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
-        <var-decl name='dh' type-id='type-id-329' visibility='default'/>
+        <var-decl name='dh' type-id='type-id-332' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8000'>
-        <var-decl name='srp' type-id='type-id-330' visibility='default'/>
+        <var-decl name='srp' type-id='type-id-333' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='4096' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-328'>
+    <class-decl name='__anonymous_struct__' size-in-bits='4096' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-331'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-317' visibility='default'/>
+        <var-decl name='params' type-id='type-id-320' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='x' type-id='type-id-323' visibility='default'/>
+        <var-decl name='x' type-id='type-id-326' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='y' type-id='type-id-323' visibility='default'/>
+        <var-decl name='y' type-id='type-id-326' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
         <var-decl name='raw' type-id='type-id-3' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='3904' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-329'>
+    <class-decl name='__anonymous_struct__' size-in-bits='3904' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-332'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-317' visibility='default'/>
+        <var-decl name='params' type-id='type-id-320' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='client_Y' type-id='type-id-323' visibility='default'/>
+        <var-decl name='client_Y' type-id='type-id-326' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-330'>
+    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-333'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='srp_key' type-id='type-id-323' visibility='default'/>
+        <var-decl name='srp_key' type-id='type-id-326' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='srp_g' type-id='type-id-323' visibility='default'/>
+        <var-decl name='srp_g' type-id='type-id-326' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='srp_p' type-id='type-id-323' visibility='default'/>
+        <var-decl name='srp_p' type-id='type-id-326' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='A' type-id='type-id-323' visibility='default'/>
+        <var-decl name='A' type-id='type-id-326' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='B' type-id='type-id-323' visibility='default'/>
+        <var-decl name='B' type-id='type-id-326' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='u' type-id='type-id-323' visibility='default'/>
+        <var-decl name='u' type-id='type-id-326' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='b' type-id='type-id-323' visibility='default'/>
+        <var-decl name='b' type-id='type-id-326' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='a' type-id='type-id-323' visibility='default'/>
+        <var-decl name='a' type-id='type-id-326' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='x' type-id='type-id-323' visibility='default'/>
+        <var-decl name='x' type-id='type-id-326' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='binder_data_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-331'>
+    <class-decl name='binder_data_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-334'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='prf' type-id='type-id-21' visibility='default'/>
       </data-member>
@@ -2441,11 +2441,11 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-331' size-in-bits='512' id='type-id-313'>
+    <array-type-def dimensions='1' type-id='type-id-334' size-in-bits='512' id='type-id-316'>
       <subrange length='2' type-id='type-id-44' id='type-id-46'/>
 
     </array-type-def>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-332'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-335'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_CRD_CERTIFICATE' value='1'/>
       <enumerator name='GNUTLS_CRD_ANON' value='2'/>
@@ -2453,21 +2453,21 @@
       <enumerator name='GNUTLS_CRD_PSK' value='4'/>
       <enumerator name='GNUTLS_CRD_IA' value='5'/>
     </enum-decl>
-    <typedef-decl name='gnutls_credentials_type_t' type-id='type-id-332' id='type-id-314'/>
-    <class-decl name='auth_cred_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-333'>
+    <typedef-decl name='gnutls_credentials_type_t' type-id='type-id-335' id='type-id-317'/>
+    <class-decl name='auth_cred_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-336'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='algorithm' type-id='type-id-314' visibility='default'/>
+        <var-decl name='algorithm' type-id='type-id-317' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='credentials' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='next' type-id='type-id-315' visibility='default'/>
+        <var-decl name='next' type-id='type-id-318' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-315'/>
-    <typedef-decl name='auth_cred_st' type-id='type-id-333' id='type-id-334'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-316'>
+    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-318'/>
+    <typedef-decl name='auth_cred_st' type-id='type-id-336' id='type-id-337'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-319'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='last_result' type-id='type-id-84' visibility='default'/>
       </data-member>
@@ -2475,22 +2475,22 @@
         <var-decl name='was_rotated' type-id='type-id-24' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='cb' type-id='type-id-335' visibility='default'/>
+        <var-decl name='cb' type-id='type-id-338' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-337'/>
-    <typedef-decl name='gnutls_stek_rotation_callback_t' type-id='type-id-337' id='type-id-335'/>
-    <typedef-decl name='gnutls_key_st' type-id='type-id-310' id='type-id-17'/>
-    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-338'/>
+    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-340'/>
+    <typedef-decl name='gnutls_stek_rotation_callback_t' type-id='type-id-340' id='type-id-338'/>
+    <typedef-decl name='gnutls_key_st' type-id='type-id-313' id='type-id-17'/>
+    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-341'/>
     <function-decl name='dane_verify_session_crt' mangled-name='dane_verify_session_crt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_verify_session_crt@@DANE_0_0'>
       <parameter type-id='type-id-12' name='s'/>
-      <parameter type-id='type-id-240' name='session'/>
+      <parameter type-id='type-id-241' name='session'/>
       <parameter type-id='type-id-34' name='hostname'/>
       <parameter type-id='type-id-34' name='proto'/>
       <parameter type-id='type-id-2' name='port'/>
       <parameter type-id='type-id-2' name='sflags'/>
       <parameter type-id='type-id-2' name='vflags'/>
-      <parameter type-id='type-id-338' name='verify'/>
+      <parameter type-id='type-id-341' name='verify'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='dane_verify_crt' mangled-name='dane_verify_crt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_verify_crt@@DANE_0_0'>
@@ -2503,38 +2503,38 @@
       <parameter type-id='type-id-2' name='port'/>
       <parameter type-id='type-id-2' name='sflags'/>
       <parameter type-id='type-id-2' name='vflags'/>
-      <parameter type-id='type-id-338' name='verify'/>
+      <parameter type-id='type-id-341' name='verify'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='dane_query_st' size-in-bits='22592' is-struct='yes' visibility='default' id='type-id-339'>
+    <class-decl name='dane_query_st' size-in-bits='22592' is-struct='yes' visibility='default' id='type-id-342'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='result' type-id='type-id-340' visibility='default'/>
+        <var-decl name='result' type-id='type-id-343' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data_entries' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='usage' type-id='type-id-341' visibility='default'/>
+        <var-decl name='usage' type-id='type-id-344' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3296'>
-        <var-decl name='type' type-id='type-id-342' visibility='default'/>
+        <var-decl name='type' type-id='type-id-345' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6496'>
-        <var-decl name='match' type-id='type-id-343' visibility='default'/>
+        <var-decl name='match' type-id='type-id-346' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
-        <var-decl name='data' type-id='type-id-344' visibility='default'/>
+        <var-decl name='data' type-id='type-id-347' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22528'>
         <var-decl name='flags' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22560'>
-        <var-decl name='status' type-id='type-id-345' visibility='default'/>
+        <var-decl name='status' type-id='type-id-348' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='ub_result' size-in-bits='768' is-struct='yes' visibility='default' id='type-id-346'>
+    <class-decl name='ub_result' size-in-bits='768' is-struct='yes' visibility='default' id='type-id-349'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='qname' type-id='type-id-347' visibility='default'/>
+        <var-decl name='qname' type-id='type-id-350' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='qtype' type-id='type-id-1' visibility='default'/>
@@ -2543,13 +2543,13 @@
         <var-decl name='qclass' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='data' type-id='type-id-348' visibility='default'/>
+        <var-decl name='data' type-id='type-id-351' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='len' type-id='type-id-349' visibility='default'/>
+        <var-decl name='len' type-id='type-id-352' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='canonname' type-id='type-id-347' visibility='default'/>
+        <var-decl name='canonname' type-id='type-id-350' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='rcode' type-id='type-id-1' visibility='default'/>
@@ -2573,7 +2573,7 @@
         <var-decl name='bogus' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='why_bogus' type-id='type-id-347' visibility='default'/>
+        <var-decl name='why_bogus' type-id='type-id-350' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <var-decl name='was_ratelimited' type-id='type-id-1' visibility='default'/>
@@ -2582,85 +2582,85 @@
         <var-decl name='ttl' type-id='type-id-1' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-347'/>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-348'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-349'/>
-    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-340'/>
-    <enum-decl name='dane_cert_usage_t' id='type-id-350'>
+    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-350'/>
+    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-351'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-352'/>
+    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-343'/>
+    <enum-decl name='dane_cert_usage_t' id='type-id-353'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='DANE_CERT_USAGE_CA' value='0'/>
       <enumerator name='DANE_CERT_USAGE_EE' value='1'/>
       <enumerator name='DANE_CERT_USAGE_LOCAL_CA' value='2'/>
       <enumerator name='DANE_CERT_USAGE_LOCAL_EE' value='3'/>
     </enum-decl>
-    <typedef-decl name='dane_cert_usage_t' type-id='type-id-350' id='type-id-351'/>
+    <typedef-decl name='dane_cert_usage_t' type-id='type-id-353' id='type-id-354'/>
 
-    <array-type-def dimensions='1' type-id='type-id-351' size-in-bits='3200' alignment-in-bits='32' id='type-id-341'>
-      <subrange length='100' type-id='type-id-44' id='type-id-352'/>
+    <array-type-def dimensions='1' type-id='type-id-354' size-in-bits='3200' alignment-in-bits='32' id='type-id-344'>
+      <subrange length='100' type-id='type-id-44' id='type-id-355'/>
 
     </array-type-def>
-    <enum-decl name='dane_cert_type_t' id='type-id-353'>
+    <enum-decl name='dane_cert_type_t' id='type-id-356'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='DANE_CERT_X509' value='0'/>
       <enumerator name='DANE_CERT_PK' value='1'/>
     </enum-decl>
-    <typedef-decl name='dane_cert_type_t' type-id='type-id-353' id='type-id-354'/>
+    <typedef-decl name='dane_cert_type_t' type-id='type-id-356' id='type-id-357'/>
 
-    <array-type-def dimensions='1' type-id='type-id-354' size-in-bits='3200' alignment-in-bits='32' id='type-id-342'>
-      <subrange length='100' type-id='type-id-44' id='type-id-352'/>
+    <array-type-def dimensions='1' type-id='type-id-357' size-in-bits='3200' alignment-in-bits='32' id='type-id-345'>
+      <subrange length='100' type-id='type-id-44' id='type-id-355'/>
 
     </array-type-def>
-    <enum-decl name='dane_match_type_t' id='type-id-355'>
+    <enum-decl name='dane_match_type_t' id='type-id-358'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='DANE_MATCH_EXACT' value='0'/>
       <enumerator name='DANE_MATCH_SHA2_256' value='1'/>
       <enumerator name='DANE_MATCH_SHA2_512' value='2'/>
     </enum-decl>
-    <typedef-decl name='dane_match_type_t' type-id='type-id-355' id='type-id-356'/>
+    <typedef-decl name='dane_match_type_t' type-id='type-id-358' id='type-id-359'/>
 
-    <array-type-def dimensions='1' type-id='type-id-356' size-in-bits='3200' alignment-in-bits='32' id='type-id-343'>
-      <subrange length='100' type-id='type-id-44' id='type-id-352'/>
+    <array-type-def dimensions='1' type-id='type-id-359' size-in-bits='3200' alignment-in-bits='32' id='type-id-346'>
+      <subrange length='100' type-id='type-id-44' id='type-id-355'/>
 
     </array-type-def>
 
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='12800' id='type-id-344'>
-      <subrange length='100' type-id='type-id-44' id='type-id-352'/>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='12800' id='type-id-347'>
+      <subrange length='100' type-id='type-id-44' id='type-id-355'/>
 
     </array-type-def>
-    <enum-decl name='dane_query_status_t' id='type-id-357'>
+    <enum-decl name='dane_query_status_t' id='type-id-360'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='DANE_QUERY_UNKNOWN' value='0'/>
       <enumerator name='DANE_QUERY_DNSSEC_VERIFIED' value='1'/>
       <enumerator name='DANE_QUERY_BOGUS' value='2'/>
       <enumerator name='DANE_QUERY_NO_DNSSEC' value='3'/>
     </enum-decl>
-    <typedef-decl name='dane_query_status_t' type-id='type-id-357' id='type-id-345'/>
-    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-358'/>
-    <typedef-decl name='dane_query_t' type-id='type-id-358' id='type-id-359'/>
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-360'/>
+    <typedef-decl name='dane_query_status_t' type-id='type-id-360' id='type-id-348'/>
+    <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-361'/>
+    <typedef-decl name='dane_query_t' type-id='type-id-361' id='type-id-362'/>
+    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-363'/>
     <function-decl name='dane_query_tlsa' mangled-name='dane_query_tlsa' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_query_tlsa@@DANE_0_0'>
       <parameter type-id='type-id-12' name='s'/>
-      <parameter type-id='type-id-360' name='r'/>
+      <parameter type-id='type-id-363' name='r'/>
       <parameter type-id='type-id-34' name='host'/>
       <parameter type-id='type-id-34' name='proto'/>
       <parameter type-id='type-id-2' name='port'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-347' const='yes' id='type-id-361'/>
-    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-362'/>
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-363'/>
-    <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-364'/>
+    <qualified-type-def type-id='type-id-350' const='yes' id='type-id-364'/>
+    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-365'/>
+    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-366'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-367'/>
     <function-decl name='dane_raw_tlsa' mangled-name='dane_raw_tlsa' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_raw_tlsa@@DANE_0_0'>
       <parameter type-id='type-id-12' name='s'/>
-      <parameter type-id='type-id-360' name='r'/>
-      <parameter type-id='type-id-362' name='dane_data'/>
-      <parameter type-id='type-id-364' name='dane_data_len'/>
+      <parameter type-id='type-id-363' name='r'/>
+      <parameter type-id='type-id-365' name='dane_data'/>
+      <parameter type-id='type-id-367' name='dane_data_len'/>
       <parameter type-id='type-id-1' name='secure'/>
       <parameter type-id='type-id-1' name='bogus'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='dane_query_deinit' mangled-name='dane_query_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_query_deinit@@DANE_0_0'>
-      <parameter type-id='type-id-359' name='q'/>
+      <parameter type-id='type-id-362' name='q'/>
       <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='dane_state_set_dlv_file' mangled-name='dane_state_set_dlv_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_state_set_dlv_file@@DANE_0_0'>
@@ -2672,49 +2672,49 @@
       <parameter type-id='type-id-12' name='s'/>
       <return type-id='type-id-115'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-365'/>
+    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-368'/>
     <function-decl name='dane_state_init' mangled-name='dane_state_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_state_init@@DANE_0_0'>
-      <parameter type-id='type-id-365' name='s'/>
+      <parameter type-id='type-id-368' name='s'/>
       <parameter type-id='type-id-2' name='flags'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-366'/>
-    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-367'/>
+    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-369'/>
+    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-370'/>
     <function-decl name='dane_query_to_raw_tlsa' mangled-name='dane_query_to_raw_tlsa' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_query_to_raw_tlsa@@DANE_0_0'>
-      <parameter type-id='type-id-359' name='q'/>
-      <parameter type-id='type-id-338' name='data_entries'/>
-      <parameter type-id='type-id-366' name='dane_data'/>
-      <parameter type-id='type-id-367' name='dane_data_len'/>
-      <parameter type-id='type-id-349' name='secure'/>
-      <parameter type-id='type-id-349' name='bogus'/>
+      <parameter type-id='type-id-362' name='q'/>
+      <parameter type-id='type-id-341' name='data_entries'/>
+      <parameter type-id='type-id-369' name='dane_data'/>
+      <parameter type-id='type-id-370' name='dane_data_len'/>
+      <parameter type-id='type-id-352' name='secure'/>
+      <parameter type-id='type-id-352' name='bogus'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='dane_query_data' mangled-name='dane_query_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_query_data@@DANE_0_0'>
-      <parameter type-id='type-id-359' name='q'/>
+      <parameter type-id='type-id-362' name='q'/>
       <parameter type-id='type-id-2' name='idx'/>
-      <parameter type-id='type-id-338' name='usage'/>
-      <parameter type-id='type-id-338' name='type'/>
-      <parameter type-id='type-id-338' name='match'/>
+      <parameter type-id='type-id-341' name='usage'/>
+      <parameter type-id='type-id-341' name='type'/>
+      <parameter type-id='type-id-341' name='match'/>
       <parameter type-id='type-id-7' name='data'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='dane_query_entries' mangled-name='dane_query_entries' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_query_entries@@DANE_0_0'>
-      <parameter type-id='type-id-359' name='q'/>
+      <parameter type-id='type-id-362' name='q'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='dane_query_status' mangled-name='dane_query_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_query_status@@DANE_0_0'>
-      <parameter type-id='type-id-359' name='q'/>
-      <return type-id='type-id-345'/>
+      <parameter type-id='type-id-362' name='q'/>
+      <return type-id='type-id-348'/>
     </function-decl>
     <function-decl name='dane_verify_crt_raw' mangled-name='dane_verify_crt_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_verify_crt_raw@@DANE_0_0'>
       <parameter type-id='type-id-12' name='s'/>
       <parameter type-id='type-id-64' name='chain'/>
       <parameter type-id='type-id-2' name='chain_size'/>
       <parameter type-id='type-id-27' name='chain_type'/>
-      <parameter type-id='type-id-359' name='r'/>
+      <parameter type-id='type-id-362' name='r'/>
       <parameter type-id='type-id-2' name='sflags'/>
       <parameter type-id='type-id-2' name='vflags'/>
-      <parameter type-id='type-id-338' name='verify'/>
+      <parameter type-id='type-id-341' name='verify'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_init' mangled-name='_gnutls_buffer_init' visibility='default' binding='global' size-in-bits='64'>
@@ -2729,6 +2729,12 @@
     <function-decl name='_gnutls_buffer_to_datum' mangled-name='_gnutls_buffer_to_datum' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-115'/>
     </function-decl>
+    <function-decl name='__stack_chk_fail' mangled-name='__stack_chk_fail' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-115'/>
+    </function-decl>
+    <function-decl name='__builtin_memcpy' mangled-name='memcpy' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-115'/>
+    </function-decl>
     <function-decl name='gnutls_x509_crt_init' mangled-name='gnutls_x509_crt_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-115'/>
     </function-decl>
@@ -2744,9 +2750,6 @@
     <function-decl name='gnutls_certificate_get_issuer' mangled-name='gnutls_certificate_get_issuer' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-115'/>
     </function-decl>
-    <function-decl name='__builtin_memcpy' mangled-name='memcpy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
-    </function-decl>
     <function-decl name='gnutls_x509_crt_export2' mangled-name='gnutls_x509_crt_export2' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-115'/>
     </function-decl>
@@ -2774,7 +2777,7 @@
     <function-decl name='gnutls_pubkey_deinit' mangled-name='gnutls_pubkey_deinit' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-115'/>
     </function-decl>
-    <function-decl name='snprintf' mangled-name='snprintf' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__builtin___snprintf_chk' mangled-name='__snprintf_chk' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='ub_resolve' mangled-name='ub_resolve' visibility='default' binding='global' size-in-bits='64'>
@@ -2816,50 +2819,56 @@
     <function-decl name='gnutls_x509_crt_verify' mangled-name='gnutls_x509_crt_verify' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-115'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-266'>
-      <parameter type-id='type-id-240'/>
+    <function-type size-in-bits='64' id='type-id-267'>
+      <parameter type-id='type-id-241'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-242'>
-      <parameter type-id='type-id-240'/>
+    <function-type size-in-bits='64' id='type-id-273'>
       <parameter type-id='type-id-241'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-64'/>
       <return type-id='type-id-1'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-243'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-195'/>
+      <parameter type-id='type-id-241'/>
+      <parameter type-id='type-id-242'/>
+      <return type-id='type-id-1'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-244'>
+      <parameter type-id='type-id-241'/>
+      <parameter type-id='type-id-196'/>
       <parameter type-id='type-id-103'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-268'>
-      <parameter type-id='type-id-240'/>
+    <function-type size-in-bits='64' id='type-id-269'>
+      <parameter type-id='type-id-241'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-64'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-281'>
-      <parameter type-id='type-id-240'/>
+    <function-type size-in-bits='64' id='type-id-284'>
+      <parameter type-id='type-id-241'/>
       <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-7'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-258'>
+    <function-type size-in-bits='64' id='type-id-259'>
       <parameter type-id='type-id-158'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-246'>
+    <function-type size-in-bits='64' id='type-id-247'>
       <parameter type-id='type-id-158'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-264'>
+    <function-type size-in-bits='64' id='type-id-265'>
       <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-260'>
+    <function-type size-in-bits='64' id='type-id-261'>
       <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
@@ -2892,24 +2901,24 @@
       <parameter type-id='type-id-103'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-262'>
+    <function-type size-in-bits='64' id='type-id-263'>
       <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-256'>
+    <function-type size-in-bits='64' id='type-id-257'>
       <parameter type-id='type-id-158'/>
-      <parameter type-id='type-id-255'/>
+      <parameter type-id='type-id-256'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-249'/>
+      <return type-id='type-id-250'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-250'>
+    <function-type size-in-bits='64' id='type-id-251'>
       <parameter type-id='type-id-158'/>
       <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-103'/>
-      <return type-id='type-id-249'/>
+      <return type-id='type-id-250'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-336'>
+    <function-type size-in-bits='64' id='type-id-339'>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-84'/>
@@ -2930,27 +2939,38 @@
       <return type-id='type-id-105'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dane-params.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/libdane' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dane-params.c' comp-dir-path='/root/gnutls/libdane' language='LANG_C99'>
     <function-decl name='dane_cert_usage_name' mangled-name='dane_cert_usage_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_cert_usage_name@@DANE_0_0'>
-      <parameter type-id='type-id-351' name='usage'/>
+      <parameter type-id='type-id-354' name='usage'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='dane_match_type_name' mangled-name='dane_match_type_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_match_type_name@@DANE_0_0'>
-      <parameter type-id='type-id-356' name='type'/>
+      <parameter type-id='type-id-359' name='type'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='dane_cert_type_name' mangled-name='dane_cert_type_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_cert_type_name@@DANE_0_0'>
-      <parameter type-id='type-id-354' name='type'/>
+      <parameter type-id='type-id-357' name='type'/>
       <return type-id='type-id-34'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='errors.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/libdane' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='errors.c' comp-dir-path='/root/gnutls/libdane' language='LANG_C99'>
     <function-decl name='dane_strerror' mangled-name='dane_strerror' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_strerror@@DANE_0_0'>
       <parameter type-id='type-id-1' name='error'/>
       <return type-id='type-id-34'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='read-file.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='hash.c' comp-dir-path='/root/gnutls/gl' language='LANG_C99'>
+    <function-decl name='malloc' mangled-name='malloc' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-115'/>
+    </function-decl>
+    <function-decl name='abort' mangled-name='abort' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-115'/>
+    </function-decl>
+    <function-decl name='__fprintf_chk' mangled-name='__fprintf_chk' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-115'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='read-file.c' comp-dir-path='/root/gnutls/gl' language='LANG_C99'>
     <function-decl name='fopen' mangled-name='fopen' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-115'/>
     </function-decl>
@@ -2972,25 +2992,19 @@
     <function-decl name='realloc' mangled-name='realloc' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-115'/>
     </function-decl>
-    <function-decl name='fread' mangled-name='fread' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__fread_alias' mangled-name='fread' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='ferror' mangled-name='ferror' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-115'/>
     </function-decl>
-    <function-decl name='malloc' mangled-name='malloc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
-    </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='asnprintf.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='asnprintf.c' comp-dir-path='/root/gnutls/gl' language='LANG_C99'>
     <function-decl name='vasnprintf' mangled-name='vasnprintf' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-115'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='vasnprintf.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/gl' language='LANG_C99'>
-    <function-decl name='abort' mangled-name='abort' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-115'/>
-    </function-decl>
+  <abi-instr version='1.0' address-size='64' path='vasnprintf.c' comp-dir-path='/root/gnutls/gl' language='LANG_C99'>
     <function-decl name='printf_parse' mangled-name='printf_parse' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-115'/>
     </function-decl>
diff --git a/devel/libgnutls-latest-x86_64.abi b/devel/libgnutls-latest-x86_64.abi
index 76552ab037..c953e01352 100644
--- a/devel/libgnutls-latest-x86_64.abi
+++ b/devel/libgnutls-latest-x86_64.abi
@@ -685,11 +685,15 @@
     <elf-symbol name='gnutls_psk_client_get_hint' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_psk_free_client_credentials' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_psk_free_server_credentials' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_psk_server_get_username2' version='GNUTLS_3_6_13' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_psk_server_get_username' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_psk_set_client_credentials2' version='GNUTLS_3_6_13' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_psk_set_client_credentials' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_psk_set_client_credentials_function2' version='GNUTLS_3_6_13' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_psk_set_client_credentials_function' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_psk_set_params_function' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_psk_set_server_credentials_file' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_psk_set_server_credentials_function2' version='GNUTLS_3_6_13' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_psk_set_server_credentials_function' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_psk_set_server_credentials_hint' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_psk_set_server_dh_params' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -1306,11 +1310,11 @@
     <elf-symbol name='gnutls_srp_8192_group_prime' size='16' version='GNUTLS_3_6_2' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_strdup' size='8' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='range.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='range.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <type-decl name='long int' size-in-bits='64' id='type-id-1'/>
     <typedef-decl name='__ssize_t' type-id='type-id-1' id='type-id-2'/>
     <typedef-decl name='ssize_t' type-id='type-id-2' id='type-id-3'/>
-    <class-decl name='gnutls_session_int' size-in-bits='52736' is-struct='yes' visibility='default' id='type-id-4'>
+    <class-decl name='gnutls_session_int' size-in-bits='52800' is-struct='yes' visibility='default' id='type-id-4'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='security_parameters' type-id='type-id-5' visibility='default'/>
       </data-member>
@@ -1320,7 +1324,7 @@
       <data-member access='public' layout-offset-in-bits='2304'>
         <var-decl name='internals' type-id='type-id-7' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='30080'>
+      <data-member access='public' layout-offset-in-bits='30144'>
         <var-decl name='key' type-id='type-id-8' visibility='default'/>
       </data-member>
     </class-decl>
@@ -1874,6 +1878,9 @@
         <var-decl name='key_shares' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='280'>
+        <var-decl name='multi_ocsp' type-id='type-id-75' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='288'>
         <var-decl name='tls_sig_sem' type-id='type-id-16' visibility='default'/>
       </data-member>
     </class-decl>
@@ -2176,7 +2183,7 @@
       <subrange length='4' type-id='type-id-38' id='type-id-136'/>
 
     </array-type-def>
-    <class-decl name='__anonymous_struct__' size-in-bits='27776' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-7' visibility='default' id='type-id-137'>
+    <class-decl name='__anonymous_struct__' size-in-bits='27840' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-7' visibility='default' id='type-id-137'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='record_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
@@ -2379,240 +2386,243 @@
         <var-decl name='h_post' type-id='type-id-160' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
-        <var-decl name='selected_cert_list' type-id='type-id-161' visibility='default'/>
+        <var-decl name='keylog_func' type-id='type-id-161' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10560'>
-        <var-decl name='selected_cert_list_length' type-id='type-id-11' visibility='default'/>
+        <var-decl name='selected_cert_list' type-id='type-id-162' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10624'>
-        <var-decl name='selected_key' type-id='type-id-162' visibility='default'/>
+        <var-decl name='selected_cert_list_length' type-id='type-id-11' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10688'>
-        <var-decl name='selected_ocsp' type-id='type-id-163' visibility='default'/>
+        <var-decl name='selected_key' type-id='type-id-163' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10752'>
-        <var-decl name='selected_ocsp_length' type-id='type-id-11' visibility='default'/>
+        <var-decl name='selected_ocsp' type-id='type-id-164' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10816'>
-        <var-decl name='selected_ocsp_func' type-id='type-id-164' visibility='default'/>
+        <var-decl name='selected_ocsp_length' type-id='type-id-11' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10880'>
-        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
+        <var-decl name='selected_ocsp_func' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10944'>
+        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='11008'>
         <var-decl name='selected_need_free' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='10952'>
-        <var-decl name='default_record_version' type-id='type-id-165' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='11016'>
+        <var-decl name='default_record_version' type-id='type-id-166' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='10968'>
-        <var-decl name='default_hello_version' type-id='type-id-165' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='11032'>
+        <var-decl name='default_hello_version' type-id='type-id-166' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11008'>
+      <data-member access='public' layout-offset-in-bits='11072'>
         <var-decl name='user_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11072'>
+      <data-member access='public' layout-offset-in-bits='11136'>
         <var-decl name='direction' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11080'>
+      <data-member access='public' layout-offset-in-bits='11144'>
         <var-decl name='ignore_rdn_sequence' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11088'>
-        <var-decl name='rsa_pms_version' type-id='type-id-165' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='11152'>
+        <var-decl name='rsa_pms_version' type-id='type-id-166' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11104'>
+      <data-member access='public' layout-offset-in-bits='11168'>
         <var-decl name='errnum' type-id='type-id-22' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11136'>
+      <data-member access='public' layout-offset-in-bits='11200'>
         <var-decl name='initial_negotiation_completed' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11200'>
+      <data-member access='public' layout-offset-in-bits='11264'>
         <var-decl name='post_negotiation_lock' type-id='type-id-101' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11264'>
+      <data-member access='public' layout-offset-in-bits='11328'>
         <var-decl name='transport' type-id='type-id-74' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11328'>
-        <var-decl name='dtls' type-id='type-id-166' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='11392'>
+        <var-decl name='dtls' type-id='type-id-167' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11904'>
+      <data-member access='public' layout-offset-in-bits='11968'>
         <var-decl name='handshake_suspicious_loops' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11936'>
+      <data-member access='public' layout-offset-in-bits='12000'>
         <var-decl name='handshake_in_progress' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11944'>
+      <data-member access='public' layout-offset-in-bits='12008'>
         <var-decl name='premaster_set' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11968'>
+      <data-member access='public' layout-offset-in-bits='12032'>
         <var-decl name='cb_tls_unique_len' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12000'>
-        <var-decl name='cb_tls_unique' type-id='type-id-167' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='12064'>
+        <var-decl name='cb_tls_unique' type-id='type-id-168' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12288'>
-        <var-decl name='handshake_start_time' type-id='type-id-168' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='12352'>
+        <var-decl name='handshake_start_time' type-id='type-id-169' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12416'>
-        <var-decl name='handshake_abs_timeout' type-id='type-id-168' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='12480'>
+        <var-decl name='handshake_abs_timeout' type-id='type-id-169' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12544'>
+      <data-member access='public' layout-offset-in-bits='12608'>
         <var-decl name='ertt' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12576'>
+      <data-member access='public' layout-offset-in-bits='12640'>
         <var-decl name='handshake_timeout_ms' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12608'>
+      <data-member access='public' layout-offset-in-bits='12672'>
         <var-decl name='record_timeout_ms' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12672'>
+      <data-member access='public' layout-offset-in-bits='12736'>
         <var-decl name='post_handshake_cr_context' type-id='type-id-62' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12800'>
+      <data-member access='public' layout-offset-in-bits='12864'>
         <var-decl name='post_handshake_hash_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13056'>
+      <data-member access='public' layout-offset-in-bits='13120'>
         <var-decl name='hsk_flags' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13120'>
-        <var-decl name='last_key_update' type-id='type-id-168' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='13184'>
+        <var-decl name='last_key_update' type-id='type-id-169' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13248'>
+      <data-member access='public' layout-offset-in-bits='13312'>
         <var-decl name='key_update_count' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13312'>
+      <data-member access='public' layout-offset-in-bits='13376'>
         <var-decl name='full_client_hello' type-id='type-id-139' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13568'>
+      <data-member access='public' layout-offset-in-bits='13632'>
         <var-decl name='extensions_offset' type-id='type-id-22' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13632'>
+      <data-member access='public' layout-offset-in-bits='13696'>
         <var-decl name='hb_local_data' type-id='type-id-139' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13888'>
+      <data-member access='public' layout-offset-in-bits='13952'>
         <var-decl name='hb_remote_data' type-id='type-id-139' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14144'>
-        <var-decl name='hb_ping_start' type-id='type-id-168' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='14272'>
-        <var-decl name='hb_ping_sent' type-id='type-id-168' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='14400'>
-        <var-decl name='hb_actual_retrans_timeout_ms' type-id='type-id-10' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14208'>
+        <var-decl name='hb_ping_start' type-id='type-id-169' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14432'>
-        <var-decl name='hb_retrans_timeout_ms' type-id='type-id-10' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14336'>
+        <var-decl name='hb_ping_sent' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14464'>
-        <var-decl name='hb_total_timeout_ms' type-id='type-id-10' visibility='default'/>
+        <var-decl name='hb_actual_retrans_timeout_ms' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14496'>
-        <var-decl name='ocsp_check_ok' type-id='type-id-75' visibility='default'/>
+        <var-decl name='hb_retrans_timeout_ms' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14528'>
-        <var-decl name='hb_state' type-id='type-id-169' visibility='default'/>
+        <var-decl name='hb_total_timeout_ms' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14560'>
-        <var-decl name='recv_state' type-id='type-id-170' visibility='default'/>
+        <var-decl name='ocsp_check_ok' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14592'>
-        <var-decl name='sc_random_set' type-id='type-id-75' visibility='default'/>
+        <var-decl name='hb_state' type-id='type-id-170' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='14624'>
+        <var-decl name='recv_state' type-id='type-id-171' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14656'>
-        <var-decl name='flags' type-id='type-id-80' visibility='default'/>
+        <var-decl name='sc_random_set' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14720'>
-        <var-decl name='verify_callback' type-id='type-id-171' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-80' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14784'>
-        <var-decl name='vc_data' type-id='type-id-172' visibility='default'/>
+        <var-decl name='verify_callback' type-id='type-id-172' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14848'>
-        <var-decl name='vc_sdata' type-id='type-id-173' visibility='default'/>
+        <var-decl name='vc_data' type-id='type-id-173' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15040'>
+      <data-member access='public' layout-offset-in-bits='14912'>
+        <var-decl name='vc_sdata' type-id='type-id-174' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='15104'>
         <var-decl name='vc_elements' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15072'>
+      <data-member access='public' layout-offset-in-bits='15136'>
         <var-decl name='vc_status' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15104'>
+      <data-member access='public' layout-offset-in-bits='15168'>
         <var-decl name='additional_verify_flags' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15136'>
+      <data-member access='public' layout-offset-in-bits='15200'>
         <var-decl name='cert_hash' type-id='type-id-15' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15392'>
+      <data-member access='public' layout-offset-in-bits='15456'>
         <var-decl name='cert_hash_set' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15400'>
-        <var-decl name='saved_username' type-id='type-id-174' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='15464'>
+        <var-decl name='saved_username' type-id='type-id-175' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16432'>
+      <data-member access='public' layout-offset-in-bits='16496'>
         <var-decl name='saved_username_set' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16448'>
-        <var-decl name='tfo' type-id='type-id-175' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='17664'>
-        <var-decl name='rsup' type-id='type-id-176' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='16512'>
+        <var-decl name='tfo' type-id='type-id-176' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17728'>
-        <var-decl name='rsup_size' type-id='type-id-10' visibility='default'/>
+        <var-decl name='rsup' type-id='type-id-177' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17792'>
-        <var-decl name='rexts' type-id='type-id-177' visibility='default'/>
+        <var-decl name='rsup_size' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17856'>
-        <var-decl name='rexts_size' type-id='type-id-10' visibility='default'/>
+        <var-decl name='rexts' type-id='type-id-178' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17920'>
-        <var-decl name='ext_data' type-id='type-id-178' visibility='default'/>
+        <var-decl name='rexts_size' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24064'>
+      <data-member access='public' layout-offset-in-bits='17984'>
+        <var-decl name='ext_data' type-id='type-id-179' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='24128'>
         <var-decl name='used_exts' type-id='type-id-18' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24096'>
-        <var-decl name='ext_msg' type-id='type-id-179' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24160'>
+        <var-decl name='ext_msg' type-id='type-id-180' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24128'>
+      <data-member access='public' layout-offset-in-bits='24192'>
         <var-decl name='max_recv_size' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24192'>
+      <data-member access='public' layout-offset-in-bits='24256'>
         <var-decl name='cand_ec_group' type-id='type-id-20' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24256'>
+      <data-member access='public' layout-offset-in-bits='24320'>
         <var-decl name='cand_dh_group' type-id='type-id-20' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24320'>
+      <data-member access='public' layout-offset-in-bits='24384'>
         <var-decl name='cand_group' type-id='type-id-20' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24384'>
-        <var-decl name='hrr_cs' type-id='type-id-165' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24448'>
+        <var-decl name='hrr_cs' type-id='type-id-166' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24416'>
+      <data-member access='public' layout-offset-in-bits='24480'>
         <var-decl name='session_ticket_renew' type-id='type-id-22' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24448'>
-        <var-decl name='tls13_ticket' type-id='type-id-180' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='27584'>
-        <var-decl name='early_data_received' type-id='type-id-18' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24512'>
+        <var-decl name='tls13_ticket' type-id='type-id-181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27648'>
-        <var-decl name='anti_replay' type-id='type-id-181' visibility='default'/>
+        <var-decl name='early_data_received' type-id='type-id-18' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27712'>
+        <var-decl name='anti_replay' type-id='type-id-182' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='27776'>
         <var-decl name='epoch_lock' type-id='type-id-101' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='mbuffer_head_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-182'>
+    <class-decl name='mbuffer_head_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-183'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-183' visibility='default'/>
+        <var-decl name='head' type-id='type-id-184' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tail' type-id='type-id-183' visibility='default'/>
+        <var-decl name='tail' type-id='type-id-184' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='length' type-id='type-id-10' visibility='default'/>
@@ -2621,12 +2631,12 @@
         <var-decl name='byte_length' type-id='type-id-99' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='mbuffer_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-184'>
+    <class-decl name='mbuffer_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-185'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-183' visibility='default'/>
+        <var-decl name='next' type-id='type-id-184' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-183' visibility='default'/>
+        <var-decl name='prev' type-id='type-id-184' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='mark' type-id='type-id-99' visibility='default'/>
@@ -2641,7 +2651,7 @@
         <var-decl name='uhead_mark' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='type' type-id='type-id-185' visibility='default'/>
+        <var-decl name='type' type-id='type-id-186' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='record_sequence' type-id='type-id-80' visibility='default'/>
@@ -2650,14 +2660,14 @@
         <var-decl name='epoch' type-id='type-id-11' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='htype' type-id='type-id-186' visibility='default'/>
+        <var-decl name='htype' type-id='type-id-187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <var-decl name='handshake_sequence' type-id='type-id-11' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-183'/>
-    <enum-decl name='content_type_t' id='type-id-187'>
+    <pointer-type-def type-id='type-id-185' size-in-bits='64' id='type-id-184'/>
+    <enum-decl name='content_type_t' id='type-id-188'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_CHANGE_CIPHER_SPEC' value='20'/>
       <enumerator name='GNUTLS_ALERT' value='21'/>
@@ -2665,8 +2675,8 @@
       <enumerator name='GNUTLS_APPLICATION_DATA' value='23'/>
       <enumerator name='GNUTLS_HEARTBEAT' value='24'/>
     </enum-decl>
-    <typedef-decl name='content_type_t' type-id='type-id-187' id='type-id-185'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-188'>
+    <typedef-decl name='content_type_t' type-id='type-id-188' id='type-id-186'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-189'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_HANDSHAKE_HELLO_REQUEST' value='0'/>
       <enumerator name='GNUTLS_HANDSHAKE_CLIENT_HELLO' value='1'/>
@@ -2689,15 +2699,15 @@
       <enumerator name='GNUTLS_HANDSHAKE_CLIENT_HELLO_V2' value='1024'/>
       <enumerator name='GNUTLS_HANDSHAKE_HELLO_RETRY_REQUEST' value='1025'/>
     </enum-decl>
-    <typedef-decl name='gnutls_handshake_description_t' type-id='type-id-188' id='type-id-186'/>
-    <typedef-decl name='mbuffer_st' type-id='type-id-184' id='type-id-189'/>
-    <typedef-decl name='mbuffer_head_st' type-id='type-id-182' id='type-id-138'/>
-    <class-decl name='gnutls_buffer_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-190'>
+    <typedef-decl name='gnutls_handshake_description_t' type-id='type-id-189' id='type-id-187'/>
+    <typedef-decl name='mbuffer_st' type-id='type-id-185' id='type-id-190'/>
+    <typedef-decl name='mbuffer_head_st' type-id='type-id-183' id='type-id-138'/>
+    <class-decl name='gnutls_buffer_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-191'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='allocd' type-id='type-id-191' visibility='default'/>
+        <var-decl name='allocd' type-id='type-id-192' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='data' type-id='type-id-191' visibility='default'/>
+        <var-decl name='data' type-id='type-id-192' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='max_length' type-id='type-id-99' visibility='default'/>
@@ -2706,22 +2716,22 @@
         <var-decl name='length' type-id='type-id-99' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-191'/>
-    <typedef-decl name='gnutls_buffer_st' type-id='type-id-190' id='type-id-139'/>
-    <enum-decl name='send_ticket_state_t' id='type-id-192'>
+    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-192'/>
+    <typedef-decl name='gnutls_buffer_st' type-id='type-id-191' id='type-id-139'/>
+    <enum-decl name='send_ticket_state_t' id='type-id-193'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='TICKET_STATE0' value='0'/>
       <enumerator name='TICKET_STATE1' value='1'/>
     </enum-decl>
-    <typedef-decl name='send_ticket_state_t' type-id='type-id-192' id='type-id-140'/>
-    <enum-decl name='bye_state_t' id='type-id-193'>
+    <typedef-decl name='send_ticket_state_t' type-id='type-id-193' id='type-id-140'/>
+    <enum-decl name='bye_state_t' id='type-id-194'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='BYE_STATE0' value='0'/>
       <enumerator name='BYE_STATE1' value='1'/>
       <enumerator name='BYE_STATE2' value='2'/>
     </enum-decl>
-    <typedef-decl name='bye_state_t' type-id='type-id-193' id='type-id-141'/>
-    <enum-decl name='reauth_state_t' id='type-id-194'>
+    <typedef-decl name='bye_state_t' type-id='type-id-194' id='type-id-141'/>
+    <enum-decl name='reauth_state_t' id='type-id-195'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='REAUTH_STATE0' value='0'/>
       <enumerator name='REAUTH_STATE1' value='1'/>
@@ -2730,8 +2740,8 @@
       <enumerator name='REAUTH_STATE4' value='4'/>
       <enumerator name='REAUTH_STATE5' value='5'/>
     </enum-decl>
-    <typedef-decl name='reauth_state_t' type-id='type-id-194' id='type-id-142'/>
-    <enum-decl name='handshake_state_t' id='type-id-195'>
+    <typedef-decl name='reauth_state_t' type-id='type-id-195' id='type-id-142'/>
+    <enum-decl name='handshake_state_t' id='type-id-196'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='STATE0' value='0'/>
       <enumerator name='STATE1' value='1'/>
@@ -2785,46 +2795,46 @@
       <enumerator name='STATE115' value='115'/>
       <enumerator name='STATE150' value='116'/>
     </enum-decl>
-    <typedef-decl name='handshake_state_t' type-id='type-id-195' id='type-id-143'/>
-    <class-decl name='gnutls_priority_st' size-in-bits='41792' is-struct='yes' visibility='default' id='type-id-196'>
+    <typedef-decl name='handshake_state_t' type-id='type-id-196' id='type-id-143'/>
+    <class-decl name='gnutls_priority_st' size-in-bits='41792' is-struct='yes' visibility='default' id='type-id-197'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='protocol' type-id='type-id-197' visibility='default'/>
+        <var-decl name='protocol' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2080'>
-        <var-decl name='client_ctype' type-id='type-id-197' visibility='default'/>
+        <var-decl name='client_ctype' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4160'>
-        <var-decl name='server_ctype' type-id='type-id-197' visibility='default'/>
+        <var-decl name='server_ctype' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6240'>
-        <var-decl name='_cipher' type-id='type-id-197' visibility='default'/>
+        <var-decl name='_cipher' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
-        <var-decl name='_mac' type-id='type-id-197' visibility='default'/>
+        <var-decl name='_mac' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10400'>
-        <var-decl name='_kx' type-id='type-id-197' visibility='default'/>
+        <var-decl name='_kx' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12480'>
-        <var-decl name='_sign_algo' type-id='type-id-197' visibility='default'/>
+        <var-decl name='_sign_algo' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14560'>
-        <var-decl name='_supported_ecc' type-id='type-id-197' visibility='default'/>
+        <var-decl name='_supported_ecc' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16640'>
-        <var-decl name='groups' type-id='type-id-198' visibility='default'/>
+        <var-decl name='groups' type-id='type-id-199' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='20800'>
-        <var-decl name='sigalg' type-id='type-id-199' visibility='default'/>
+        <var-decl name='sigalg' type-id='type-id-200' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24960'>
-        <var-decl name='cs' type-id='type-id-200' visibility='default'/>
+        <var-decl name='cs' type-id='type-id-201' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41408'>
         <var-decl name='no_extensions' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41440'>
-        <var-decl name='sr' type-id='type-id-201' visibility='default'/>
+        <var-decl name='sr' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41472'>
         <var-decl name='min_record_version' type-id='type-id-75' visibility='default'/>
@@ -2854,7 +2864,7 @@
         <var-decl name='fallback' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41600'>
-        <var-decl name='level' type-id='type-id-202' visibility='default'/>
+        <var-decl name='level' type-id='type-id-203' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41632'>
         <var-decl name='_allow_large_records' type-id='type-id-75' visibility='default'/>
@@ -2881,26 +2891,26 @@
         <var-decl name='_dh_prime_bits' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41728'>
-        <var-decl name='usage_cnt' type-id='type-id-203' visibility='default'/>
+        <var-decl name='usage_cnt' type-id='type-id-204' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='2080' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-197' visibility='default' id='type-id-204'>
+    <class-decl name='__anonymous_struct__' size-in-bits='2080' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-198' visibility='default' id='type-id-205'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='priorities' type-id='type-id-205' visibility='default'/>
+        <var-decl name='priorities' type-id='type-id-206' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
         <var-decl name='num_priorities' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-205'>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-206'>
       <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
-    <typedef-decl name='priority_st' type-id='type-id-204' id='type-id-197'/>
-    <class-decl name='group_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-206'>
+    <typedef-decl name='priority_st' type-id='type-id-205' id='type-id-198'/>
+    <class-decl name='group_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-207'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-207' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-208' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
@@ -2910,20 +2920,20 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='4096' id='type-id-207'>
+    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='4096' id='type-id-208'>
       <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
-    <typedef-decl name='group_list_st' type-id='type-id-206' id='type-id-198'/>
-    <class-decl name='sign_algo_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-208'>
+    <typedef-decl name='group_list_st' type-id='type-id-207' id='type-id-199'/>
+    <class-decl name='sign_algo_list_st' size-in-bits='4160' is-struct='yes' visibility='default' id='type-id-209'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-209' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-210' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='gnutls_sign_entry_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-210'>
+    <class-decl name='gnutls_sign_entry_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-211'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
@@ -2937,7 +2947,7 @@
         <var-decl name='pk' type-id='type-id-60' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='hash' type-id='type-id-211' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <var-decl name='priv_pk' type-id='type-id-60' visibility='default'/>
@@ -2952,13 +2962,13 @@
         <var-decl name='curve' type-id='type-id-59' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='aid' type-id='type-id-212' visibility='default'/>
+        <var-decl name='aid' type-id='type-id-213' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='slevel' type-id='type-id-213' visibility='default'/>
+        <var-decl name='slevel' type-id='type-id-214' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-214'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-215'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_DIG_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_DIG_NULL' value='1'/>
@@ -2981,61 +2991,61 @@
       <enumerator name='GNUTLS_DIG_SHAKE_128' value='209'/>
       <enumerator name='GNUTLS_DIG_SHAKE_256' value='210'/>
     </enum-decl>
-    <typedef-decl name='gnutls_digest_algorithm_t' type-id='type-id-214' id='type-id-211'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='24' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-215' visibility='default' id='type-id-216'>
+    <typedef-decl name='gnutls_digest_algorithm_t' type-id='type-id-215' id='type-id-212'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='24' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-216' visibility='default' id='type-id-217'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='id' type-id='type-id-165' visibility='default'/>
+        <var-decl name='id' type-id='type-id-166' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
         <var-decl name='tls_sem' type-id='type-id-16' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='16' id='type-id-165'>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='16' id='type-id-166'>
       <subrange length='2' type-id='type-id-38' id='type-id-40'/>
 
     </array-type-def>
-    <typedef-decl name='sign_algorithm_st' type-id='type-id-216' id='type-id-215'/>
-    <qualified-type-def type-id='type-id-215' const='yes' id='type-id-212'/>
-    <enum-decl name='hash_security_level_t' id='type-id-217'>
+    <typedef-decl name='sign_algorithm_st' type-id='type-id-217' id='type-id-216'/>
+    <qualified-type-def type-id='type-id-216' const='yes' id='type-id-213'/>
+    <enum-decl name='hash_security_level_t' id='type-id-218'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='_SECURE' value='0'/>
       <enumerator name='_INSECURE_FOR_CERTS' value='1'/>
       <enumerator name='_INSECURE' value='2'/>
     </enum-decl>
-    <typedef-decl name='hash_security_level_t' type-id='type-id-217' id='type-id-213'/>
-    <qualified-type-def type-id='type-id-210' const='yes' id='type-id-218'/>
-    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-219'/>
+    <typedef-decl name='hash_security_level_t' type-id='type-id-218' id='type-id-214'/>
+    <qualified-type-def type-id='type-id-211' const='yes' id='type-id-219'/>
+    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-220'/>
 
-    <array-type-def dimensions='1' type-id='type-id-219' size-in-bits='4096' id='type-id-209'>
+    <array-type-def dimensions='1' type-id='type-id-220' size-in-bits='4096' id='type-id-210'>
       <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
-    <typedef-decl name='sign_algo_list_st' type-id='type-id-208' id='type-id-199'/>
-    <class-decl name='ciphersuite_list_st' size-in-bits='16448' is-struct='yes' visibility='default' id='type-id-220'>
+    <typedef-decl name='sign_algo_list_st' type-id='type-id-209' id='type-id-200'/>
+    <class-decl name='ciphersuite_list_st' size-in-bits='16448' is-struct='yes' visibility='default' id='type-id-221'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-221' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-222' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16384'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_cipher_suite_entry_st' type-id='type-id-26' id='type-id-222'/>
+    <typedef-decl name='gnutls_cipher_suite_entry_st' type-id='type-id-26' id='type-id-223'/>
 
-    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='16384' id='type-id-221'>
-      <subrange length='256' type-id='type-id-38' id='type-id-223'/>
+    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='16384' id='type-id-222'>
+      <subrange length='256' type-id='type-id-38' id='type-id-224'/>
 
     </array-type-def>
-    <typedef-decl name='ciphersuite_list_st' type-id='type-id-220' id='type-id-200'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-224'>
+    <typedef-decl name='ciphersuite_list_st' type-id='type-id-221' id='type-id-201'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-225'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='SR_DISABLED' value='0'/>
       <enumerator name='SR_UNSAFE' value='1'/>
       <enumerator name='SR_PARTIAL' value='2'/>
       <enumerator name='SR_SAFE' value='3'/>
     </enum-decl>
-    <typedef-decl name='safe_renegotiation_t' type-id='type-id-224' id='type-id-201'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-225'>
+    <typedef-decl name='safe_renegotiation_t' type-id='type-id-225' id='type-id-202'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-226'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_SEC_PARAM_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_SEC_PARAM_INSECURE' value='5'/>
@@ -3050,15 +3060,15 @@
       <enumerator name='GNUTLS_SEC_PARAM_FUTURE' value='50'/>
       <enumerator name='GNUTLS_SEC_PARAM_MAX' value='50'/>
     </enum-decl>
-    <typedef-decl name='gnutls_sec_param_t' type-id='type-id-225' id='type-id-202'/>
-    <type-decl name='atomic_uint' size-in-bits='32' id='type-id-203'/>
-    <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-144'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-226' visibility='default' id='type-id-227'>
+    <typedef-decl name='gnutls_sec_param_t' type-id='type-id-226' id='type-id-203'/>
+    <type-decl name='atomic_uint' size-in-bits='32' id='type-id-204'/>
+    <pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-144'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-227' visibility='default' id='type-id-228'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='htype' type-id='type-id-186' visibility='default'/>
+        <var-decl name='htype' type-id='type-id-187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='rtype' type-id='type-id-186' visibility='default'/>
+        <var-decl name='rtype' type-id='type-id-187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='length' type-id='type-id-18' visibility='default'/>
@@ -3073,7 +3083,7 @@
         <var-decl name='end_offset' type-id='type-id-18' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='header' type-id='type-id-228' visibility='default'/>
+        <var-decl name='header' type-id='type-id-229' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <var-decl name='header_size' type-id='type-id-22' visibility='default'/>
@@ -3083,17 +3093,17 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='96' id='type-id-228'>
-      <subrange length='12' type-id='type-id-38' id='type-id-229'/>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='96' id='type-id-229'>
+      <subrange length='12' type-id='type-id-38' id='type-id-230'/>
 
     </array-type-def>
-    <typedef-decl name='handshake_buffer_st' type-id='type-id-227' id='type-id-226'/>
+    <typedef-decl name='handshake_buffer_st' type-id='type-id-228' id='type-id-227'/>
 
-    <array-type-def dimensions='1' type-id='type-id-226' size-in-bits='3456' id='type-id-145'>
-      <subrange length='6' type-id='type-id-38' id='type-id-230'/>
+    <array-type-def dimensions='1' type-id='type-id-227' size-in-bits='3456' id='type-id-145'>
+      <subrange length='6' type-id='type-id-38' id='type-id-231'/>
 
     </array-type-def>
-    <enum-decl name='record_send_state_t' id='type-id-231'>
+    <enum-decl name='record_send_state_t' id='type-id-232'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='RECORD_SEND_NORMAL' value='0'/>
       <enumerator name='RECORD_SEND_CORKED' value='1'/>
@@ -3102,69 +3112,69 @@
       <enumerator name='RECORD_SEND_KEY_UPDATE_2' value='4'/>
       <enumerator name='RECORD_SEND_KEY_UPDATE_3' value='5'/>
     </enum-decl>
-    <typedef-decl name='record_send_state_t' type-id='type-id-231' id='type-id-146'/>
-    <class-decl name='mod_auth_st_int' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-232'>
+    <typedef-decl name='record_send_state_t' type-id='type-id-232' id='type-id-146'/>
+    <class-decl name='mod_auth_st_int' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-233'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='gnutls_generate_server_certificate' type-id='type-id-233' visibility='default'/>
+        <var-decl name='gnutls_generate_server_certificate' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='gnutls_generate_client_certificate' type-id='type-id-233' visibility='default'/>
+        <var-decl name='gnutls_generate_client_certificate' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='gnutls_generate_server_kx' type-id='type-id-233' visibility='default'/>
+        <var-decl name='gnutls_generate_server_kx' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='gnutls_generate_client_kx' type-id='type-id-233' visibility='default'/>
+        <var-decl name='gnutls_generate_client_kx' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='gnutls_generate_client_crt_vrfy' type-id='type-id-233' visibility='default'/>
+        <var-decl name='gnutls_generate_client_crt_vrfy' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='gnutls_generate_server_crt_request' type-id='type-id-233' visibility='default'/>
+        <var-decl name='gnutls_generate_server_crt_request' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='gnutls_process_server_certificate' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_process_server_certificate' type-id='type-id-235' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='gnutls_process_client_certificate' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_process_client_certificate' type-id='type-id-235' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='gnutls_process_server_kx' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_process_server_kx' type-id='type-id-235' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='gnutls_process_client_kx' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_process_client_kx' type-id='type-id-235' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='gnutls_process_client_crt_vrfy' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_process_client_crt_vrfy' type-id='type-id-235' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='gnutls_process_server_crt_request' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_process_server_crt_request' type-id='type-id-235' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-4' size-in-bits='64' id='type-id-235'/>
-    <typedef-decl name='gnutls_session_t' type-id='type-id-235' id='type-id-236'/>
-    <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-237'/>
-    <pointer-type-def type-id='type-id-238' size-in-bits='64' id='type-id-233'/>
+    <pointer-type-def type-id='type-id-4' size-in-bits='64' id='type-id-236'/>
+    <typedef-decl name='gnutls_session_t' type-id='type-id-236' id='type-id-237'/>
+    <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-238'/>
     <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-234'/>
-    <qualified-type-def type-id='type-id-232' const='yes' id='type-id-240'/>
-    <pointer-type-def type-id='type-id-240' size-in-bits='64' id='type-id-147'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-241'>
+    <pointer-type-def type-id='type-id-240' size-in-bits='64' id='type-id-235'/>
+    <qualified-type-def type-id='type-id-233' const='yes' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-147'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-242'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_CERT_IGNORE' value='0'/>
       <enumerator name='GNUTLS_CERT_REQUEST' value='1'/>
       <enumerator name='GNUTLS_CERT_REQUIRE' value='2'/>
     </enum-decl>
-    <typedef-decl name='gnutls_certificate_request_t' type-id='type-id-241' id='type-id-148'/>
+    <typedef-decl name='gnutls_certificate_request_t' type-id='type-id-242' id='type-id-148'/>
     <typedef-decl name='gnutls_transport_ptr_t' type-id='type-id-101' id='type-id-154'/>
-    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-243'/>
-    <typedef-decl name='gnutls_pull_timeout_func' type-id='type-id-243' id='type-id-149'/>
-    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-245'/>
-    <typedef-decl name='gnutls_pull_func' type-id='type-id-245' id='type-id-150'/>
-    <typedef-decl name='gnutls_push_func' type-id='type-id-245' id='type-id-151'/>
-    <class-decl name='iovec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-246'>
+    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-244'/>
+    <typedef-decl name='gnutls_pull_timeout_func' type-id='type-id-244' id='type-id-149'/>
+    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-246'/>
+    <typedef-decl name='gnutls_pull_func' type-id='type-id-246' id='type-id-150'/>
+    <typedef-decl name='gnutls_push_func' type-id='type-id-246' id='type-id-151'/>
+    <class-decl name='iovec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-247'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='iov_base' type-id='type-id-101' visibility='default'/>
       </data-member>
@@ -3172,29 +3182,31 @@
         <var-decl name='iov_len' type-id='type-id-99' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='giovec_t' type-id='type-id-246' id='type-id-247'/>
-    <qualified-type-def type-id='type-id-247' const='yes' id='type-id-248'/>
-    <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-249'/>
-    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-251'/>
-    <typedef-decl name='gnutls_vec_push_func' type-id='type-id-251' id='type-id-152'/>
-    <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-253'/>
-    <typedef-decl name='gnutls_errno_func' type-id='type-id-253' id='type-id-153'/>
-    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
-    <typedef-decl name='gnutls_db_store_func' type-id='type-id-255' id='type-id-155'/>
-    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-257'/>
-    <typedef-decl name='gnutls_db_retr_func' type-id='type-id-257' id='type-id-156'/>
-    <pointer-type-def type-id='type-id-258' size-in-bits='64' id='type-id-259'/>
-    <typedef-decl name='gnutls_db_remove_func' type-id='type-id-259' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-261'/>
-    <typedef-decl name='gnutls_handshake_simple_hook_func' type-id='type-id-261' id='type-id-158'/>
-    <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-263'/>
-    <typedef-decl name='gnutls_handshake_hook_func' type-id='type-id-263' id='type-id-159'/>
-    <type-decl name='short int' size-in-bits='16' id='type-id-264'/>
-    <typedef-decl name='__int16_t' type-id='type-id-264' id='type-id-265'/>
-    <typedef-decl name='int16_t' type-id='type-id-265' id='type-id-160'/>
-    <class-decl name='gnutls_pcert_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-266'>
+    <typedef-decl name='giovec_t' type-id='type-id-247' id='type-id-248'/>
+    <qualified-type-def type-id='type-id-248' const='yes' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-250'/>
+    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-252'/>
+    <typedef-decl name='gnutls_vec_push_func' type-id='type-id-252' id='type-id-152'/>
+    <pointer-type-def type-id='type-id-253' size-in-bits='64' id='type-id-254'/>
+    <typedef-decl name='gnutls_errno_func' type-id='type-id-254' id='type-id-153'/>
+    <pointer-type-def type-id='type-id-255' size-in-bits='64' id='type-id-256'/>
+    <typedef-decl name='gnutls_db_store_func' type-id='type-id-256' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
+    <typedef-decl name='gnutls_db_retr_func' type-id='type-id-258' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
+    <typedef-decl name='gnutls_db_remove_func' type-id='type-id-260' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-262'/>
+    <typedef-decl name='gnutls_handshake_simple_hook_func' type-id='type-id-262' id='type-id-158'/>
+    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-264'/>
+    <typedef-decl name='gnutls_handshake_hook_func' type-id='type-id-264' id='type-id-159'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-265'/>
+    <typedef-decl name='__int16_t' type-id='type-id-265' id='type-id-266'/>
+    <typedef-decl name='int16_t' type-id='type-id-266' id='type-id-160'/>
+    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-268'/>
+    <typedef-decl name='gnutls_keylog_func' type-id='type-id-268' id='type-id-161'/>
+    <class-decl name='gnutls_pcert_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-269'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pubkey' type-id='type-id-267' visibility='default'/>
+        <var-decl name='pubkey' type-id='type-id-270' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cert' type-id='type-id-62' visibility='default'/>
@@ -3203,14 +3215,14 @@
         <var-decl name='type' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='gnutls_pubkey_st' size-in-bits='4096' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-268'/>
-    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-269'/>
-    <typedef-decl name='gnutls_pubkey_t' type-id='type-id-269' id='type-id-267'/>
-    <typedef-decl name='gnutls_pcert_st' type-id='type-id-266' id='type-id-270'/>
-    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-161'/>
-    <class-decl name='gnutls_privkey_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-271'/>
-    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-162'/>
-    <class-decl name='gnutls_ocsp_data_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-272'>
+    <class-decl name='gnutls_pubkey_st' size-in-bits='4096' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-271'/>
+    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-272'/>
+    <typedef-decl name='gnutls_pubkey_t' type-id='type-id-272' id='type-id-270'/>
+    <typedef-decl name='gnutls_pcert_st' type-id='type-id-269' id='type-id-273'/>
+    <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-162'/>
+    <class-decl name='gnutls_privkey_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-274'/>
+    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-163'/>
+    <class-decl name='gnutls_ocsp_data_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-275'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='version' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -3221,20 +3233,20 @@
         <var-decl name='exptime' type-id='type-id-17' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='padding' type-id='type-id-273' visibility='default'/>
+        <var-decl name='padding' type-id='type-id-276' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='256' id='type-id-273'>
+    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='256' id='type-id-276'>
       <subrange length='32' type-id='type-id-38' id='type-id-51'/>
 
     </array-type-def>
-    <typedef-decl name='gnutls_ocsp_data_st' type-id='type-id-272' id='type-id-274'/>
-    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-275'/>
-    <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-277'/>
-    <typedef-decl name='gnutls_status_request_ocsp_func' type-id='type-id-277' id='type-id-164'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-166' visibility='default' id='type-id-278'>
+    <typedef-decl name='gnutls_ocsp_data_st' type-id='type-id-275' id='type-id-277'/>
+    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-278'/>
+    <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-280'/>
+    <typedef-decl name='gnutls_status_request_ocsp_func' type-id='type-id-280' id='type-id-165'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-167' visibility='default' id='type-id-281'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='dcookie' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -3266,35 +3278,35 @@
         <var-decl name='async_term' type-id='type-id-17' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='last_retransmit' type-id='type-id-168' visibility='default'/>
+        <var-decl name='last_retransmit' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='packets_dropped' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-168'>
+    <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-169'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tv_sec' type-id='type-id-52' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tv_nsec' type-id='type-id-279' visibility='default'/>
+        <var-decl name='tv_nsec' type-id='type-id-282' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__syscall_slong_t' type-id='type-id-1' id='type-id-279'/>
-    <typedef-decl name='dtls_st' type-id='type-id-278' id='type-id-166'/>
+    <typedef-decl name='__syscall_slong_t' type-id='type-id-1' id='type-id-282'/>
+    <typedef-decl name='dtls_st' type-id='type-id-281' id='type-id-167'/>
 
-    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='288' id='type-id-167'>
-      <subrange length='36' type-id='type-id-38' id='type-id-280'/>
+    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='288' id='type-id-168'>
+      <subrange length='36' type-id='type-id-38' id='type-id-283'/>
 
     </array-type-def>
-    <enum-decl name='heartbeat_state_t' id='type-id-281'>
+    <enum-decl name='heartbeat_state_t' id='type-id-284'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='SHB_SEND1' value='0'/>
       <enumerator name='SHB_SEND2' value='1'/>
       <enumerator name='SHB_RECV' value='2'/>
     </enum-decl>
-    <typedef-decl name='heartbeat_state_t' type-id='type-id-281' id='type-id-169'/>
-    <enum-decl name='recv_state_t' id='type-id-282'>
+    <typedef-decl name='heartbeat_state_t' type-id='type-id-284' id='type-id-170'/>
+    <enum-decl name='recv_state_t' id='type-id-285'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='RECV_STATE_0' value='0'/>
       <enumerator name='RECV_STATE_DTLS_RETRANSMIT' value='1'/>
@@ -3306,12 +3318,12 @@
       <enumerator name='RECV_STATE_REHANDSHAKE' value='7'/>
       <enumerator name='RECV_STATE_REAUTH' value='8'/>
     </enum-decl>
-    <typedef-decl name='recv_state_t' type-id='type-id-282' id='type-id-170'/>
-    <typedef-decl name='gnutls_certificate_verify_function' type-id='type-id-260' id='type-id-283'/>
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-171'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-173' visibility='default' id='type-id-284'>
+    <typedef-decl name='recv_state_t' type-id='type-id-285' id='type-id-171'/>
+    <typedef-decl name='gnutls_certificate_verify_function' type-id='type-id-261' id='type-id-286'/>
+    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-172'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-174' visibility='default' id='type-id-287'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-285' visibility='default'/>
+        <var-decl name='type' type-id='type-id-288' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data' type-id='type-id-64' visibility='default'/>
@@ -3320,7 +3332,7 @@
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-286'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-289'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_DT_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_DT_DNS_HOSTNAME' value='1'/>
@@ -3328,15 +3340,15 @@
       <enumerator name='GNUTLS_DT_RFC822NAME' value='3'/>
       <enumerator name='GNUTLS_DT_IP_ADDRESS' value='4'/>
     </enum-decl>
-    <typedef-decl name='gnutls_vdata_types_t' type-id='type-id-286' id='type-id-285'/>
-    <typedef-decl name='gnutls_typed_vdata_st' type-id='type-id-284' id='type-id-173'/>
-    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-172'/>
+    <typedef-decl name='gnutls_vdata_types_t' type-id='type-id-289' id='type-id-288'/>
+    <typedef-decl name='gnutls_typed_vdata_st' type-id='type-id-287' id='type-id-174'/>
+    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-173'/>
 
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='1032' id='type-id-174'>
-      <subrange length='129' type-id='type-id-38' id='type-id-287'/>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='1032' id='type-id-175'>
+      <subrange length='129' type-id='type-id-38' id='type-id-290'/>
 
     </array-type-def>
-    <class-decl name='tfo_st' size-in-bits='1216' is-struct='yes' visibility='default' id='type-id-288'>
+    <class-decl name='tfo_st' size-in-bits='1216' is-struct='yes' visibility='default' id='type-id-291'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fd' type-id='type-id-22' visibility='default'/>
       </data-member>
@@ -3347,42 +3359,42 @@
         <var-decl name='connect_only' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='connect_addr' type-id='type-id-289' visibility='default'/>
+        <var-decl name='connect_addr' type-id='type-id-292' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='connect_addrlen' type-id='type-id-290' visibility='default'/>
+        <var-decl name='connect_addrlen' type-id='type-id-293' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='sockaddr_storage' size-in-bits='1024' is-struct='yes' visibility='default' id='type-id-289'>
+    <class-decl name='sockaddr_storage' size-in-bits='1024' is-struct='yes' visibility='default' id='type-id-292'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ss_family' type-id='type-id-291' visibility='default'/>
+        <var-decl name='ss_family' type-id='type-id-294' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='__ss_padding' type-id='type-id-292' visibility='default'/>
+        <var-decl name='__ss_padding' type-id='type-id-295' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <var-decl name='__ss_align' type-id='type-id-38' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='sa_family_t' type-id='type-id-24' id='type-id-291'/>
+    <typedef-decl name='sa_family_t' type-id='type-id-24' id='type-id-294'/>
 
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='944' id='type-id-292'>
-      <subrange length='118' type-id='type-id-38' id='type-id-293'/>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='944' id='type-id-295'>
+      <subrange length='118' type-id='type-id-38' id='type-id-296'/>
 
     </array-type-def>
-    <typedef-decl name='__socklen_t' type-id='type-id-10' id='type-id-294'/>
-    <typedef-decl name='socklen_t' type-id='type-id-294' id='type-id-290'/>
-    <typedef-decl name='tfo_st' type-id='type-id-288' id='type-id-175'/>
-    <class-decl name='gnutls_supplemental_entry_st' size-in-bits='256' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-295'/>
-    <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-176'/>
-    <class-decl name='hello_ext_entry_st' size-in-bits='640' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-296'/>
-    <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-177'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-297'>
+    <typedef-decl name='__socklen_t' type-id='type-id-10' id='type-id-297'/>
+    <typedef-decl name='socklen_t' type-id='type-id-297' id='type-id-293'/>
+    <typedef-decl name='tfo_st' type-id='type-id-291' id='type-id-176'/>
+    <class-decl name='gnutls_supplemental_entry_st' size-in-bits='256' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-298'/>
+    <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-177'/>
+    <class-decl name='hello_ext_entry_st' size-in-bits='640' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-299'/>
+    <pointer-type-def type-id='type-id-299' size-in-bits='64' id='type-id-178'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-300'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='priv' type-id='type-id-298' visibility='default'/>
+        <var-decl name='priv' type-id='type-id-301' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='resumed_priv' type-id='type-id-298' visibility='default'/>
+        <var-decl name='resumed_priv' type-id='type-id-301' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='set' type-id='type-id-16' visibility='default'/>
@@ -3391,13 +3403,13 @@
         <var-decl name='resumed_set' type-id='type-id-16' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_ext_priv_data_t' type-id='type-id-101' id='type-id-298'/>
+    <typedef-decl name='gnutls_ext_priv_data_t' type-id='type-id-101' id='type-id-301'/>
 
-    <array-type-def dimensions='1' type-id='type-id-297' size-in-bits='6144' id='type-id-178'>
+    <array-type-def dimensions='1' type-id='type-id-300' size-in-bits='6144' id='type-id-179'>
       <subrange length='32' type-id='type-id-38' id='type-id-51'/>
 
     </array-type-def>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-299'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-302'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_EXT_FLAG_OVERRIDE_INTERNAL' value='1'/>
       <enumerator name='GNUTLS_EXT_FLAG_CLIENT_HELLO' value='2'/>
@@ -3409,13 +3421,13 @@
       <enumerator name='GNUTLS_EXT_FLAG_TLS' value='128'/>
       <enumerator name='GNUTLS_EXT_FLAG_DTLS' value='256'/>
     </enum-decl>
-    <typedef-decl name='gnutls_ext_flags_t' type-id='type-id-299' id='type-id-179'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='3136' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-180' visibility='default' id='type-id-300'>
+    <typedef-decl name='gnutls_ext_flags_t' type-id='type-id-302' id='type-id-180'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='3136' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-181' visibility='default' id='type-id-303'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='arrival_time' type-id='type-id-168' visibility='default'/>
+        <var-decl name='arrival_time' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='creation_time' type-id='type-id-168' visibility='default'/>
+        <var-decl name='creation_time' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='lifetime' type-id='type-id-18' visibility='default'/>
@@ -3424,7 +3436,7 @@
         <var-decl name='age_add' type-id='type-id-18' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='nonce' type-id='type-id-301' visibility='default'/>
+        <var-decl name='nonce' type-id='type-id-304' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
         <var-decl name='nonce_size' type-id='type-id-99' visibility='default'/>
@@ -3440,24 +3452,24 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2040' id='type-id-301'>
-      <subrange length='255' type-id='type-id-38' id='type-id-302'/>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2040' id='type-id-304'>
+      <subrange length='255' type-id='type-id-38' id='type-id-305'/>
 
     </array-type-def>
-    <typedef-decl name='tls13_ticket_st' type-id='type-id-300' id='type-id-180'/>
-    <class-decl name='gnutls_anti_replay_st' size-in-bits='320' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-303'/>
-    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-304'/>
-    <typedef-decl name='gnutls_anti_replay_t' type-id='type-id-304' id='type-id-181'/>
+    <typedef-decl name='tls13_ticket_st' type-id='type-id-303' id='type-id-181'/>
+    <class-decl name='gnutls_anti_replay_st' size-in-bits='320' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-306'/>
+    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-307'/>
+    <typedef-decl name='gnutls_anti_replay_t' type-id='type-id-307' id='type-id-182'/>
     <typedef-decl name='internals_st' type-id='type-id-137' id='type-id-7'/>
-    <class-decl name='gnutls_key_st' size-in-bits='22656' is-struct='yes' visibility='default' id='type-id-305'>
+    <class-decl name='gnutls_key_st' size-in-bits='22656' is-struct='yes' visibility='default' id='type-id-308'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='kshare' type-id='type-id-306' visibility='default'/>
+        <var-decl name='kshare' type-id='type-id-309' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11520'>
-        <var-decl name='proto' type-id='type-id-307' visibility='default'/>
+        <var-decl name='proto' type-id='type-id-310' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='20096'>
-        <var-decl name='binders' type-id='type-id-308' visibility='default'/>
+        <var-decl name='binders' type-id='type-id-311' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='20608'>
         <var-decl name='key' type-id='type-id-62' visibility='default'/>
@@ -3475,32 +3487,32 @@
         <var-decl name='auth_info' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22336'>
-        <var-decl name='auth_info_type' type-id='type-id-309' visibility='default'/>
+        <var-decl name='auth_info_type' type-id='type-id-312' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22368'>
         <var-decl name='auth_info_size' type-id='type-id-22' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22400'>
-        <var-decl name='cred' type-id='type-id-310' visibility='default'/>
+        <var-decl name='cred' type-id='type-id-313' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='22464'>
-        <var-decl name='totp' type-id='type-id-311' visibility='default'/>
+        <var-decl name='totp' type-id='type-id-314' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='11520' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-306'>
+    <class-decl name='__anonymous_struct__' size-in-bits='11520' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-309'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ecdh_params' type-id='type-id-312' visibility='default'/>
+        <var-decl name='ecdh_params' type-id='type-id-315' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='ecdhx_params' type-id='type-id-312' visibility='default'/>
+        <var-decl name='ecdhx_params' type-id='type-id-315' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7680'>
-        <var-decl name='dh_params' type-id='type-id-312' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-315' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='3840' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-312' visibility='default' id='type-id-313'>
+    <class-decl name='__anonymous_struct__' size-in-bits='3840' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-315' visibility='default' id='type-id-316'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-314' visibility='default'/>
+        <var-decl name='params' type-id='type-id-317' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <var-decl name='params_nr' type-id='type-id-10' visibility='default'/>
@@ -3518,7 +3530,7 @@
         <var-decl name='dh_group' type-id='type-id-56' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1184'>
-        <var-decl name='gost_params' type-id='type-id-315' visibility='default'/>
+        <var-decl name='gost_params' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <var-decl name='raw_pub' type-id='type-id-62' visibility='default'/>
@@ -3530,25 +3542,25 @@
         <var-decl name='seed_size' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='seed' type-id='type-id-316' visibility='default'/>
+        <var-decl name='seed' type-id='type-id-319' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3552'>
-        <var-decl name='palgo' type-id='type-id-211' visibility='default'/>
+        <var-decl name='palgo' type-id='type-id-212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3584'>
-        <var-decl name='spki' type-id='type-id-317' visibility='default'/>
+        <var-decl name='spki' type-id='type-id-320' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
         <var-decl name='algo' type-id='type-id-60' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='bigint_t' type-id='type-id-101' id='type-id-318'/>
+    <typedef-decl name='bigint_t' type-id='type-id-101' id='type-id-321'/>
 
-    <array-type-def dimensions='1' type-id='type-id-318' size-in-bits='1024' id='type-id-314'>
+    <array-type-def dimensions='1' type-id='type-id-321' size-in-bits='1024' id='type-id-317'>
       <subrange length='16' type-id='type-id-38' id='type-id-93'/>
 
     </array-type-def>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-319'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-322'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_TC26_Z' value='1'/>
@@ -3557,18 +3569,18 @@
       <enumerator name='GNUTLS_GOST_PARAMSET_CP_C' value='4'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_CP_D' value='5'/>
     </enum-decl>
-    <typedef-decl name='gnutls_gost_paramset_t' type-id='type-id-319' id='type-id-315'/>
+    <typedef-decl name='gnutls_gost_paramset_t' type-id='type-id-322' id='type-id-318'/>
 
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2048' id='type-id-316'>
-      <subrange length='256' type-id='type-id-38' id='type-id-223'/>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2048' id='type-id-319'>
+      <subrange length='256' type-id='type-id-38' id='type-id-224'/>
 
     </array-type-def>
-    <class-decl name='gnutls_x509_spki_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-320'>
+    <class-decl name='gnutls_x509_spki_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-323'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pk' type-id='type-id-60' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='rsa_pss_dig' type-id='type-id-211' visibility='default'/>
+        <var-decl name='rsa_pss_dig' type-id='type-id-212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='salt_size' type-id='type-id-10' visibility='default'/>
@@ -3577,23 +3589,23 @@
         <var-decl name='legacy' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='dsa_dig' type-id='type-id-211' visibility='default'/>
+        <var-decl name='dsa_dig' type-id='type-id-212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_x509_spki_st' type-id='type-id-320' id='type-id-317'/>
-    <typedef-decl name='gnutls_pk_params_st' type-id='type-id-313' id='type-id-312'/>
-    <union-decl name='__anonymous_union__' size-in-bits='8576' is-anonymous='yes' visibility='default' id='type-id-307'>
+    <typedef-decl name='gnutls_x509_spki_st' type-id='type-id-323' id='type-id-320'/>
+    <typedef-decl name='gnutls_pk_params_st' type-id='type-id-316' id='type-id-315'/>
+    <union-decl name='__anonymous_union__' size-in-bits='8576' is-anonymous='yes' visibility='default' id='type-id-310'>
       <data-member access='private'>
-        <var-decl name='tls13' type-id='type-id-321' visibility='default'/>
+        <var-decl name='tls13' type-id='type-id-324' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='tls12' type-id='type-id-322' visibility='default'/>
+        <var-decl name='tls12' type-id='type-id-325' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='4128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-321'>
+    <class-decl name='__anonymous_struct__' size-in-bits='4128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-324'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='temp_secret' type-id='type-id-89' visibility='default'/>
       </data-member>
@@ -3622,69 +3634,69 @@
         <var-decl name='ap_rms' type-id='type-id-89' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='8576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-322'>
+    <class-decl name='__anonymous_struct__' size-in-bits='8576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-325'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ecdh' type-id='type-id-323' visibility='default'/>
+        <var-decl name='ecdh' type-id='type-id-326' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
-        <var-decl name='dh' type-id='type-id-324' visibility='default'/>
+        <var-decl name='dh' type-id='type-id-327' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8000'>
-        <var-decl name='srp' type-id='type-id-325' visibility='default'/>
+        <var-decl name='srp' type-id='type-id-328' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='4096' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-323'>
+    <class-decl name='__anonymous_struct__' size-in-bits='4096' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-326'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-312' visibility='default'/>
+        <var-decl name='params' type-id='type-id-315' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='x' type-id='type-id-318' visibility='default'/>
+        <var-decl name='x' type-id='type-id-321' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='y' type-id='type-id-318' visibility='default'/>
+        <var-decl name='y' type-id='type-id-321' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
         <var-decl name='raw' type-id='type-id-62' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='3904' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-324'>
+    <class-decl name='__anonymous_struct__' size-in-bits='3904' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-327'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-312' visibility='default'/>
+        <var-decl name='params' type-id='type-id-315' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='client_Y' type-id='type-id-318' visibility='default'/>
+        <var-decl name='client_Y' type-id='type-id-321' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-325'>
+    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-328'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='srp_key' type-id='type-id-318' visibility='default'/>
+        <var-decl name='srp_key' type-id='type-id-321' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='srp_g' type-id='type-id-318' visibility='default'/>
+        <var-decl name='srp_g' type-id='type-id-321' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='srp_p' type-id='type-id-318' visibility='default'/>
+        <var-decl name='srp_p' type-id='type-id-321' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='A' type-id='type-id-318' visibility='default'/>
+        <var-decl name='A' type-id='type-id-321' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='B' type-id='type-id-318' visibility='default'/>
+        <var-decl name='B' type-id='type-id-321' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='u' type-id='type-id-318' visibility='default'/>
+        <var-decl name='u' type-id='type-id-321' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='b' type-id='type-id-318' visibility='default'/>
+        <var-decl name='b' type-id='type-id-321' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='a' type-id='type-id-318' visibility='default'/>
+        <var-decl name='a' type-id='type-id-321' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='x' type-id='type-id-318' visibility='default'/>
+        <var-decl name='x' type-id='type-id-321' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='binder_data_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-326'>
+    <class-decl name='binder_data_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-329'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='prf' type-id='type-id-13' visibility='default'/>
       </data-member>
@@ -3699,11 +3711,11 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-326' size-in-bits='512' id='type-id-308'>
+    <array-type-def dimensions='1' type-id='type-id-329' size-in-bits='512' id='type-id-311'>
       <subrange length='2' type-id='type-id-38' id='type-id-40'/>
 
     </array-type-def>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-327'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-330'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_CRD_CERTIFICATE' value='1'/>
       <enumerator name='GNUTLS_CRD_ANON' value='2'/>
@@ -3711,21 +3723,21 @@
       <enumerator name='GNUTLS_CRD_PSK' value='4'/>
       <enumerator name='GNUTLS_CRD_IA' value='5'/>
     </enum-decl>
-    <typedef-decl name='gnutls_credentials_type_t' type-id='type-id-327' id='type-id-309'/>
-    <class-decl name='auth_cred_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-328'>
+    <typedef-decl name='gnutls_credentials_type_t' type-id='type-id-330' id='type-id-312'/>
+    <class-decl name='auth_cred_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-331'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='algorithm' type-id='type-id-309' visibility='default'/>
+        <var-decl name='algorithm' type-id='type-id-312' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='credentials' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='next' type-id='type-id-310' visibility='default'/>
+        <var-decl name='next' type-id='type-id-313' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-310'/>
-    <typedef-decl name='auth_cred_st' type-id='type-id-328' id='type-id-329'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-311'>
+    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-313'/>
+    <typedef-decl name='auth_cred_st' type-id='type-id-331' id='type-id-332'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-314'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='last_result' type-id='type-id-80' visibility='default'/>
       </data-member>
@@ -3733,13 +3745,13 @@
         <var-decl name='was_rotated' type-id='type-id-16' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='cb' type-id='type-id-330' visibility='default'/>
+        <var-decl name='cb' type-id='type-id-333' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-332'/>
-    <typedef-decl name='gnutls_stek_rotation_callback_t' type-id='type-id-332' id='type-id-330'/>
-    <typedef-decl name='gnutls_key_st' type-id='type-id-305' id='type-id-8'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-333' visibility='default' id='type-id-334'>
+    <pointer-type-def type-id='type-id-334' size-in-bits='64' id='type-id-335'/>
+    <typedef-decl name='gnutls_stek_rotation_callback_t' type-id='type-id-335' id='type-id-333'/>
+    <typedef-decl name='gnutls_key_st' type-id='type-id-308' id='type-id-8'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-336' visibility='default' id='type-id-337'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='low' type-id='type-id-99' visibility='default'/>
       </data-member>
@@ -3747,26 +3759,26 @@
         <var-decl name='high' type-id='type-id-99' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_range_st' type-id='type-id-334' id='type-id-333'/>
-    <qualified-type-def type-id='type-id-333' const='yes' id='type-id-335'/>
-    <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-336'/>
+    <typedef-decl name='gnutls_range_st' type-id='type-id-337' id='type-id-336'/>
+    <qualified-type-def type-id='type-id-336' const='yes' id='type-id-338'/>
+    <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-339'/>
     <function-decl name='gnutls_record_send_range' mangled-name='gnutls_record_send_range' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_send_range@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-99' name='data_size'/>
-      <parameter type-id='type-id-336' name='range'/>
+      <parameter type-id='type-id-339' name='range'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-337'/>
+    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-340'/>
     <function-decl name='gnutls_range_split' mangled-name='gnutls_range_split' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_range_split@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-336' name='orig'/>
-      <parameter type-id='type-id-337' name='next'/>
-      <parameter type-id='type-id-337' name='remainder'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-339' name='orig'/>
+      <parameter type-id='type-id-340' name='next'/>
+      <parameter type-id='type-id-340' name='remainder'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_record_can_use_length_hiding' mangled-name='gnutls_record_can_use_length_hiding' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_can_use_length_hiding@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='_gnutls_log' mangled-name='_gnutls_log' visibility='default' binding='global' size-in-bits='64'>
@@ -3775,56 +3787,65 @@
     <function-decl name='_gnutls_send_tlen_int' mangled-name='_gnutls_send_tlen_int' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='__stack_chk_fail' mangled-name='__stack_chk_fail' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='gnutls_dtls_get_data_mtu' mangled-name='gnutls_dtls_get_data_mtu' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_epoch_get' mangled-name='_gnutls_epoch_get' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-260'>
-      <parameter type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-261'>
+      <parameter type-id='type-id-237'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-238'>
-      <parameter type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-267'>
       <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-239'>
-      <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-191'/>
+      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-238'/>
+      <return type-id='type-id-22'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-240'>
+      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-192'/>
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-262'>
-      <parameter type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-263'>
+      <parameter type-id='type-id-237'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-57'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-276'>
-      <parameter type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-279'>
+      <parameter type-id='type-id-237'/>
       <parameter type-id='type-id-101'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-252'>
+    <function-type size-in-bits='64' id='type-id-253'>
       <parameter type-id='type-id-154'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-242'>
+    <function-type size-in-bits='64' id='type-id-243'>
       <parameter type-id='type-id-154'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-258'>
+    <function-type size-in-bits='64' id='type-id-259'>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-62'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-254'>
+    <function-type size-in-bits='64' id='type-id-255'>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-62'/>
       <parameter type-id='type-id-62'/>
@@ -3857,24 +3878,24 @@
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-256'>
+    <function-type size-in-bits='64' id='type-id-257'>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-62'/>
       <return type-id='type-id-62'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-250'>
+    <function-type size-in-bits='64' id='type-id-251'>
       <parameter type-id='type-id-154'/>
-      <parameter type-id='type-id-249'/>
+      <parameter type-id='type-id-250'/>
       <parameter type-id='type-id-22'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-244'>
+    <function-type size-in-bits='64' id='type-id-245'>
       <parameter type-id='type-id-154'/>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-331'>
+    <function-type size-in-bits='64' id='type-id-334'>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-80'/>
@@ -3895,8 +3916,8 @@
       <return type-id='type-id-101'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='record.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='hello_ext_entry_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-296'>
+  <abi-instr version='1.0' address-size='64' path='record.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='hello_ext_entry_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-299'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
@@ -3910,34 +3931,34 @@
         <var-decl name='gid' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='client_parse_point' type-id='type-id-338' visibility='default'/>
+        <var-decl name='client_parse_point' type-id='type-id-341' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='server_parse_point' type-id='type-id-338' visibility='default'/>
+        <var-decl name='server_parse_point' type-id='type-id-341' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <var-decl name='validity' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='recv_func' type-id='type-id-339' visibility='default'/>
+        <var-decl name='recv_func' type-id='type-id-342' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='send_func' type-id='type-id-340' visibility='default'/>
+        <var-decl name='send_func' type-id='type-id-343' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='deinit_func' type-id='type-id-341' visibility='default'/>
+        <var-decl name='deinit_func' type-id='type-id-344' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='pack_func' type-id='type-id-342' visibility='default'/>
+        <var-decl name='pack_func' type-id='type-id-345' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='unpack_func' type-id='type-id-343' visibility='default'/>
+        <var-decl name='unpack_func' type-id='type-id-346' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <var-decl name='cannot_be_overriden' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-344'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-347'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_EXT_ANY' value='0'/>
       <enumerator name='GNUTLS_EXT_APPLICATION' value='1'/>
@@ -3946,63 +3967,63 @@
       <enumerator name='GNUTLS_EXT_NONE' value='4'/>
       <enumerator name='GNUTLS_EXT_VERSION_NEG' value='5'/>
     </enum-decl>
-    <typedef-decl name='gnutls_ext_parse_type_t' type-id='type-id-344' id='type-id-338'/>
-    <qualified-type-def type-id='type-id-35' const='yes' id='type-id-345'/>
-    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-346'/>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-348'/>
-    <typedef-decl name='gnutls_ext_recv_func' type-id='type-id-348' id='type-id-339'/>
-    <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-349'/>
-    <typedef-decl name='gnutls_buffer_t' type-id='type-id-349' id='type-id-350'/>
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-352'/>
-    <typedef-decl name='gnutls_ext_send_func' type-id='type-id-352' id='type-id-340'/>
-    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-354'/>
-    <typedef-decl name='gnutls_ext_deinit_data_func' type-id='type-id-354' id='type-id-341'/>
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-356'/>
-    <typedef-decl name='gnutls_ext_pack_func' type-id='type-id-356' id='type-id-342'/>
-    <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-357'/>
+    <typedef-decl name='gnutls_ext_parse_type_t' type-id='type-id-347' id='type-id-341'/>
+    <qualified-type-def type-id='type-id-35' const='yes' id='type-id-348'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-349'/>
+    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-351'/>
+    <typedef-decl name='gnutls_ext_recv_func' type-id='type-id-351' id='type-id-342'/>
+    <pointer-type-def type-id='type-id-191' size-in-bits='64' id='type-id-352'/>
+    <typedef-decl name='gnutls_buffer_t' type-id='type-id-352' id='type-id-353'/>
+    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-355'/>
+    <typedef-decl name='gnutls_ext_send_func' type-id='type-id-355' id='type-id-343'/>
+    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-357'/>
+    <typedef-decl name='gnutls_ext_deinit_data_func' type-id='type-id-357' id='type-id-344'/>
     <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-359'/>
-    <typedef-decl name='gnutls_ext_unpack_func' type-id='type-id-359' id='type-id-343'/>
+    <typedef-decl name='gnutls_ext_pack_func' type-id='type-id-359' id='type-id-345'/>
+    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-360'/>
+    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-362'/>
+    <typedef-decl name='gnutls_ext_unpack_func' type-id='type-id-362' id='type-id-346'/>
     <function-decl name='gnutls_record_set_timeout' mangled-name='gnutls_record_set_timeout' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_set_timeout@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='ms'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_record_recv_seq' mangled-name='gnutls_record_recv_seq' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_recv_seq@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-99' name='data_size'/>
       <parameter type-id='type-id-64' name='seq'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_recv' mangled-name='gnutls_record_recv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_recv@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-99' name='data_size'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_uncork' mangled-name='gnutls_record_uncork' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_uncork@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_record_cork' mangled-name='gnutls_record_cork' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_cork@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_record_recv_early_data' mangled-name='gnutls_record_recv_early_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_recv_early_data@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-99' name='data_size'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_send_early_data' mangled-name='gnutls_record_send_early_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_send_early_data@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-99' name='data_size'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_send2' mangled-name='gnutls_record_send2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_send2@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-99' name='data_size'/>
       <parameter type-id='type-id-99' name='pad'/>
@@ -4010,90 +4031,90 @@
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_send' mangled-name='gnutls_record_send' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_send@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-99' name='data_size'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <typedef-decl name='gnutls_packet_t' type-id='type-id-183' id='type-id-360'/>
-    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-361'/>
+    <typedef-decl name='gnutls_packet_t' type-id='type-id-184' id='type-id-363'/>
+    <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-364'/>
     <function-decl name='gnutls_record_recv_packet' mangled-name='gnutls_record_recv_packet' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_recv_packet@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-361' name='packet'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-364' name='packet'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_discard_queued' mangled-name='gnutls_record_discard_queued' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_discard_queued@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-99'/>
     </function-decl>
     <function-decl name='gnutls_packet_deinit' mangled-name='gnutls_packet_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_packet_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-360' name='packet'/>
+      <parameter type-id='type-id-363' name='packet'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_packet_get' mangled-name='gnutls_packet_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_packet_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-360' name='packet'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-363' name='packet'/>
+      <parameter type-id='type-id-278' name='data'/>
       <parameter type-id='type-id-64' name='sequence'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-362'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-365'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_SHUT_RDWR' value='0'/>
       <enumerator name='GNUTLS_SHUT_WR' value='1'/>
     </enum-decl>
-    <typedef-decl name='gnutls_close_request_t' type-id='type-id-362' id='type-id-363'/>
+    <typedef-decl name='gnutls_close_request_t' type-id='type-id-365' id='type-id-366'/>
     <function-decl name='gnutls_bye' mangled-name='gnutls_bye' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_bye@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-363' name='how'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-366' name='how'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_transport_get_int' mangled-name='gnutls_transport_get_int' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_get_int@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-364'/>
+    <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-367'/>
     <function-decl name='gnutls_transport_get_int2' mangled-name='gnutls_transport_get_int2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_get_int2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-364' name='recv_int'/>
-      <parameter type-id='type-id-364' name='send_int'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-367' name='recv_int'/>
+      <parameter type-id='type-id-367' name='send_int'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-365'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-368'/>
     <function-decl name='gnutls_transport_get_ptr2' mangled-name='gnutls_transport_get_ptr2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_get_ptr2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-365' name='recv_ptr'/>
-      <parameter type-id='type-id-365' name='send_ptr'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-368' name='recv_ptr'/>
+      <parameter type-id='type-id-368' name='send_ptr'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_transport_get_ptr' mangled-name='gnutls_transport_get_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_get_ptr@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-154'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_int2' mangled-name='gnutls_transport_set_int2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_int2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-22' name='recv_fd'/>
       <parameter type-id='type-id-22' name='send_fd'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_ptr2' mangled-name='gnutls_transport_set_ptr2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_ptr2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-154' name='recv_ptr'/>
       <parameter type-id='type-id-154' name='send_ptr'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_ptr' mangled-name='gnutls_transport_set_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_ptr@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-154' name='ptr'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_record_disable_padding' mangled-name='gnutls_record_disable_padding' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_disable_padding@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_mbuffer_head_get_first' mangled-name='_mbuffer_head_get_first' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__builtin_memcpy' mangled-name='memcpy' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='__builtin_memcpy' mangled-name='memcpy' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_mbuffer_head_get_first' mangled-name='_mbuffer_head_get_first' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_mbuffer_head_remove_bytes' mangled-name='_mbuffer_head_remove_bytes' visibility='default' binding='global' size-in-bits='64'>
@@ -4204,65 +4225,68 @@
     <function-decl name='gnutls_handshake' mangled-name='gnutls_handshake' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-358'>
-      <parameter type-id='type-id-350'/>
-      <parameter type-id='type-id-357'/>
+    <function-type size-in-bits='64' id='type-id-361'>
+      <parameter type-id='type-id-353'/>
+      <parameter type-id='type-id-360'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-355'>
-      <parameter type-id='type-id-298'/>
-      <parameter type-id='type-id-350'/>
+    <function-type size-in-bits='64' id='type-id-358'>
+      <parameter type-id='type-id-301'/>
+      <parameter type-id='type-id-353'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-347'>
-      <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-346'/>
+    <function-type size-in-bits='64' id='type-id-350'>
+      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-349'/>
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-351'>
-      <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-350'/>
+    <function-type size-in-bits='64' id='type-id-354'>
+      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-353'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-353'>
-      <parameter type-id='type-id-298'/>
+    <function-type size-in-bits='64' id='type-id-356'>
+      <parameter type-id='type-id-301'/>
       <return type-id='type-id-111'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='compress.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-366'>
+  <abi-instr version='1.0' address-size='64' path='compress.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-369'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_COMP_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_COMP_NULL' value='1'/>
       <enumerator name='GNUTLS_COMP_DEFLATE' value='2'/>
       <enumerator name='GNUTLS_COMP_ZLIB' value='2'/>
     </enum-decl>
-    <typedef-decl name='gnutls_compression_method_t' type-id='type-id-366' id='type-id-367'/>
-    <qualified-type-def type-id='type-id-367' const='yes' id='type-id-368'/>
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-369'/>
+    <typedef-decl name='gnutls_compression_method_t' type-id='type-id-369' id='type-id-370'/>
+    <qualified-type-def type-id='type-id-370' const='yes' id='type-id-371'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-372'/>
     <function-decl name='gnutls_compression_list' mangled-name='gnutls_compression_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_compression_list@@GNUTLS_3_4'>
-      <return type-id='type-id-369'/>
+      <return type-id='type-id-372'/>
     </function-decl>
     <function-decl name='gnutls_compression_get_id' mangled-name='gnutls_compression_get_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_compression_get_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='name'/>
-      <return type-id='type-id-367'/>
+      <return type-id='type-id-370'/>
     </function-decl>
     <function-decl name='gnutls_compression_get_name' mangled-name='gnutls_compression_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_compression_get_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-367' name='algorithm'/>
+      <parameter type-id='type-id-370' name='algorithm'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='c_strcasecmp' mangled-name='c_strcasecmp' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='debug.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='debug.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_handshake_description_get_name' mangled-name='gnutls_handshake_description_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_description_get_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-186' name='type'/>
+      <parameter type-id='type-id-187' name='type'/>
       <return type-id='type-id-27'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cipher.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cipher.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <function-decl name='__builtin___memcpy_chk' mangled-name='__memcpy_chk' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_auth_cipher_add_auth' mangled-name='_gnutls_auth_cipher_add_auth' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -4281,7 +4305,7 @@
     <function-decl name='cbc_mac_verify' mangled-name='cbc_mac_verify' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='__builtin_memset' mangled-name='memset' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__builtin___memset_chk' mangled-name='__memset_chk' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_aead_cipher_decrypt' mangled-name='gnutls_aead_cipher_decrypt' visibility='default' binding='global' size-in-bits='64'>
@@ -4297,8 +4321,8 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='handshake-tls13.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_session_int' size-in-bits='52736' is-struct='yes' visibility='default' id='type-id-370'>
+  <abi-instr version='1.0' address-size='64' path='handshake-tls13.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_session_int' size-in-bits='52800' is-struct='yes' visibility='default' id='type-id-373'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='security_parameters' type-id='type-id-5' visibility='default'/>
       </data-member>
@@ -4306,13 +4330,13 @@
         <var-decl name='record_parameters' type-id='type-id-6' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='internals' type-id='type-id-371' visibility='default'/>
+        <var-decl name='internals' type-id='type-id-374' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='30080'>
+      <data-member access='public' layout-offset-in-bits='30144'>
         <var-decl name='key' type-id='type-id-8' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='27776' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-371' visibility='default' id='type-id-372'>
+    <class-decl name='__anonymous_struct__' size-in-bits='27840' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-374' visibility='default' id='type-id-375'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='record_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
@@ -4515,298 +4539,301 @@
         <var-decl name='h_post' type-id='type-id-160' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
-        <var-decl name='selected_cert_list' type-id='type-id-161' visibility='default'/>
+        <var-decl name='keylog_func' type-id='type-id-161' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10560'>
-        <var-decl name='selected_cert_list_length' type-id='type-id-11' visibility='default'/>
+        <var-decl name='selected_cert_list' type-id='type-id-162' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10624'>
-        <var-decl name='selected_key' type-id='type-id-373' visibility='default'/>
+        <var-decl name='selected_cert_list_length' type-id='type-id-11' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10688'>
-        <var-decl name='selected_ocsp' type-id='type-id-163' visibility='default'/>
+        <var-decl name='selected_key' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10752'>
-        <var-decl name='selected_ocsp_length' type-id='type-id-11' visibility='default'/>
+        <var-decl name='selected_ocsp' type-id='type-id-164' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10816'>
-        <var-decl name='selected_ocsp_func' type-id='type-id-164' visibility='default'/>
+        <var-decl name='selected_ocsp_length' type-id='type-id-11' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10880'>
-        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
+        <var-decl name='selected_ocsp_func' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10944'>
+        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='11008'>
         <var-decl name='selected_need_free' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='10952'>
-        <var-decl name='default_record_version' type-id='type-id-165' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='11016'>
+        <var-decl name='default_record_version' type-id='type-id-166' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='10968'>
-        <var-decl name='default_hello_version' type-id='type-id-165' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='11032'>
+        <var-decl name='default_hello_version' type-id='type-id-166' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11008'>
+      <data-member access='public' layout-offset-in-bits='11072'>
         <var-decl name='user_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11072'>
+      <data-member access='public' layout-offset-in-bits='11136'>
         <var-decl name='direction' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11080'>
+      <data-member access='public' layout-offset-in-bits='11144'>
         <var-decl name='ignore_rdn_sequence' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11088'>
-        <var-decl name='rsa_pms_version' type-id='type-id-165' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='11152'>
+        <var-decl name='rsa_pms_version' type-id='type-id-166' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11104'>
+      <data-member access='public' layout-offset-in-bits='11168'>
         <var-decl name='errnum' type-id='type-id-22' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11136'>
+      <data-member access='public' layout-offset-in-bits='11200'>
         <var-decl name='initial_negotiation_completed' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11200'>
+      <data-member access='public' layout-offset-in-bits='11264'>
         <var-decl name='post_negotiation_lock' type-id='type-id-101' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11264'>
+      <data-member access='public' layout-offset-in-bits='11328'>
         <var-decl name='transport' type-id='type-id-74' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11328'>
-        <var-decl name='dtls' type-id='type-id-166' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='11392'>
+        <var-decl name='dtls' type-id='type-id-167' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11904'>
+      <data-member access='public' layout-offset-in-bits='11968'>
         <var-decl name='handshake_suspicious_loops' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11936'>
+      <data-member access='public' layout-offset-in-bits='12000'>
         <var-decl name='handshake_in_progress' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11944'>
+      <data-member access='public' layout-offset-in-bits='12008'>
         <var-decl name='premaster_set' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11968'>
+      <data-member access='public' layout-offset-in-bits='12032'>
         <var-decl name='cb_tls_unique_len' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12000'>
-        <var-decl name='cb_tls_unique' type-id='type-id-167' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='12064'>
+        <var-decl name='cb_tls_unique' type-id='type-id-168' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12288'>
-        <var-decl name='handshake_start_time' type-id='type-id-168' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='12352'>
+        <var-decl name='handshake_start_time' type-id='type-id-169' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12416'>
-        <var-decl name='handshake_abs_timeout' type-id='type-id-168' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='12480'>
+        <var-decl name='handshake_abs_timeout' type-id='type-id-169' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12544'>
+      <data-member access='public' layout-offset-in-bits='12608'>
         <var-decl name='ertt' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12576'>
+      <data-member access='public' layout-offset-in-bits='12640'>
         <var-decl name='handshake_timeout_ms' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12608'>
+      <data-member access='public' layout-offset-in-bits='12672'>
         <var-decl name='record_timeout_ms' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12672'>
+      <data-member access='public' layout-offset-in-bits='12736'>
         <var-decl name='post_handshake_cr_context' type-id='type-id-62' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='12800'>
+      <data-member access='public' layout-offset-in-bits='12864'>
         <var-decl name='post_handshake_hash_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13056'>
+      <data-member access='public' layout-offset-in-bits='13120'>
         <var-decl name='hsk_flags' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13120'>
-        <var-decl name='last_key_update' type-id='type-id-168' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='13184'>
+        <var-decl name='last_key_update' type-id='type-id-169' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13248'>
+      <data-member access='public' layout-offset-in-bits='13312'>
         <var-decl name='key_update_count' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13312'>
+      <data-member access='public' layout-offset-in-bits='13376'>
         <var-decl name='full_client_hello' type-id='type-id-139' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13568'>
+      <data-member access='public' layout-offset-in-bits='13632'>
         <var-decl name='extensions_offset' type-id='type-id-22' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13632'>
+      <data-member access='public' layout-offset-in-bits='13696'>
         <var-decl name='hb_local_data' type-id='type-id-139' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13888'>
+      <data-member access='public' layout-offset-in-bits='13952'>
         <var-decl name='hb_remote_data' type-id='type-id-139' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14144'>
-        <var-decl name='hb_ping_start' type-id='type-id-168' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14208'>
+        <var-decl name='hb_ping_start' type-id='type-id-169' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14272'>
-        <var-decl name='hb_ping_sent' type-id='type-id-168' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='14400'>
-        <var-decl name='hb_actual_retrans_timeout_ms' type-id='type-id-10' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='14432'>
-        <var-decl name='hb_retrans_timeout_ms' type-id='type-id-10' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='14336'>
+        <var-decl name='hb_ping_sent' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14464'>
-        <var-decl name='hb_total_timeout_ms' type-id='type-id-10' visibility='default'/>
+        <var-decl name='hb_actual_retrans_timeout_ms' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14496'>
-        <var-decl name='ocsp_check_ok' type-id='type-id-75' visibility='default'/>
+        <var-decl name='hb_retrans_timeout_ms' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14528'>
-        <var-decl name='hb_state' type-id='type-id-169' visibility='default'/>
+        <var-decl name='hb_total_timeout_ms' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14560'>
-        <var-decl name='recv_state' type-id='type-id-170' visibility='default'/>
+        <var-decl name='ocsp_check_ok' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14592'>
-        <var-decl name='sc_random_set' type-id='type-id-75' visibility='default'/>
+        <var-decl name='hb_state' type-id='type-id-170' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='14624'>
+        <var-decl name='recv_state' type-id='type-id-171' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14656'>
-        <var-decl name='flags' type-id='type-id-80' visibility='default'/>
+        <var-decl name='sc_random_set' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14720'>
-        <var-decl name='verify_callback' type-id='type-id-171' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-80' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14784'>
-        <var-decl name='vc_data' type-id='type-id-172' visibility='default'/>
+        <var-decl name='verify_callback' type-id='type-id-172' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14848'>
-        <var-decl name='vc_sdata' type-id='type-id-173' visibility='default'/>
+        <var-decl name='vc_data' type-id='type-id-173' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='14912'>
+        <var-decl name='vc_sdata' type-id='type-id-174' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15040'>
+      <data-member access='public' layout-offset-in-bits='15104'>
         <var-decl name='vc_elements' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15072'>
+      <data-member access='public' layout-offset-in-bits='15136'>
         <var-decl name='vc_status' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15104'>
+      <data-member access='public' layout-offset-in-bits='15168'>
         <var-decl name='additional_verify_flags' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15136'>
+      <data-member access='public' layout-offset-in-bits='15200'>
         <var-decl name='cert_hash' type-id='type-id-15' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15392'>
+      <data-member access='public' layout-offset-in-bits='15456'>
         <var-decl name='cert_hash_set' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15400'>
-        <var-decl name='saved_username' type-id='type-id-174' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='15464'>
+        <var-decl name='saved_username' type-id='type-id-175' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16432'>
+      <data-member access='public' layout-offset-in-bits='16496'>
         <var-decl name='saved_username_set' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16448'>
-        <var-decl name='tfo' type-id='type-id-175' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='17664'>
-        <var-decl name='rsup' type-id='type-id-176' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='16512'>
+        <var-decl name='tfo' type-id='type-id-176' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17728'>
-        <var-decl name='rsup_size' type-id='type-id-10' visibility='default'/>
+        <var-decl name='rsup' type-id='type-id-177' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17792'>
-        <var-decl name='rexts' type-id='type-id-177' visibility='default'/>
+        <var-decl name='rsup_size' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17856'>
-        <var-decl name='rexts_size' type-id='type-id-10' visibility='default'/>
+        <var-decl name='rexts' type-id='type-id-178' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17920'>
-        <var-decl name='ext_data' type-id='type-id-178' visibility='default'/>
+        <var-decl name='rexts_size' type-id='type-id-10' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='17984'>
+        <var-decl name='ext_data' type-id='type-id-179' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24064'>
+      <data-member access='public' layout-offset-in-bits='24128'>
         <var-decl name='used_exts' type-id='type-id-18' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24096'>
-        <var-decl name='ext_msg' type-id='type-id-179' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24160'>
+        <var-decl name='ext_msg' type-id='type-id-180' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24128'>
+      <data-member access='public' layout-offset-in-bits='24192'>
         <var-decl name='max_recv_size' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24192'>
+      <data-member access='public' layout-offset-in-bits='24256'>
         <var-decl name='cand_ec_group' type-id='type-id-20' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24256'>
+      <data-member access='public' layout-offset-in-bits='24320'>
         <var-decl name='cand_dh_group' type-id='type-id-20' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24320'>
+      <data-member access='public' layout-offset-in-bits='24384'>
         <var-decl name='cand_group' type-id='type-id-20' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24384'>
-        <var-decl name='hrr_cs' type-id='type-id-165' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24448'>
+        <var-decl name='hrr_cs' type-id='type-id-166' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24416'>
+      <data-member access='public' layout-offset-in-bits='24480'>
         <var-decl name='session_ticket_renew' type-id='type-id-22' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24448'>
-        <var-decl name='tls13_ticket' type-id='type-id-180' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='27584'>
-        <var-decl name='early_data_received' type-id='type-id-18' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='24512'>
+        <var-decl name='tls13_ticket' type-id='type-id-181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27648'>
-        <var-decl name='anti_replay' type-id='type-id-181' visibility='default'/>
+        <var-decl name='early_data_received' type-id='type-id-18' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27712'>
+        <var-decl name='anti_replay' type-id='type-id-182' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='27776'>
         <var-decl name='epoch_lock' type-id='type-id-101' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='gnutls_pubkey_st' size-in-bits='4096' is-struct='yes' visibility='default' id='type-id-268'>
+    <class-decl name='gnutls_pubkey_st' size-in-bits='4096' is-struct='yes' visibility='default' id='type-id-271'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='bits' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='params' type-id='type-id-312' visibility='default'/>
+        <var-decl name='params' type-id='type-id-315' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
         <var-decl name='key_usage' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
-        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-377' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='pin_info_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-374'>
+    <class-decl name='pin_info_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-377'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cb' type-id='type-id-375' visibility='default'/>
+        <var-decl name='cb' type-id='type-id-378' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data' type-id='type-id-101' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-376'/>
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-378'/>
-    <typedef-decl name='gnutls_pin_callback_t' type-id='type-id-378' id='type-id-375'/>
-    <class-decl name='gnutls_privkey_st' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-379'>
+    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-379'/>
+    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-381'/>
+    <typedef-decl name='gnutls_pin_callback_t' type-id='type-id-381' id='type-id-378'/>
+    <class-decl name='gnutls_privkey_st' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-382'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-380' visibility='default'/>
+        <var-decl name='type' type-id='type-id-383' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='pk_algorithm' type-id='type-id-60' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='key' type-id='type-id-381' visibility='default'/>
+        <var-decl name='key' type-id='type-id-384' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-377' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-382'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-385'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PRIVKEY_X509' value='0'/>
       <enumerator name='GNUTLS_PRIVKEY_OPENPGP' value='1'/>
       <enumerator name='GNUTLS_PRIVKEY_PKCS11' value='2'/>
       <enumerator name='GNUTLS_PRIVKEY_EXT' value='3'/>
     </enum-decl>
-    <typedef-decl name='gnutls_privkey_type_t' type-id='type-id-382' id='type-id-380'/>
-    <union-decl name='__anonymous_union__' size-in-bits='576' is-anonymous='yes' visibility='default' id='type-id-381'>
+    <typedef-decl name='gnutls_privkey_type_t' type-id='type-id-385' id='type-id-383'/>
+    <union-decl name='__anonymous_union__' size-in-bits='576' is-anonymous='yes' visibility='default' id='type-id-384'>
       <data-member access='private'>
-        <var-decl name='x509' type-id='type-id-383' visibility='default'/>
+        <var-decl name='x509' type-id='type-id-386' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='pkcs11' type-id='type-id-384' visibility='default'/>
+        <var-decl name='pkcs11' type-id='type-id-387' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ext' type-id='type-id-385' visibility='default'/>
+        <var-decl name='ext' type-id='type-id-388' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='gnutls_x509_privkey_int' size-in-bits='4096' is-struct='yes' visibility='default' id='type-id-386'>
+    <class-decl name='gnutls_x509_privkey_int' size-in-bits='4096' is-struct='yes' visibility='default' id='type-id-389'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-312' visibility='default'/>
+        <var-decl name='params' type-id='type-id-315' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
         <var-decl name='expanded' type-id='type-id-10' visibility='default'/>
@@ -4815,42 +4842,42 @@
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='key' type-id='type-id-387' visibility='default'/>
+        <var-decl name='key' type-id='type-id-390' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
-        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-377' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='asn1_node_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-388'/>
-    <typedef-decl name='asn1_node_st' type-id='type-id-388' id='type-id-389'/>
-    <pointer-type-def type-id='type-id-389' size-in-bits='64' id='type-id-390'/>
-    <typedef-decl name='asn1_node' type-id='type-id-390' id='type-id-387'/>
-    <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-391'/>
-    <typedef-decl name='gnutls_x509_privkey_t' type-id='type-id-391' id='type-id-383'/>
-    <class-decl name='gnutls_pkcs11_privkey_st' size-in-bits='3392' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-392'/>
+    <class-decl name='asn1_node_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-391'/>
+    <typedef-decl name='asn1_node_st' type-id='type-id-391' id='type-id-392'/>
     <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-393'/>
-    <typedef-decl name='gnutls_pkcs11_privkey_t' type-id='type-id-393' id='type-id-384'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-385'>
+    <typedef-decl name='asn1_node' type-id='type-id-393' id='type-id-390'/>
+    <pointer-type-def type-id='type-id-389' size-in-bits='64' id='type-id-394'/>
+    <typedef-decl name='gnutls_x509_privkey_t' type-id='type-id-394' id='type-id-386'/>
+    <class-decl name='gnutls_pkcs11_privkey_st' size-in-bits='3392' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-395'/>
+    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-396'/>
+    <typedef-decl name='gnutls_pkcs11_privkey_t' type-id='type-id-396' id='type-id-387'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-388'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='sign_func' type-id='type-id-394' visibility='default'/>
+        <var-decl name='sign_func' type-id='type-id-397' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='sign_data_func' type-id='type-id-395' visibility='default'/>
+        <var-decl name='sign_data_func' type-id='type-id-398' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='sign_hash_func' type-id='type-id-396' visibility='default'/>
+        <var-decl name='sign_hash_func' type-id='type-id-399' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='decrypt_func' type-id='type-id-397' visibility='default'/>
+        <var-decl name='decrypt_func' type-id='type-id-400' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='decrypt_func2' type-id='type-id-398' visibility='default'/>
+        <var-decl name='decrypt_func2' type-id='type-id-401' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='deinit_func' type-id='type-id-399' visibility='default'/>
+        <var-decl name='deinit_func' type-id='type-id-402' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='info_func' type-id='type-id-400' visibility='default'/>
+        <var-decl name='info_func' type-id='type-id-403' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='userdata' type-id='type-id-101' visibility='default'/>
@@ -4859,25 +4886,25 @@
         <var-decl name='bits' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-373'/>
-    <typedef-decl name='gnutls_privkey_t' type-id='type-id-373' id='type-id-401'/>
-    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-403'/>
-    <typedef-decl name='gnutls_privkey_sign_func' type-id='type-id-403' id='type-id-394'/>
-    <pointer-type-def type-id='type-id-404' size-in-bits='64' id='type-id-405'/>
-    <typedef-decl name='gnutls_privkey_sign_data_func' type-id='type-id-405' id='type-id-395'/>
-    <typedef-decl name='gnutls_privkey_sign_hash_func' type-id='type-id-405' id='type-id-396'/>
-    <typedef-decl name='gnutls_privkey_decrypt_func' type-id='type-id-403' id='type-id-397'/>
-    <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-407'/>
-    <typedef-decl name='gnutls_privkey_decrypt_func2' type-id='type-id-407' id='type-id-398'/>
-    <pointer-type-def type-id='type-id-408' size-in-bits='64' id='type-id-409'/>
-    <typedef-decl name='gnutls_privkey_deinit_func' type-id='type-id-409' id='type-id-399'/>
-    <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-411'/>
-    <typedef-decl name='gnutls_privkey_info_func' type-id='type-id-411' id='type-id-400'/>
-    <typedef-decl name='internals_st' type-id='type-id-372' id='type-id-371'/>
-    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-412'/>
-    <typedef-decl name='gnutls_session_t' type-id='type-id-412' id='type-id-413'/>
+    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-376'/>
+    <typedef-decl name='gnutls_privkey_t' type-id='type-id-376' id='type-id-404'/>
+    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-406'/>
+    <typedef-decl name='gnutls_privkey_sign_func' type-id='type-id-406' id='type-id-397'/>
+    <pointer-type-def type-id='type-id-407' size-in-bits='64' id='type-id-408'/>
+    <typedef-decl name='gnutls_privkey_sign_data_func' type-id='type-id-408' id='type-id-398'/>
+    <typedef-decl name='gnutls_privkey_sign_hash_func' type-id='type-id-408' id='type-id-399'/>
+    <typedef-decl name='gnutls_privkey_decrypt_func' type-id='type-id-406' id='type-id-400'/>
+    <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-410'/>
+    <typedef-decl name='gnutls_privkey_decrypt_func2' type-id='type-id-410' id='type-id-401'/>
+    <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-412'/>
+    <typedef-decl name='gnutls_privkey_deinit_func' type-id='type-id-412' id='type-id-402'/>
+    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-414'/>
+    <typedef-decl name='gnutls_privkey_info_func' type-id='type-id-414' id='type-id-403'/>
+    <typedef-decl name='internals_st' type-id='type-id-375' id='type-id-374'/>
+    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-415'/>
+    <typedef-decl name='gnutls_session_t' type-id='type-id-415' id='type-id-416'/>
     <function-decl name='gnutls_session_ticket_send' mangled-name='gnutls_session_ticket_send' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_ticket_send@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-10' name='nr'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
@@ -4972,7 +4999,7 @@
     <function-decl name='_tls13_update_secret' mangled-name='_tls13_update_secret' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_nss_keylog_write' mangled-name='_gnutls_nss_keylog_write' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_call_keylog_func' mangled-name='_gnutls_call_keylog_func' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_send_early_data' mangled-name='_gnutls13_send_early_data' visibility='default' binding='global' size-in-bits='64'>
@@ -4987,59 +5014,59 @@
     <function-decl name='_gnutls13_send_end_of_early_data' mangled-name='_gnutls13_send_end_of_early_data' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-404'>
-      <parameter type-id='type-id-401'/>
+    <function-type size-in-bits='64' id='type-id-407'>
+      <parameter type-id='type-id-404'/>
       <parameter type-id='type-id-21'/>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-410'>
-      <parameter type-id='type-id-401'/>
+    <function-type size-in-bits='64' id='type-id-413'>
+      <parameter type-id='type-id-404'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-101'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-402'>
-      <parameter type-id='type-id-401'/>
+    <function-type size-in-bits='64' id='type-id-405'>
+      <parameter type-id='type-id-404'/>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-406'>
-      <parameter type-id='type-id-401'/>
+    <function-type size-in-bits='64' id='type-id-409'>
+      <parameter type-id='type-id-404'/>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-377'>
+    <function-type size-in-bits='64' id='type-id-380'>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-22'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-376'/>
+      <parameter type-id='type-id-379'/>
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-408'>
-      <parameter type-id='type-id-401'/>
+    <function-type size-in-bits='64' id='type-id-411'>
+      <parameter type-id='type-id-404'/>
       <parameter type-id='type-id-101'/>
       <return type-id='type-id-111'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='buffers.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='buffers.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_record_check_corked' mangled-name='gnutls_record_check_corked' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_check_corked@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-99'/>
     </function-decl>
     <function-decl name='gnutls_record_check_pending' mangled-name='gnutls_record_check_pending' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_check_pending@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-99'/>
     </function-decl>
     <function-decl name='_gnutls_recv_in_buffers' mangled-name='_gnutls_recv_in_buffers' visibility='default' binding='global' size-in-bits='64'>
@@ -5048,10 +5075,10 @@
     <function-decl name='_mbuffer_head_push_first' mangled-name='_mbuffer_head_push_first' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_buffer_resize' mangled-name='_gnutls_buffer_resize' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__builtin_memmove' mangled-name='memmove' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='memmove' mangled-name='memmove' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_buffer_resize' mangled-name='_gnutls_buffer_resize' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_mbuffer_head_get_next' mangled-name='_mbuffer_head_get_next' visibility='default' binding='global' size-in-bits='64'>
@@ -5070,31 +5097,31 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='handshake.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='handshake.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_handshake_get_last_out' mangled-name='gnutls_handshake_get_last_out' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_get_last_out@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-186'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <return type-id='type-id-187'/>
     </function-decl>
     <function-decl name='gnutls_handshake_get_last_in' mangled-name='gnutls_handshake_get_last_in' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_get_last_in@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-186'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <return type-id='type-id-187'/>
     </function-decl>
     <function-decl name='gnutls_handshake_set_max_packet_length' mangled-name='gnutls_handshake_set_max_packet_length' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_set_max_packet_length@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-99' name='max'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_handshake_set_timeout' mangled-name='gnutls_handshake_set_timeout' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_set_timeout@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-10' name='ms'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_handshake' mangled-name='gnutls_handshake' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_rehandshake' mangled-name='gnutls_rehandshake' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_rehandshake@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_hash_fast' mangled-name='_gnutls_hash_fast' visibility='default' binding='global' size-in-bits='64'>
@@ -5184,10 +5211,10 @@
     <function-decl name='_gnutls_send_server_crt_request' mangled-name='_gnutls_send_server_crt_request' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_send_server_certificate_status' mangled-name='_gnutls_send_server_certificate_status' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_recv_client_certificate_verify_message' mangled-name='_gnutls_recv_client_certificate_verify_message' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_recv_client_certificate_verify_message' mangled-name='_gnutls_recv_client_certificate_verify_message' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_send_server_certificate_status' mangled-name='_gnutls_send_server_certificate_status' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_send_server_kx_message' mangled-name='_gnutls_send_server_kx_message' visibility='default' binding='global' size-in-bits='64'>
@@ -5335,7 +5362,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='errors.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='errors.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls_log' mangled-name='_gnutls_log' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_log@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-22' name='level'/>
       <parameter type-id='type-id-27' name='fmt'/>
@@ -5344,7 +5371,7 @@
     </function-decl>
     <function-decl name='_gnutls_mpi_log' mangled-name='_gnutls_mpi_log' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_mpi_log@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-27' name='prefix'/>
-      <parameter type-id='type-id-318' name='a'/>
+      <parameter type-id='type-id-321' name='a'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_strerror_name' mangled-name='gnutls_strerror_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_strerror_name@@GNUTLS_3_4'>
@@ -5363,109 +5390,109 @@
       <parameter type-id='type-id-22' name='error'/>
       <return type-id='type-id-27'/>
     </function-decl>
-    <function-decl name='vasprintf' mangled-name='vasprintf' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__vasprintf_chk' mangled-name='__vasprintf_chk' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='free' mangled-name='free' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='fprintf' mangled-name='fprintf' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__fprintf_chk' mangled-name='__fprintf_chk' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='dcgettext' mangled-name='dcgettext' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dh.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_dh_params_int' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-414'>
+  <abi-instr version='1.0' address-size='64' path='dh.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_dh_params_int' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-417'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-415' visibility='default'/>
+        <var-decl name='params' type-id='type-id-418' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='q_bits' type-id='type-id-22' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-318' size-in-bits='192' id='type-id-415'>
-      <subrange length='3' type-id='type-id-38' id='type-id-416'/>
+    <array-type-def dimensions='1' type-id='type-id-321' size-in-bits='192' id='type-id-418'>
+      <subrange length='3' type-id='type-id-38' id='type-id-419'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-417'/>
-    <typedef-decl name='gnutls_dh_params_t' type-id='type-id-417' id='type-id-418'/>
-    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-419'/>
+    <pointer-type-def type-id='type-id-417' size-in-bits='64' id='type-id-420'/>
+    <typedef-decl name='gnutls_dh_params_t' type-id='type-id-420' id='type-id-421'/>
+    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-422'/>
     <function-decl name='gnutls_dh_params_export_raw' mangled-name='gnutls_dh_params_export_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_params_export_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-418' name='params'/>
-      <parameter type-id='type-id-275' name='prime'/>
-      <parameter type-id='type-id-275' name='generator'/>
-      <parameter type-id='type-id-419' name='bits'/>
+      <parameter type-id='type-id-421' name='params'/>
+      <parameter type-id='type-id-278' name='prime'/>
+      <parameter type-id='type-id-278' name='generator'/>
+      <parameter type-id='type-id-422' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-420'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-423'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_X509_FMT_DER' value='0'/>
       <enumerator name='GNUTLS_X509_FMT_PEM' value='1'/>
     </enum-decl>
-    <typedef-decl name='gnutls_x509_crt_fmt_t' type-id='type-id-420' id='type-id-421'/>
+    <typedef-decl name='gnutls_x509_crt_fmt_t' type-id='type-id-423' id='type-id-424'/>
     <function-decl name='gnutls_dh_params_export2_pkcs3' mangled-name='gnutls_dh_params_export2_pkcs3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_params_export2_pkcs3@@GNUTLS_3_4'>
-      <parameter type-id='type-id-418' name='params'/>
-      <parameter type-id='type-id-421' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-421' name='params'/>
+      <parameter type-id='type-id-424' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-422'/>
+    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-425'/>
     <function-decl name='gnutls_dh_params_export_pkcs3' mangled-name='gnutls_dh_params_export_pkcs3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_params_export_pkcs3@@GNUTLS_3_4'>
-      <parameter type-id='type-id-418' name='params'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-421' name='params'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-64' name='params_data'/>
-      <parameter type-id='type-id-422' name='params_data_size'/>
+      <parameter type-id='type-id-425' name='params_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_params_import_pkcs3' mangled-name='gnutls_dh_params_import_pkcs3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_params_import_pkcs3@@GNUTLS_3_4'>
-      <parameter type-id='type-id-418' name='params'/>
+      <parameter type-id='type-id-421' name='params'/>
       <parameter type-id='type-id-57' name='pkcs3_params'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_params_generate2' mangled-name='gnutls_dh_params_generate2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_params_generate2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-418' name='dparams'/>
+      <parameter type-id='type-id-421' name='dparams'/>
       <parameter type-id='type-id-10' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_params_cpy' mangled-name='gnutls_dh_params_cpy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_params_cpy@@GNUTLS_3_4'>
-      <parameter type-id='type-id-418' name='dst'/>
-      <parameter type-id='type-id-418' name='src'/>
+      <parameter type-id='type-id-421' name='dst'/>
+      <parameter type-id='type-id-421' name='src'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_params_deinit' mangled-name='gnutls_dh_params_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_params_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-418' name='dh_params'/>
+      <parameter type-id='type-id-421' name='dh_params'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-418' size-in-bits='64' id='type-id-423'/>
+    <pointer-type-def type-id='type-id-421' size-in-bits='64' id='type-id-426'/>
     <function-decl name='gnutls_dh_params_init' mangled-name='gnutls_dh_params_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_params_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-423' name='dh_params'/>
+      <parameter type-id='type-id-426' name='dh_params'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_params_import_raw3' mangled-name='gnutls_dh_params_import_raw3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_params_import_raw3@@GNUTLS_3_6_8'>
-      <parameter type-id='type-id-418' name='dh_params'/>
+      <parameter type-id='type-id-421' name='dh_params'/>
       <parameter type-id='type-id-57' name='prime'/>
       <parameter type-id='type-id-57' name='q'/>
       <parameter type-id='type-id-57' name='generator'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_params_import_raw2' mangled-name='gnutls_dh_params_import_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_params_import_raw2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-418' name='dh_params'/>
+      <parameter type-id='type-id-421' name='dh_params'/>
       <parameter type-id='type-id-57' name='prime'/>
       <parameter type-id='type-id-57' name='generator'/>
       <parameter type-id='type-id-10' name='key_bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_params_import_dsa' mangled-name='gnutls_dh_params_import_dsa' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_params_import_dsa@@GNUTLS_3_4'>
-      <parameter type-id='type-id-418' name='dh_params'/>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-421' name='dh_params'/>
+      <parameter type-id='type-id-386' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_params_import_raw' mangled-name='gnutls_dh_params_import_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_params_import_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-418' name='dh_params'/>
+      <parameter type-id='type-id-421' name='dh_params'/>
       <parameter type-id='type-id-57' name='prime'/>
       <parameter type-id='type-id-57' name='generator'/>
       <return type-id='type-id-22'/>
@@ -5525,7 +5552,12 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='kx.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='kx.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <function-decl name='gnutls_session_set_keylog_function' mangled-name='gnutls_session_set_keylog_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_set_keylog_function@@GNUTLS_3_6_13'>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-161' name='func'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_session_is_psk' mangled-name='_gnutls_session_is_psk' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -5554,125 +5586,125 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cipher-cbc.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cipher-cbc.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls_make_preamble' mangled-name='_gnutls_make_preamble' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='priority.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='priority.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <var-decl name='_gnutls_default_priority_string' type-id='type-id-27' mangled-name='_gnutls_default_priority_string' visibility='default' elf-symbol-id='_gnutls_default_priority_string@@GNUTLS_PRIVATE_3_4'/>
     <function-decl name='gnutls_priority_string_list' mangled-name='gnutls_priority_string_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_string_list@@GNUTLS_3_4'>
       <parameter type-id='type-id-10' name='iter'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-27'/>
     </function-decl>
-    <typedef-decl name='gnutls_priority_t' type-id='type-id-144' id='type-id-424'/>
-    <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-425'/>
+    <typedef-decl name='gnutls_priority_t' type-id='type-id-144' id='type-id-427'/>
+    <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-428'/>
     <function-decl name='gnutls_priority_certificate_type_list' mangled-name='gnutls_priority_certificate_type_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_certificate_type_list@@GNUTLS_3_4'>
-      <parameter type-id='type-id-424' name='pcache'/>
-      <parameter type-id='type-id-425' name='list'/>
+      <parameter type-id='type-id-427' name='pcache'/>
+      <parameter type-id='type-id-428' name='list'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_priority_sign_list' mangled-name='gnutls_priority_sign_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_sign_list@@GNUTLS_3_4'>
-      <parameter type-id='type-id-424' name='pcache'/>
-      <parameter type-id='type-id-425' name='list'/>
+      <parameter type-id='type-id-427' name='pcache'/>
+      <parameter type-id='type-id-428' name='list'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_priority_protocol_list' mangled-name='gnutls_priority_protocol_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_protocol_list@@GNUTLS_3_4'>
-      <parameter type-id='type-id-424' name='pcache'/>
-      <parameter type-id='type-id-425' name='list'/>
+      <parameter type-id='type-id-427' name='pcache'/>
+      <parameter type-id='type-id-428' name='list'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_priority_compression_list' mangled-name='gnutls_priority_compression_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_compression_list@@GNUTLS_3_4'>
-      <parameter type-id='type-id-424' name='pcache'/>
-      <parameter type-id='type-id-425' name='list'/>
+      <parameter type-id='type-id-427' name='pcache'/>
+      <parameter type-id='type-id-428' name='list'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_priority_mac_list' mangled-name='gnutls_priority_mac_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_mac_list@@GNUTLS_3_4'>
-      <parameter type-id='type-id-424' name='pcache'/>
-      <parameter type-id='type-id-425' name='list'/>
+      <parameter type-id='type-id-427' name='pcache'/>
+      <parameter type-id='type-id-428' name='list'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_priority_cipher_list' mangled-name='gnutls_priority_cipher_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_cipher_list@@GNUTLS_3_4'>
-      <parameter type-id='type-id-424' name='pcache'/>
-      <parameter type-id='type-id-425' name='list'/>
+      <parameter type-id='type-id-427' name='pcache'/>
+      <parameter type-id='type-id-428' name='list'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_priority_kx_list' mangled-name='gnutls_priority_kx_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_kx_list@@GNUTLS_3_4'>
-      <parameter type-id='type-id-424' name='pcache'/>
-      <parameter type-id='type-id-425' name='list'/>
+      <parameter type-id='type-id-427' name='pcache'/>
+      <parameter type-id='type-id-428' name='list'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_priority_group_list' mangled-name='gnutls_priority_group_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_group_list@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-424' name='pcache'/>
-      <parameter type-id='type-id-425' name='list'/>
+      <parameter type-id='type-id-427' name='pcache'/>
+      <parameter type-id='type-id-428' name='list'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_priority_ecc_curve_list' mangled-name='gnutls_priority_ecc_curve_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_ecc_curve_list@@GNUTLS_3_4'>
-      <parameter type-id='type-id-424' name='pcache'/>
-      <parameter type-id='type-id-425' name='list'/>
+      <parameter type-id='type-id-427' name='pcache'/>
+      <parameter type-id='type-id-428' name='list'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-426'/>
+    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-429'/>
     <function-decl name='gnutls_set_default_priority_append' mangled-name='gnutls_set_default_priority_append' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_set_default_priority_append@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-27' name='add_prio'/>
-      <parameter type-id='type-id-426' name='err_pos'/>
+      <parameter type-id='type-id-429' name='err_pos'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_set_default_priority' mangled-name='gnutls_set_default_priority' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_set_default_priority@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_priority_set_direct' mangled-name='gnutls_priority_set_direct' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_set_direct@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-27' name='priorities'/>
-      <parameter type-id='type-id-426' name='err_pos'/>
+      <parameter type-id='type-id-429' name='err_pos'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-427'/>
+    <pointer-type-def type-id='type-id-427' size-in-bits='64' id='type-id-430'/>
     <function-decl name='gnutls_priority_init' mangled-name='gnutls_priority_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-427' name='priority_cache'/>
+      <parameter type-id='type-id-430' name='priority_cache'/>
       <parameter type-id='type-id-27' name='priorities'/>
-      <parameter type-id='type-id-426' name='err_pos'/>
+      <parameter type-id='type-id-429' name='err_pos'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_priority_init2' mangled-name='gnutls_priority_init2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_init2@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-427' name='priority_cache'/>
+      <parameter type-id='type-id-430' name='priority_cache'/>
       <parameter type-id='type-id-27' name='priorities'/>
-      <parameter type-id='type-id-426' name='err_pos'/>
+      <parameter type-id='type-id-429' name='err_pos'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_resolve_priorities' mangled-name='_gnutls_resolve_priorities' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_resolve_priorities@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-27' name='priorities'/>
-      <return type-id='type-id-376'/>
+      <return type-id='type-id-379'/>
     </function-decl>
     <function-decl name='gnutls_get_system_config_file' mangled-name='gnutls_get_system_config_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_get_system_config_file@@GNUTLS_3_6_9'>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_priority_set' mangled-name='gnutls_priority_set' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_set@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-424' name='priority'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-427' name='priority'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_priority_deinit' mangled-name='gnutls_priority_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-424' name='priority_cache'/>
+      <parameter type-id='type-id-427' name='priority_cache'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-428'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-431'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_CTYPE_CLIENT' value='0'/>
       <enumerator name='GNUTLS_CTYPE_SERVER' value='1'/>
       <enumerator name='GNUTLS_CTYPE_OURS' value='2'/>
       <enumerator name='GNUTLS_CTYPE_PEERS' value='3'/>
     </enum-decl>
-    <typedef-decl name='gnutls_ctype_target_t' type-id='type-id-428' id='type-id-429'/>
+    <typedef-decl name='gnutls_ctype_target_t' type-id='type-id-431' id='type-id-432'/>
     <function-decl name='gnutls_priority_certificate_type_list2' mangled-name='gnutls_priority_certificate_type_list2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_certificate_type_list2@@GNUTLS_3_6_4'>
-      <parameter type-id='type-id-424' name='pcache'/>
-      <parameter type-id='type-id-425' name='list'/>
-      <parameter type-id='type-id-429' name='target'/>
+      <parameter type-id='type-id-427' name='pcache'/>
+      <parameter type-id='type-id-428' name='list'/>
+      <parameter type-id='type-id-432' name='target'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='strcmp' mangled-name='strcmp' visibility='default' binding='global' size-in-bits='64'>
@@ -5714,19 +5746,16 @@
     <function-decl name='gnutls_ecc_curve_get_id' mangled-name='gnutls_ecc_curve_get_id' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='strncasecmp' mangled-name='strncasecmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
     <function-decl name='gnutls_protocol_get_id' mangled-name='gnutls_protocol_get_id' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='gnutls_sign_get_id' mangled-name='gnutls_sign_get_id' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='gnutls_group_get_id' mangled-name='gnutls_group_get_id' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_type_get_id' mangled-name='gnutls_certificate_type_get_id' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='gnutls_group_get_id' mangled-name='gnutls_group_get_id' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='gnutls_sign_get_id' mangled-name='gnutls_sign_get_id' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_append_str' mangled-name='_gnutls_buffer_append_str' visibility='default' binding='global' size-in-bits='64'>
@@ -5750,10 +5779,10 @@
     <function-decl name='gnutls_kx_get_id' mangled-name='gnutls_kx_get_id' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_sign_mark_insecure' mangled-name='_gnutls_sign_mark_insecure' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_digest_mark_insecure' mangled-name='_gnutls_digest_mark_insecure' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_digest_mark_insecure' mangled-name='_gnutls_digest_mark_insecure' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_sign_mark_insecure' mangled-name='_gnutls_sign_mark_insecure' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_version_mark_disabled' mangled-name='_gnutls_version_mark_disabled' visibility='default' binding='global' size-in-bits='64'>
@@ -5763,9 +5792,9 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hash_int.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='hash_int.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls_digest_exists' mangled-name='_gnutls_digest_exists' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_digest_exists@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-211' name='algo'/>
+      <parameter type-id='type-id-212' name='algo'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_get_crypto_mac' mangled-name='_gnutls_get_crypto_mac' visibility='default' binding='global' size-in-bits='64'>
@@ -5775,13 +5804,16 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cipher_int.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cipher_int.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls_mac_deinit' mangled-name='_gnutls_mac_deinit' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_mac_copy' mangled-name='_gnutls_mac_copy' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='__builtin_memset' mangled-name='memset' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_mac_init' mangled-name='_gnutls_mac_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -5789,48 +5821,54 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='session.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='session.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_session_set_id' mangled-name='gnutls_session_set_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_set_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-57' name='sid'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_get_desc' mangled-name='gnutls_session_get_desc' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_desc@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <return type-id='type-id-376'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <return type-id='type-id-379'/>
     </function-decl>
     <function-decl name='gnutls_session_force_valid' mangled-name='gnutls_session_force_valid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_force_valid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_session_set_data' mangled-name='gnutls_session_set_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_set_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-101' name='session_data'/>
       <parameter type-id='type-id-99' name='session_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_get_id2' mangled-name='gnutls_session_get_id2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_id2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-275' name='session_id'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-278' name='session_id'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_get_id' mangled-name='gnutls_session_get_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-101' name='session_id'/>
-      <parameter type-id='type-id-422' name='session_id_size'/>
+      <parameter type-id='type-id-425' name='session_id_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_get_data2' mangled-name='gnutls_session_get_data2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_data2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-278' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_get_data' mangled-name='gnutls_session_get_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-101' name='session_data'/>
-      <parameter type-id='type-id-422' name='session_data_size'/>
+      <parameter type-id='type-id-425' name='session_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
+    <function-decl name='__builtin___snprintf_chk' mangled-name='__snprintf_chk' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__builtin_snprintf' mangled-name='snprintf' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='gnutls_sign_algorithm_get' mangled-name='gnutls_sign_algorithm_get' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -5840,9 +5878,6 @@
     <function-decl name='gnutls_kx_get_name' mangled-name='gnutls_kx_get_name' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='snprintf' mangled-name='snprintf' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
     <function-decl name='gnutls_certificate_type_get_name' mangled-name='gnutls_certificate_type_get_name' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -5874,21 +5909,21 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='db.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='db.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_db_remove_session' mangled-name='gnutls_db_remove_session' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_remove_session@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_db_check_entry_expire_time' mangled-name='gnutls_db_check_entry_expire_time' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_check_entry_expire_time@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-275' name='entry'/>
+      <parameter type-id='type-id-278' name='entry'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_db_check_entry_time' mangled-name='gnutls_db_check_entry_time' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_check_entry_time@@GNUTLS_3_4'>
-      <parameter type-id='type-id-275' name='entry'/>
+      <parameter type-id='type-id-278' name='entry'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_db_check_entry' mangled-name='gnutls_db_check_entry' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_check_entry@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-62' name='session_entry'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -5896,31 +5931,31 @@
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_db_set_cache_expiration' mangled-name='gnutls_db_set_cache_expiration' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_set_cache_expiration@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-22' name='seconds'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_db_get_ptr' mangled-name='gnutls_db_get_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_get_ptr@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-101'/>
     </function-decl>
     <function-decl name='gnutls_db_set_ptr' mangled-name='gnutls_db_set_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_set_ptr@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-101' name='ptr'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_db_set_store_function' mangled-name='gnutls_db_set_store_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_set_store_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-155' name='store_func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_db_set_remove_function' mangled-name='gnutls_db_set_remove_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_set_remove_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-157' name='rem_func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_db_set_retrieve_function' mangled-name='gnutls_db_set_retrieve_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_db_set_retrieve_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-156' name='retr_func'/>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -5931,41 +5966,41 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='x509_b64.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509_b64.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_base64_encode2' mangled-name='gnutls_base64_encode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_base64_encode2@@GNUTLS_3_6_0'>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-278' name='result'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_base64_decode2' mangled-name='gnutls_base64_decode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_base64_decode2@@GNUTLS_3_6_0'>
       <parameter type-id='type-id-57' name='base64'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-278' name='result'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pem_base64_decode2' mangled-name='gnutls_pem_base64_decode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pem_base64_decode2@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='header'/>
       <parameter type-id='type-id-57' name='b64_data'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-278' name='result'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pem_base64_decode' mangled-name='gnutls_pem_base64_decode' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pem_base64_decode@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='header'/>
       <parameter type-id='type-id-57' name='b64_data'/>
       <parameter type-id='type-id-64' name='result'/>
-      <parameter type-id='type-id-422' name='result_size'/>
+      <parameter type-id='type-id-425' name='result_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pem_base64_encode2' mangled-name='gnutls_pem_base64_encode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pem_base64_encode2@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='header'/>
       <parameter type-id='type-id-57' name='b64_data'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-278' name='result'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pem_base64_encode' mangled-name='gnutls_pem_base64_encode' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pem_base64_encode@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='msg'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-376' name='result'/>
-      <parameter type-id='type-id-422' name='result_size'/>
+      <parameter type-id='type-id-379' name='result'/>
+      <parameter type-id='type-id-425' name='result_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_str_cpy' mangled-name='_gnutls_str_cpy' visibility='default' binding='global' size-in-bits='64'>
@@ -5990,45 +6025,45 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hello_ext.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='hello_ext.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_ext_get_current_msg' mangled-name='gnutls_ext_get_current_msg' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ext_get_current_msg@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_ext_get_data' mangled-name='gnutls_ext_get_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ext_get_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='tls_id'/>
-      <parameter type-id='type-id-357' name='data'/>
+      <parameter type-id='type-id-360' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ext_set_data' mangled-name='gnutls_ext_set_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ext_set_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='tls_id'/>
-      <parameter type-id='type-id-298' name='data'/>
+      <parameter type-id='type-id-301' name='data'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_session_ext_register' mangled-name='gnutls_session_ext_register' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_ext_register@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-27' name='name'/>
       <parameter type-id='type-id-22' name='id'/>
-      <parameter type-id='type-id-338' name='parse_point'/>
-      <parameter type-id='type-id-339' name='recv_func'/>
-      <parameter type-id='type-id-340' name='send_func'/>
-      <parameter type-id='type-id-341' name='deinit_func'/>
-      <parameter type-id='type-id-342' name='pack_func'/>
-      <parameter type-id='type-id-343' name='unpack_func'/>
+      <parameter type-id='type-id-341' name='parse_point'/>
+      <parameter type-id='type-id-342' name='recv_func'/>
+      <parameter type-id='type-id-343' name='send_func'/>
+      <parameter type-id='type-id-344' name='deinit_func'/>
+      <parameter type-id='type-id-345' name='pack_func'/>
+      <parameter type-id='type-id-346' name='unpack_func'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ext_register' mangled-name='gnutls_ext_register' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ext_register@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='name'/>
       <parameter type-id='type-id-22' name='id'/>
-      <parameter type-id='type-id-338' name='parse_point'/>
-      <parameter type-id='type-id-339' name='recv_func'/>
-      <parameter type-id='type-id-340' name='send_func'/>
-      <parameter type-id='type-id-341' name='deinit_func'/>
-      <parameter type-id='type-id-342' name='pack_func'/>
-      <parameter type-id='type-id-343' name='unpack_func'/>
+      <parameter type-id='type-id-341' name='parse_point'/>
+      <parameter type-id='type-id-342' name='recv_func'/>
+      <parameter type-id='type-id-343' name='send_func'/>
+      <parameter type-id='type-id-344' name='deinit_func'/>
+      <parameter type-id='type-id-345' name='pack_func'/>
+      <parameter type-id='type-id-346' name='unpack_func'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ext_get_name' mangled-name='gnutls_ext_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ext_get_name@@GNUTLS_3_4'>
@@ -6045,34 +6080,34 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='auth.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='auth.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_auth_client_get_type' mangled-name='gnutls_auth_client_get_type' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_auth_client_get_type@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-309'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <return type-id='type-id-312'/>
     </function-decl>
     <function-decl name='gnutls_auth_server_get_type' mangled-name='gnutls_auth_server_get_type' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_auth_server_get_type@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-309'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <return type-id='type-id-312'/>
     </function-decl>
     <function-decl name='gnutls_auth_get_type' mangled-name='gnutls_auth_get_type' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_auth_get_type@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-309'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <return type-id='type-id-312'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-430'/>
+    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-433'/>
     <function-decl name='gnutls_credentials_get' mangled-name='gnutls_credentials_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_credentials_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-309' name='type'/>
-      <parameter type-id='type-id-430' name='cred'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <parameter type-id='type-id-312' name='type'/>
+      <parameter type-id='type-id-433' name='cred'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_credentials_set' mangled-name='gnutls_credentials_set' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_credentials_set@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-309' name='type'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <parameter type-id='type-id-312' name='type'/>
       <parameter type-id='type-id-101' name='cred'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_credentials_clear' mangled-name='gnutls_credentials_clear' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_credentials_clear@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='calloc' mangled-name='calloc' visibility='default' binding='global' size-in-bits='64'>
@@ -6082,7 +6117,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='sslv2_compat.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='sslv2_compat.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls_server_select_suite' mangled-name='_gnutls_server_select_suite' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -6102,15 +6137,15 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='session_pack.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='session_pack.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_session_set_premaster' mangled-name='gnutls_session_set_premaster' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_set_premaster@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-10' name='entity'/>
       <parameter type-id='type-id-32' name='version'/>
       <parameter type-id='type-id-30' name='kx'/>
       <parameter type-id='type-id-29' name='cipher'/>
       <parameter type-id='type-id-31' name='mac'/>
-      <parameter type-id='type-id-367' name='comp'/>
+      <parameter type-id='type-id-370' name='comp'/>
       <parameter type-id='type-id-57' name='master'/>
       <parameter type-id='type-id-57' name='session_id'/>
       <return type-id='type-id-22'/>
@@ -6149,58 +6184,58 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='mpi.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='mpi.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='asn1_read_value' mangled-name='asn1_read_value' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pk.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-431'/>
+  <abi-instr version='1.0' address-size='64' path='pk.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-434'/>
     <function-decl name='gnutls_decode_ber_digest_info' mangled-name='gnutls_decode_ber_digest_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_decode_ber_digest_info@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='info'/>
-      <parameter type-id='type-id-431' name='hash'/>
+      <parameter type-id='type-id-434' name='hash'/>
       <parameter type-id='type-id-64' name='digest'/>
-      <parameter type-id='type-id-419' name='digest_size'/>
+      <parameter type-id='type-id-422' name='digest_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_encode_ber_digest_info' mangled-name='gnutls_encode_ber_digest_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_encode_ber_digest_info@@GNUTLS_3_4'>
-      <parameter type-id='type-id-211' name='hash'/>
+      <parameter type-id='type-id-212' name='hash'/>
       <parameter type-id='type-id-57' name='digest'/>
-      <parameter type-id='type-id-275' name='output'/>
+      <parameter type-id='type-id-278' name='output'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_decode_gost_rs_value' mangled-name='gnutls_decode_gost_rs_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_decode_gost_rs_value@@GNUTLS_3_6_3'>
       <parameter type-id='type-id-57' name='sig_value'/>
-      <parameter type-id='type-id-275' name='r'/>
-      <parameter type-id='type-id-275' name='s'/>
+      <parameter type-id='type-id-278' name='r'/>
+      <parameter type-id='type-id-278' name='s'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_encode_gost_rs_value' mangled-name='gnutls_encode_gost_rs_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_encode_gost_rs_value@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-275' name='sig_value'/>
+      <parameter type-id='type-id-278' name='sig_value'/>
       <parameter type-id='type-id-57' name='r'/>
       <parameter type-id='type-id-57' name='s'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_decode_ber_rs_raw' mangled-name='_gnutls_decode_ber_rs_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_decode_ber_rs_raw@@GNUTLS_FIPS140_3_4'>
       <parameter type-id='type-id-57' name='sig_value'/>
-      <parameter type-id='type-id-275' name='r'/>
-      <parameter type-id='type-id-275' name='s'/>
+      <parameter type-id='type-id-278' name='r'/>
+      <parameter type-id='type-id-278' name='s'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_decode_rs_value' mangled-name='gnutls_decode_rs_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_decode_rs_value@@GNUTLS_3_6_0'>
       <parameter type-id='type-id-57' name='sig_value'/>
-      <parameter type-id='type-id-275' name='r'/>
-      <parameter type-id='type-id-275' name='s'/>
+      <parameter type-id='type-id-278' name='r'/>
+      <parameter type-id='type-id-278' name='s'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_encode_ber_rs_raw' mangled-name='_gnutls_encode_ber_rs_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_encode_ber_rs_raw@@GNUTLS_FIPS140_3_4'>
-      <parameter type-id='type-id-275' name='sig_value'/>
+      <parameter type-id='type-id-278' name='sig_value'/>
       <parameter type-id='type-id-57' name='r'/>
       <parameter type-id='type-id-57' name='s'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_encode_rs_value' mangled-name='gnutls_encode_rs_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_encode_rs_value@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-275' name='sig_value'/>
+      <parameter type-id='type-id-278' name='sig_value'/>
       <parameter type-id='type-id-57' name='r'/>
       <parameter type-id='type-id-57' name='s'/>
       <return type-id='type-id-22'/>
@@ -6230,31 +6265,31 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cert-cred.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_certificate_credentials_st' size-in-bits='1408' is-struct='yes' visibility='default' id='type-id-432'>
+  <abi-instr version='1.0' address-size='64' path='cert-cred.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_certificate_credentials_st' size-in-bits='1408' is-struct='yes' visibility='default' id='type-id-435'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='dh_params' type-id='type-id-418' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-421' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='deinit_dh_params' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
+        <var-decl name='dh_sec_param' type-id='type-id-203' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='params_func' type-id='type-id-433' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-436' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='certs' type-id='type-id-434' visibility='default'/>
+        <var-decl name='certs' type-id='type-id-437' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='ncerts' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='sorted_cert_idx' type-id='type-id-419' visibility='default'/>
+        <var-decl name='sorted_cert_idx' type-id='type-id-422' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='tlist' type-id='type-id-435' visibility='default'/>
+        <var-decl name='tlist' type-id='type-id-438' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
@@ -6269,25 +6304,25 @@
         <var-decl name='verify_bits' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='legacy_cert_cb1' type-id='type-id-436' visibility='default'/>
+        <var-decl name='legacy_cert_cb1' type-id='type-id-439' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='legacy_cert_cb2' type-id='type-id-437' visibility='default'/>
+        <var-decl name='legacy_cert_cb2' type-id='type-id-440' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='get_cert_callback3' type-id='type-id-438' visibility='default'/>
+        <var-decl name='get_cert_callback3' type-id='type-id-441' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='verify_callback' type-id='type-id-171' visibility='default'/>
+        <var-decl name='verify_callback' type-id='type-id-172' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-377' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='pin_tmp' type-id='type-id-439' visibility='default'/>
+        <var-decl name='pin_tmp' type-id='type-id-442' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='glob_ocsp_func' type-id='type-id-164' visibility='default'/>
+        <var-decl name='glob_ocsp_func' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <var-decl name='glob_ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
@@ -6296,114 +6331,114 @@
         <var-decl name='tls13_ok' type-id='type-id-75' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-440'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-443'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PARAMS_RSA_EXPORT' value='1'/>
       <enumerator name='GNUTLS_PARAMS_DH' value='2'/>
       <enumerator name='GNUTLS_PARAMS_ECDH' value='3'/>
     </enum-decl>
-    <typedef-decl name='gnutls_params_type_t' type-id='type-id-440' id='type-id-441'/>
-    <class-decl name='gnutls_params_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-442'>
+    <typedef-decl name='gnutls_params_type_t' type-id='type-id-443' id='type-id-444'/>
+    <class-decl name='gnutls_params_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-445'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-441' visibility='default'/>
+        <var-decl name='type' type-id='type-id-444' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='params' type-id='type-id-443' visibility='default'/>
+        <var-decl name='params' type-id='type-id-446' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='deinit' type-id='type-id-22' visibility='default'/>
       </data-member>
     </class-decl>
-    <union-decl name='params' size-in-bits='64' visibility='default' id='type-id-443'>
+    <union-decl name='params' size-in-bits='64' visibility='default' id='type-id-446'>
       <data-member access='private'>
-        <var-decl name='dh' type-id='type-id-418' visibility='default'/>
+        <var-decl name='dh' type-id='type-id-421' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='rsa_export' type-id='type-id-444' visibility='default'/>
+        <var-decl name='rsa_export' type-id='type-id-447' visibility='default'/>
       </data-member>
     </union-decl>
-    <typedef-decl name='gnutls_rsa_params_t' type-id='type-id-391' id='type-id-444'/>
-    <typedef-decl name='gnutls_params_st' type-id='type-id-442' id='type-id-445'/>
-    <pointer-type-def type-id='type-id-445' size-in-bits='64' id='type-id-446'/>
-    <typedef-decl name='gnutls_params_function' type-id='type-id-447' id='type-id-448'/>
-    <pointer-type-def type-id='type-id-448' size-in-bits='64' id='type-id-433'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='4544' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-449' visibility='default' id='type-id-450'>
+    <typedef-decl name='gnutls_rsa_params_t' type-id='type-id-394' id='type-id-447'/>
+    <typedef-decl name='gnutls_params_st' type-id='type-id-445' id='type-id-448'/>
+    <pointer-type-def type-id='type-id-448' size-in-bits='64' id='type-id-449'/>
+    <typedef-decl name='gnutls_params_function' type-id='type-id-450' id='type-id-451'/>
+    <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-436'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='4544' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-452' visibility='default' id='type-id-453'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cert_list' type-id='type-id-161' visibility='default'/>
+        <var-decl name='cert_list' type-id='type-id-162' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cert_list_length' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='names' type-id='type-id-451' visibility='default'/>
+        <var-decl name='names' type-id='type-id-454' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='ocsp_func' type-id='type-id-164' visibility='default'/>
+        <var-decl name='ocsp_func' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='ocsp_data' type-id='type-id-452' visibility='default'/>
+        <var-decl name='ocsp_data' type-id='type-id-455' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
         <var-decl name='ocsp_data_length' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4480'>
-        <var-decl name='pkey' type-id='type-id-401' visibility='default'/>
+        <var-decl name='pkey' type-id='type-id-404' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='gnutls_str_array_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-453'>
+    <class-decl name='gnutls_str_array_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-456'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='str' type-id='type-id-376' visibility='default'/>
+        <var-decl name='str' type-id='type-id-379' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='len' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='next' type-id='type-id-454' visibility='default'/>
+        <var-decl name='next' type-id='type-id-457' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-453' size-in-bits='64' id='type-id-454'/>
-    <typedef-decl name='gnutls_str_array_t' type-id='type-id-454' id='type-id-451'/>
+    <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-457'/>
+    <typedef-decl name='gnutls_str_array_t' type-id='type-id-457' id='type-id-454'/>
 
-    <array-type-def dimensions='1' type-id='type-id-274' size-in-bits='4096' id='type-id-452'>
-      <subrange length='8' type-id='type-id-38' id='type-id-455'/>
+    <array-type-def dimensions='1' type-id='type-id-277' size-in-bits='4096' id='type-id-455'>
+      <subrange length='8' type-id='type-id-38' id='type-id-458'/>
 
     </array-type-def>
-    <typedef-decl name='certs_st' type-id='type-id-450' id='type-id-449'/>
-    <pointer-type-def type-id='type-id-449' size-in-bits='64' id='type-id-434'/>
-    <class-decl name='gnutls_x509_trust_list_st' size-in-bits='576' is-struct='yes' visibility='default' id='type-id-456'>
+    <typedef-decl name='certs_st' type-id='type-id-453' id='type-id-452'/>
+    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-437'/>
+    <class-decl name='gnutls_x509_trust_list_st' size-in-bits='576' is-struct='yes' visibility='default' id='type-id-459'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='node' type-id='type-id-457' visibility='default'/>
+        <var-decl name='node' type-id='type-id-460' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='x509_rdn_sequence' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='blacklisted' type-id='type-id-458' visibility='default'/>
+        <var-decl name='blacklisted' type-id='type-id-461' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='blacklisted_size' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='keep_certs' type-id='type-id-458' visibility='default'/>
+        <var-decl name='keep_certs' type-id='type-id-461' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='keep_certs_size' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='pkcs11_token' type-id='type-id-376' visibility='default'/>
+        <var-decl name='pkcs11_token' type-id='type-id-379' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='node_st' size-in-bits='384' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-459'/>
-    <pointer-type-def type-id='type-id-459' size-in-bits='64' id='type-id-457'/>
-    <class-decl name='gnutls_x509_crt_int' size-in-bits='1088' is-struct='yes' visibility='default' id='type-id-460'>
+    <class-decl name='node_st' size-in-bits='384' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-462'/>
+    <pointer-type-def type-id='type-id-462' size-in-bits='64' id='type-id-460'/>
+    <class-decl name='gnutls_x509_crt_int' size-in-bits='1088' is-struct='yes' visibility='default' id='type-id-463'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cert' type-id='type-id-387' visibility='default'/>
+        <var-decl name='cert' type-id='type-id-390' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='use_extensions' type-id='type-id-22' visibility='default'/>
@@ -6418,7 +6453,7 @@
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-377' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='raw_dn' type-id='type-id-62' visibility='default'/>
@@ -6433,93 +6468,93 @@
         <var-decl name='der' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='san' type-id='type-id-461' visibility='default'/>
+        <var-decl name='san' type-id='type-id-464' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='ian' type-id='type-id-461' visibility='default'/>
+        <var-decl name='ian' type-id='type-id-464' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='dn' type-id='type-id-462' visibility='default'/>
+        <var-decl name='dn' type-id='type-id-465' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='idn' type-id='type-id-462' visibility='default'/>
+        <var-decl name='idn' type-id='type-id-465' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='gnutls_subject_alt_names_st' size-in-bits='128' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-463'/>
-    <pointer-type-def type-id='type-id-463' size-in-bits='64' id='type-id-464'/>
-    <typedef-decl name='gnutls_subject_alt_names_t' type-id='type-id-464' id='type-id-461'/>
-    <class-decl name='gnutls_x509_dn_st' size-in-bits='64' is-struct='yes' visibility='default' id='type-id-465'>
+    <class-decl name='gnutls_subject_alt_names_st' size-in-bits='128' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-466'/>
+    <pointer-type-def type-id='type-id-466' size-in-bits='64' id='type-id-467'/>
+    <typedef-decl name='gnutls_subject_alt_names_t' type-id='type-id-467' id='type-id-464'/>
+    <class-decl name='gnutls_x509_dn_st' size-in-bits='64' is-struct='yes' visibility='default' id='type-id-468'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='asn' type-id='type-id-387' visibility='default'/>
+        <var-decl name='asn' type-id='type-id-390' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_x509_dn_st' type-id='type-id-465' id='type-id-462'/>
-    <pointer-type-def type-id='type-id-460' size-in-bits='64' id='type-id-466'/>
-    <typedef-decl name='gnutls_x509_crt_t' type-id='type-id-466' id='type-id-467'/>
-    <pointer-type-def type-id='type-id-467' size-in-bits='64' id='type-id-458'/>
-    <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-468'/>
-    <typedef-decl name='gnutls_x509_trust_list_t' type-id='type-id-468' id='type-id-435'/>
-    <qualified-type-def type-id='type-id-60' const='yes' id='type-id-469'/>
-    <pointer-type-def type-id='type-id-469' size-in-bits='64' id='type-id-470'/>
-    <class-decl name='gnutls_retr2_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-471'>
+    <typedef-decl name='gnutls_x509_dn_st' type-id='type-id-468' id='type-id-465'/>
+    <pointer-type-def type-id='type-id-463' size-in-bits='64' id='type-id-469'/>
+    <typedef-decl name='gnutls_x509_crt_t' type-id='type-id-469' id='type-id-470'/>
+    <pointer-type-def type-id='type-id-470' size-in-bits='64' id='type-id-461'/>
+    <pointer-type-def type-id='type-id-459' size-in-bits='64' id='type-id-471'/>
+    <typedef-decl name='gnutls_x509_trust_list_t' type-id='type-id-471' id='type-id-438'/>
+    <qualified-type-def type-id='type-id-60' const='yes' id='type-id-472'/>
+    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-473'/>
+    <class-decl name='gnutls_retr2_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-474'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='cert_type' type-id='type-id-19' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='key_type' type-id='type-id-380' visibility='default'/>
+        <var-decl name='key_type' type-id='type-id-383' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cert' type-id='type-id-472' visibility='default'/>
+        <var-decl name='cert' type-id='type-id-475' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='ncerts' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='key' type-id='type-id-473' visibility='default'/>
+        <var-decl name='key' type-id='type-id-476' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='deinit_all' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' id='type-id-472'>
+    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' id='type-id-475'>
       <data-member access='private'>
-        <var-decl name='x509' type-id='type-id-458' visibility='default'/>
+        <var-decl name='x509' type-id='type-id-461' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='pgp' type-id='type-id-474' visibility='default'/>
+        <var-decl name='pgp' type-id='type-id-477' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='gnutls_openpgp_crt_int' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-475'/>
-    <pointer-type-def type-id='type-id-475' size-in-bits='64' id='type-id-476'/>
-    <typedef-decl name='gnutls_openpgp_crt_t' type-id='type-id-476' id='type-id-474'/>
-    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' id='type-id-473'>
+    <class-decl name='gnutls_openpgp_crt_int' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-478'/>
+    <pointer-type-def type-id='type-id-478' size-in-bits='64' id='type-id-479'/>
+    <typedef-decl name='gnutls_openpgp_crt_t' type-id='type-id-479' id='type-id-477'/>
+    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' id='type-id-476'>
       <data-member access='private'>
-        <var-decl name='x509' type-id='type-id-383' visibility='default'/>
+        <var-decl name='x509' type-id='type-id-386' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='pgp' type-id='type-id-477' visibility='default'/>
+        <var-decl name='pgp' type-id='type-id-480' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='pkcs11' type-id='type-id-384' visibility='default'/>
+        <var-decl name='pkcs11' type-id='type-id-387' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='gnutls_openpgp_privkey_int' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-478'/>
-    <pointer-type-def type-id='type-id-478' size-in-bits='64' id='type-id-479'/>
-    <typedef-decl name='gnutls_openpgp_privkey_t' type-id='type-id-479' id='type-id-477'/>
-    <typedef-decl name='gnutls_retr2_st' type-id='type-id-471' id='type-id-480'/>
-    <pointer-type-def type-id='type-id-480' size-in-bits='64' id='type-id-481'/>
-    <typedef-decl name='gnutls_certificate_retrieve_function' type-id='type-id-482' id='type-id-483'/>
-    <pointer-type-def type-id='type-id-483' size-in-bits='64' id='type-id-436'/>
-    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-484'/>
-    <pointer-type-def type-id='type-id-401' size-in-bits='64' id='type-id-485'/>
-    <typedef-decl name='gnutls_certificate_retrieve_function2' type-id='type-id-486' id='type-id-487'/>
-    <pointer-type-def type-id='type-id-487' size-in-bits='64' id='type-id-437'/>
-    <class-decl name='gnutls_cert_retr_st' size-in-bits='896' is-struct='yes' visibility='default' id='type-id-488'>
+    <class-decl name='gnutls_openpgp_privkey_int' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-481'/>
+    <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-482'/>
+    <typedef-decl name='gnutls_openpgp_privkey_t' type-id='type-id-482' id='type-id-480'/>
+    <typedef-decl name='gnutls_retr2_st' type-id='type-id-474' id='type-id-483'/>
+    <pointer-type-def type-id='type-id-483' size-in-bits='64' id='type-id-484'/>
+    <typedef-decl name='gnutls_certificate_retrieve_function' type-id='type-id-485' id='type-id-486'/>
+    <pointer-type-def type-id='type-id-486' size-in-bits='64' id='type-id-439'/>
+    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-487'/>
+    <pointer-type-def type-id='type-id-404' size-in-bits='64' id='type-id-488'/>
+    <typedef-decl name='gnutls_certificate_retrieve_function2' type-id='type-id-489' id='type-id-490'/>
+    <pointer-type-def type-id='type-id-490' size-in-bits='64' id='type-id-440'/>
+    <class-decl name='gnutls_cert_retr_st' size-in-bits='896' is-struct='yes' visibility='default' id='type-id-491'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='version' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cred' type-id='type-id-489' visibility='default'/>
+        <var-decl name='cred' type-id='type-id-492' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='req_ca_rdn' type-id='type-id-57' visibility='default'/>
@@ -6528,116 +6563,116 @@
         <var-decl name='nreqs' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='pk_algos' type-id='type-id-470' visibility='default'/>
+        <var-decl name='pk_algos' type-id='type-id-473' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='pk_algos_length' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='padding' type-id='type-id-490' visibility='default'/>
+        <var-decl name='padding' type-id='type-id-493' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-432' size-in-bits='64' id='type-id-491'/>
-    <typedef-decl name='gnutls_certificate_credentials_t' type-id='type-id-491' id='type-id-489'/>
+    <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-494'/>
+    <typedef-decl name='gnutls_certificate_credentials_t' type-id='type-id-494' id='type-id-492'/>
 
-    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='512' id='type-id-490'>
+    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='512' id='type-id-493'>
       <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-488' const='yes' id='type-id-492'/>
-    <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-493'/>
-    <pointer-type-def type-id='type-id-163' size-in-bits='64' id='type-id-494'/>
-    <typedef-decl name='gnutls_certificate_retrieve_function3' type-id='type-id-495' id='type-id-496'/>
-    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-438'/>
+    <qualified-type-def type-id='type-id-491' const='yes' id='type-id-495'/>
+    <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-497'/>
+    <typedef-decl name='gnutls_certificate_retrieve_function3' type-id='type-id-498' id='type-id-499'/>
+    <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-441'/>
 
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='256' id='type-id-439'>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='256' id='type-id-442'>
       <subrange length='32' type-id='type-id-38' id='type-id-51'/>
 
     </array-type-def>
     <function-decl name='gnutls_certificate_set_known_dh_params' mangled-name='gnutls_certificate_set_known_dh_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_known_dh_params@@GNUTLS_3_4'>
-      <parameter type-id='type-id-489' name='res'/>
-      <parameter type-id='type-id-202' name='sec_param'/>
+      <parameter type-id='type-id-492' name='res'/>
+      <parameter type-id='type-id-203' name='sec_param'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_dh_params' mangled-name='gnutls_certificate_set_dh_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_dh_params@@GNUTLS_3_4'>
-      <parameter type-id='type-id-489' name='res'/>
-      <parameter type-id='type-id-418' name='dh_params'/>
+      <parameter type-id='type-id-492' name='res'/>
+      <parameter type-id='type-id-421' name='dh_params'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_verification_status_print' mangled-name='gnutls_certificate_verification_status_print' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_verification_status_print@@GNUTLS_3_4'>
       <parameter type-id='type-id-10' name='status'/>
       <parameter type-id='type-id-19' name='type'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-278' name='out'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_verify_function' mangled-name='gnutls_certificate_set_verify_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_verify_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-489' name='cred'/>
-      <parameter type-id='type-id-171' name='func'/>
+      <parameter type-id='type-id-492' name='cred'/>
+      <parameter type-id='type-id-172' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_retrieve_function3' mangled-name='gnutls_certificate_set_retrieve_function3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_retrieve_function3@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-489' name='cred'/>
-      <parameter type-id='type-id-438' name='func'/>
+      <parameter type-id='type-id-492' name='cred'/>
+      <parameter type-id='type-id-441' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_retrieve_function2' mangled-name='gnutls_certificate_set_retrieve_function2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_retrieve_function2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-489' name='cred'/>
-      <parameter type-id='type-id-437' name='func'/>
+      <parameter type-id='type-id-492' name='cred'/>
+      <parameter type-id='type-id-440' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_retrieve_function' mangled-name='gnutls_certificate_set_retrieve_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_retrieve_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-489' name='cred'/>
-      <parameter type-id='type-id-436' name='func'/>
+      <parameter type-id='type-id-492' name='cred'/>
+      <parameter type-id='type-id-439' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_server_set_request' mangled-name='gnutls_certificate_server_set_request' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_server_set_request@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-148' name='req'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-489' size-in-bits='64' id='type-id-497'/>
+    <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-500'/>
     <function-decl name='gnutls_certificate_allocate_credentials' mangled-name='gnutls_certificate_allocate_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_allocate_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-497' name='res'/>
+      <parameter type-id='type-id-500' name='res'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_free_credentials' mangled-name='gnutls_certificate_free_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_free_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-489' name='sc'/>
+      <parameter type-id='type-id-492' name='sc'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_free_ca_names' mangled-name='gnutls_certificate_free_ca_names' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_free_ca_names@@GNUTLS_3_4'>
-      <parameter type-id='type-id-489' name='sc'/>
+      <parameter type-id='type-id-492' name='sc'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_get_crt_raw' mangled-name='gnutls_certificate_get_crt_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_get_crt_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-489' name='sc'/>
+      <parameter type-id='type-id-492' name='sc'/>
       <parameter type-id='type-id-10' name='idx1'/>
       <parameter type-id='type-id-10' name='idx2'/>
-      <parameter type-id='type-id-275' name='cert'/>
+      <parameter type-id='type-id-278' name='cert'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_get_issuer' mangled-name='gnutls_certificate_get_issuer' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_get_issuer@@GNUTLS_3_4'>
-      <parameter type-id='type-id-489' name='sc'/>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-458' name='issuer'/>
+      <parameter type-id='type-id-492' name='sc'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-461' name='issuer'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_free_cas' mangled-name='gnutls_certificate_free_cas' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_free_cas@@GNUTLS_3_4'>
-      <parameter type-id='type-id-489' name='sc'/>
+      <parameter type-id='type-id-492' name='sc'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_free_keys' mangled-name='gnutls_certificate_free_keys' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_free_keys@@GNUTLS_3_4'>
-      <parameter type-id='type-id-489' name='sc'/>
+      <parameter type-id='type-id-492' name='sc'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_key' mangled-name='gnutls_certificate_set_key' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_key@@GNUTLS_3_4'>
-      <parameter type-id='type-id-489' name='res'/>
-      <parameter type-id='type-id-426' name='names'/>
+      <parameter type-id='type-id-492' name='res'/>
+      <parameter type-id='type-id-429' name='names'/>
       <parameter type-id='type-id-22' name='names_size'/>
-      <parameter type-id='type-id-161' name='pcert_list'/>
+      <parameter type-id='type-id-162' name='pcert_list'/>
       <parameter type-id='type-id-22' name='pcert_list_size'/>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-404' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pk_bits_to_sec_param' mangled-name='gnutls_pk_bits_to_sec_param' visibility='default' binding='global' size-in-bits='64'>
@@ -6715,53 +6750,53 @@
     <function-decl name='_gnutls13_sign_get_compatible_with_privkey' mangled-name='_gnutls13_sign_get_compatible_with_privkey' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-495'>
-      <parameter type-id='type-id-413'/>
-      <parameter type-id='type-id-493'/>
-      <parameter type-id='type-id-484'/>
-      <parameter type-id='type-id-419'/>
-      <parameter type-id='type-id-494'/>
-      <parameter type-id='type-id-419'/>
-      <parameter type-id='type-id-485'/>
-      <parameter type-id='type-id-419'/>
+    <function-type size-in-bits='64' id='type-id-498'>
+      <parameter type-id='type-id-416'/>
+      <parameter type-id='type-id-496'/>
+      <parameter type-id='type-id-487'/>
+      <parameter type-id='type-id-422'/>
+      <parameter type-id='type-id-497'/>
+      <parameter type-id='type-id-422'/>
+      <parameter type-id='type-id-488'/>
+      <parameter type-id='type-id-422'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-486'>
-      <parameter type-id='type-id-413'/>
+    <function-type size-in-bits='64' id='type-id-489'>
+      <parameter type-id='type-id-416'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-22'/>
-      <parameter type-id='type-id-470'/>
+      <parameter type-id='type-id-473'/>
       <parameter type-id='type-id-22'/>
-      <parameter type-id='type-id-484'/>
-      <parameter type-id='type-id-419'/>
-      <parameter type-id='type-id-485'/>
+      <parameter type-id='type-id-487'/>
+      <parameter type-id='type-id-422'/>
+      <parameter type-id='type-id-488'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-482'>
-      <parameter type-id='type-id-413'/>
+    <function-type size-in-bits='64' id='type-id-485'>
+      <parameter type-id='type-id-416'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-22'/>
-      <parameter type-id='type-id-470'/>
+      <parameter type-id='type-id-473'/>
       <parameter type-id='type-id-22'/>
-      <parameter type-id='type-id-481'/>
+      <parameter type-id='type-id-484'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-447'>
-      <parameter type-id='type-id-413'/>
-      <parameter type-id='type-id-441'/>
-      <parameter type-id='type-id-446'/>
+    <function-type size-in-bits='64' id='type-id-450'>
+      <parameter type-id='type-id-416'/>
+      <parameter type-id='type-id-444'/>
+      <parameter type-id='type-id-449'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='global.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <var-decl name='_gnutls_pkix1_asn' type-id='type-id-387' visibility='default'/>
-    <var-decl name='_gnutls_gnutls_asn' type-id='type-id-387' visibility='default'/>
-    <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-499'/>
-    <typedef-decl name='gnutls_log_func' type-id='type-id-499' id='type-id-500'/>
-    <var-decl name='_gnutls_log_func' type-id='type-id-500' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='global.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <var-decl name='_gnutls_pkix1_asn' type-id='type-id-390' visibility='default'/>
+    <var-decl name='_gnutls_gnutls_asn' type-id='type-id-390' visibility='default'/>
     <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-502'/>
-    <typedef-decl name='gnutls_audit_log_func' type-id='type-id-502' id='type-id-503'/>
-    <var-decl name='_gnutls_audit_log_func' type-id='type-id-503' visibility='default'/>
+    <typedef-decl name='gnutls_log_func' type-id='type-id-502' id='type-id-503'/>
+    <var-decl name='_gnutls_log_func' type-id='type-id-503' visibility='default'/>
+    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-505'/>
+    <typedef-decl name='gnutls_audit_log_func' type-id='type-id-505' id='type-id-506'/>
+    <var-decl name='_gnutls_audit_log_func' type-id='type-id-506' visibility='default'/>
     <var-decl name='_gnutls_log_level' type-id='type-id-22' mangled-name='_gnutls_log_level' visibility='default' elf-symbol-id='_gnutls_log_level@@GNUTLS_PRIVATE_3_4'/>
     <var-decl name='_gnutls_global_version' type-id='type-id-10' mangled-name='_gnutls_global_version' visibility='default' elf-symbol-id='_gnutls_global_version@@GNUTLS_PRIVATE_3_4'/>
     <function-decl name='gnutls_check_version' mangled-name='gnutls_check_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_check_version@@GNUTLS_3_4'>
@@ -6774,38 +6809,38 @@
     <function-decl name='gnutls_global_init' mangled-name='gnutls_global_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_global_init@@GNUTLS_3_4'>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-505'/>
-    <typedef-decl name='gnutls_alloc_function' type-id='type-id-505' id='type-id-506'/>
     <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-508'/>
-    <typedef-decl name='gnutls_is_secure_function' type-id='type-id-508' id='type-id-509'/>
+    <typedef-decl name='gnutls_alloc_function' type-id='type-id-508' id='type-id-509'/>
     <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-511'/>
-    <typedef-decl name='gnutls_realloc_function' type-id='type-id-511' id='type-id-512'/>
-    <typedef-decl name='gnutls_free_function' type-id='type-id-121' id='type-id-513'/>
+    <typedef-decl name='gnutls_is_secure_function' type-id='type-id-511' id='type-id-512'/>
+    <pointer-type-def type-id='type-id-513' size-in-bits='64' id='type-id-514'/>
+    <typedef-decl name='gnutls_realloc_function' type-id='type-id-514' id='type-id-515'/>
+    <typedef-decl name='gnutls_free_function' type-id='type-id-121' id='type-id-516'/>
     <function-decl name='gnutls_global_set_mem_functions' mangled-name='gnutls_global_set_mem_functions' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_global_set_mem_functions@@GNUTLS_3_4'>
-      <parameter type-id='type-id-506' name='alloc_func'/>
-      <parameter type-id='type-id-506' name='secure_alloc_func'/>
-      <parameter type-id='type-id-509' name='is_secure_func'/>
-      <parameter type-id='type-id-512' name='realloc_func'/>
-      <parameter type-id='type-id-513' name='free_func'/>
+      <parameter type-id='type-id-509' name='alloc_func'/>
+      <parameter type-id='type-id-509' name='secure_alloc_func'/>
+      <parameter type-id='type-id-512' name='is_secure_func'/>
+      <parameter type-id='type-id-515' name='realloc_func'/>
+      <parameter type-id='type-id-516' name='free_func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_global_set_log_level' mangled-name='gnutls_global_set_log_level' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_global_set_log_level@@GNUTLS_3_4'>
       <parameter type-id='type-id-22' name='level'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-514'/>
-    <pointer-type-def type-id='type-id-515' size-in-bits='64' id='type-id-516'/>
-    <typedef-decl name='gnutls_time_func' type-id='type-id-516' id='type-id-517'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-517'/>
+    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-519'/>
+    <typedef-decl name='gnutls_time_func' type-id='type-id-519' id='type-id-520'/>
     <function-decl name='gnutls_global_set_time_function' mangled-name='gnutls_global_set_time_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_global_set_time_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-517' name='time_func'/>
+      <parameter type-id='type-id-520' name='time_func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_global_set_audit_log_function' mangled-name='gnutls_global_set_audit_log_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_global_set_audit_log_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-503' name='log_func'/>
+      <parameter type-id='type-id-506' name='log_func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_global_set_log_function' mangled-name='gnutls_global_set_log_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_global_set_log_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-500' name='log_func'/>
+      <parameter type-id='type-id-503' name='log_func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_global_init_skip' mangled-name='_gnutls_global_init_skip' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_global_init_skip@@GNUTLS_3_4'>
@@ -6895,35 +6930,35 @@
     <function-decl name='_gnutls_load_system_priorities' mangled-name='_gnutls_load_system_priorities' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-507'>
+    <function-type size-in-bits='64' id='type-id-510'>
       <parameter type-id='type-id-101'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-515'>
-      <parameter type-id='type-id-514'/>
+    <function-type size-in-bits='64' id='type-id-518'>
+      <parameter type-id='type-id-517'/>
       <return type-id='type-id-17'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-498'>
+    <function-type size-in-bits='64' id='type-id-501'>
       <parameter type-id='type-id-22'/>
       <parameter type-id='type-id-27'/>
       <return type-id='type-id-111'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-501'>
-      <parameter type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-504'>
+      <parameter type-id='type-id-237'/>
       <parameter type-id='type-id-27'/>
       <return type-id='type-id-111'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-504'>
+    <function-type size-in-bits='64' id='type-id-507'>
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-101'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-510'>
+    <function-type size-in-bits='64' id='type-id-513'>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-101'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='constate.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='constate.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls_cipher_init' mangled-name='_gnutls_cipher_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -6949,94 +6984,94 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='anon_cred.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_anon_server_credentials_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-518'>
+  <abi-instr version='1.0' address-size='64' path='anon_cred.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_anon_server_credentials_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-521'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='dh_params' type-id='type-id-418' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-421' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='deinit_dh_params' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
+        <var-decl name='dh_sec_param' type-id='type-id-203' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='params_func' type-id='type-id-433' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-436' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-519'/>
-    <typedef-decl name='gnutls_anon_server_credentials_t' type-id='type-id-519' id='type-id-520'/>
+    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-522'/>
+    <typedef-decl name='gnutls_anon_server_credentials_t' type-id='type-id-522' id='type-id-523'/>
     <function-decl name='gnutls_anon_set_server_known_dh_params' mangled-name='gnutls_anon_set_server_known_dh_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anon_set_server_known_dh_params@@GNUTLS_3_4'>
-      <parameter type-id='type-id-520' name='res'/>
-      <parameter type-id='type-id-202' name='sec_param'/>
+      <parameter type-id='type-id-523' name='res'/>
+      <parameter type-id='type-id-203' name='sec_param'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_anon_set_server_dh_params' mangled-name='gnutls_anon_set_server_dh_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anon_set_server_dh_params@@GNUTLS_3_4'>
-      <parameter type-id='type-id-520' name='res'/>
-      <parameter type-id='type-id-418' name='dh_params'/>
+      <parameter type-id='type-id-523' name='res'/>
+      <parameter type-id='type-id-421' name='dh_params'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <class-decl name='gnutls_anon_client_credentials_st' size-in-bits='32' is-struct='yes' visibility='default' id='type-id-521'>
+    <class-decl name='gnutls_anon_client_credentials_st' size-in-bits='32' is-struct='yes' visibility='default' id='type-id-524'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='dummy' type-id='type-id-22' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-522'/>
-    <typedef-decl name='gnutls_anon_client_credentials_t' type-id='type-id-522' id='type-id-523'/>
-    <pointer-type-def type-id='type-id-523' size-in-bits='64' id='type-id-524'/>
+    <pointer-type-def type-id='type-id-524' size-in-bits='64' id='type-id-525'/>
+    <typedef-decl name='gnutls_anon_client_credentials_t' type-id='type-id-525' id='type-id-526'/>
+    <pointer-type-def type-id='type-id-526' size-in-bits='64' id='type-id-527'/>
     <function-decl name='gnutls_anon_allocate_client_credentials' mangled-name='gnutls_anon_allocate_client_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anon_allocate_client_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-524' name='sc'/>
+      <parameter type-id='type-id-527' name='sc'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_anon_free_client_credentials' mangled-name='gnutls_anon_free_client_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anon_free_client_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-523' name='sc'/>
+      <parameter type-id='type-id-526' name='sc'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-525'/>
+    <pointer-type-def type-id='type-id-523' size-in-bits='64' id='type-id-528'/>
     <function-decl name='gnutls_anon_allocate_server_credentials' mangled-name='gnutls_anon_allocate_server_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anon_allocate_server_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-525' name='sc'/>
+      <parameter type-id='type-id-528' name='sc'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_anon_free_server_credentials' mangled-name='gnutls_anon_free_server_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anon_free_server_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-520' name='sc'/>
+      <parameter type-id='type-id-523' name='sc'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_anon_set_server_params_function' mangled-name='gnutls_anon_set_server_params_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anon_set_server_params_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-520' name='res'/>
-      <parameter type-id='type-id-433' name='func'/>
+      <parameter type-id='type-id-523' name='res'/>
+      <parameter type-id='type-id-436' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='mem.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <var-decl name='gnutls_secure_malloc' type-id='type-id-506' mangled-name='gnutls_secure_malloc' visibility='default' elf-symbol-id='gnutls_secure_malloc@@GNUTLS_3_4'/>
-    <var-decl name='gnutls_malloc' type-id='type-id-506' mangled-name='gnutls_malloc' visibility='default' elf-symbol-id='gnutls_malloc@@GNUTLS_3_4'/>
-    <var-decl name='gnutls_free' type-id='type-id-513' mangled-name='gnutls_free' visibility='default' elf-symbol-id='gnutls_free@@GNUTLS_3_4'/>
-    <var-decl name='gnutls_realloc' type-id='type-id-512' mangled-name='gnutls_realloc' visibility='default' elf-symbol-id='gnutls_realloc@@GNUTLS_3_4'/>
-    <pointer-type-def type-id='type-id-526' size-in-bits='64' id='type-id-527'/>
-    <typedef-decl name='gnutls_calloc_function' type-id='type-id-527' id='type-id-528'/>
-    <var-decl name='gnutls_calloc' type-id='type-id-528' mangled-name='gnutls_calloc' visibility='default' elf-symbol-id='gnutls_calloc@@GNUTLS_3_4'/>
+  <abi-instr version='1.0' address-size='64' path='mem.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <var-decl name='gnutls_secure_malloc' type-id='type-id-509' mangled-name='gnutls_secure_malloc' visibility='default' elf-symbol-id='gnutls_secure_malloc@@GNUTLS_3_4'/>
+    <var-decl name='gnutls_malloc' type-id='type-id-509' mangled-name='gnutls_malloc' visibility='default' elf-symbol-id='gnutls_malloc@@GNUTLS_3_4'/>
+    <var-decl name='gnutls_free' type-id='type-id-516' mangled-name='gnutls_free' visibility='default' elf-symbol-id='gnutls_free@@GNUTLS_3_4'/>
+    <var-decl name='gnutls_realloc' type-id='type-id-515' mangled-name='gnutls_realloc' visibility='default' elf-symbol-id='gnutls_realloc@@GNUTLS_3_4'/>
     <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-530'/>
-    <var-decl name='gnutls_strdup' type-id='type-id-530' mangled-name='gnutls_strdup' visibility='default' elf-symbol-id='gnutls_strdup@@GNUTLS_3_4'/>
-    <function-type size-in-bits='64' id='type-id-529'>
+    <typedef-decl name='gnutls_calloc_function' type-id='type-id-530' id='type-id-531'/>
+    <var-decl name='gnutls_calloc' type-id='type-id-531' mangled-name='gnutls_calloc' visibility='default' elf-symbol-id='gnutls_calloc@@GNUTLS_3_4'/>
+    <pointer-type-def type-id='type-id-532' size-in-bits='64' id='type-id-533'/>
+    <var-decl name='gnutls_strdup' type-id='type-id-533' mangled-name='gnutls_strdup' visibility='default' elf-symbol-id='gnutls_strdup@@GNUTLS_3_4'/>
+    <function-type size-in-bits='64' id='type-id-532'>
       <parameter type-id='type-id-27'/>
-      <return type-id='type-id-376'/>
+      <return type-id='type-id-379'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-526'>
+    <function-type size-in-bits='64' id='type-id-529'>
       <parameter type-id='type-id-99'/>
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-101'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='fingerprint.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='fingerprint.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_fingerprint' mangled-name='gnutls_fingerprint' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_fingerprint@@GNUTLS_3_4'>
-      <parameter type-id='type-id-211' name='algo'/>
+      <parameter type-id='type-id-212' name='algo'/>
       <parameter type-id='type-id-57' name='data'/>
       <parameter type-id='type-id-101' name='result'/>
-      <parameter type-id='type-id-422' name='result_size'/>
+      <parameter type-id='type-id-425' name='result_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls-sig.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls-sig.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls_pubkey_compatible_with_sig' mangled-name='_gnutls_pubkey_compatible_with_sig' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -7071,13 +7106,13 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ecc.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ecc.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_ecc_curve_get_size' mangled-name='gnutls_ecc_curve_get_size' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='alert.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-531'>
+  <abi-instr version='1.0' address-size='64' path='alert.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-534'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_A_CLOSE_NOTIFY' value='0'/>
       <enumerator name='GNUTLS_A_UNEXPECTED_MESSAGE' value='10'/>
@@ -7113,44 +7148,44 @@
       <enumerator name='GNUTLS_A_NO_APPLICATION_PROTOCOL' value='120'/>
       <enumerator name='GNUTLS_A_MAX' value='120'/>
     </enum-decl>
-    <typedef-decl name='gnutls_alert_description_t' type-id='type-id-531' id='type-id-532'/>
+    <typedef-decl name='gnutls_alert_description_t' type-id='type-id-534' id='type-id-535'/>
     <function-decl name='gnutls_alert_get' mangled-name='gnutls_alert_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_alert_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <return type-id='type-id-532'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <return type-id='type-id-535'/>
     </function-decl>
     <function-decl name='gnutls_alert_send_appropriate' mangled-name='gnutls_alert_send_appropriate' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_alert_send_appropriate@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-22' name='err'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_error_to_alert' mangled-name='gnutls_error_to_alert' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_error_to_alert@@GNUTLS_3_4'>
       <parameter type-id='type-id-22' name='err'/>
-      <parameter type-id='type-id-364' name='level'/>
+      <parameter type-id='type-id-367' name='level'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-533'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-536'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_AL_WARNING' value='1'/>
       <enumerator name='GNUTLS_AL_FATAL' value='2'/>
     </enum-decl>
-    <typedef-decl name='gnutls_alert_level_t' type-id='type-id-533' id='type-id-534'/>
+    <typedef-decl name='gnutls_alert_level_t' type-id='type-id-536' id='type-id-537'/>
     <function-decl name='gnutls_alert_send' mangled-name='gnutls_alert_send' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_alert_send@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-534' name='level'/>
-      <parameter type-id='type-id-532' name='desc'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-537' name='level'/>
+      <parameter type-id='type-id-535' name='desc'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_alert_get_strname' mangled-name='gnutls_alert_get_strname' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_alert_get_strname@@GNUTLS_3_4'>
-      <parameter type-id='type-id-532' name='alert'/>
+      <parameter type-id='type-id-535' name='alert'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_alert_get_name' mangled-name='gnutls_alert_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_alert_get_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-532' name='alert'/>
+      <parameter type-id='type-id-535' name='alert'/>
       <return type-id='type-id-27'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='privkey_raw.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_pkcs11_privkey_st' size-in-bits='3392' is-struct='yes' visibility='default' id='type-id-392'>
+  <abi-instr version='1.0' address-size='64' path='privkey_raw.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_pkcs11_privkey_st' size-in-bits='3392' is-struct='yes' visibility='default' id='type-id-395'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pk_algorithm' type-id='type-id-60' visibility='default'/>
       </data-member>
@@ -7164,16 +7199,16 @@
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='uinfo' type-id='type-id-535' visibility='default'/>
+        <var-decl name='uinfo' type-id='type-id-538' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='url' type-id='type-id-376' visibility='default'/>
+        <var-decl name='url' type-id='type-id-379' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='sinfo' type-id='type-id-536' visibility='default'/>
+        <var-decl name='sinfo' type-id='type-id-539' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3072'>
-        <var-decl name='ref' type-id='type-id-537' visibility='default'/>
+        <var-decl name='ref' type-id='type-id-540' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3136'>
         <var-decl name='reauth' type-id='type-id-10' visibility='default'/>
@@ -7182,26 +7217,26 @@
         <var-decl name='mutex' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
-        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-377' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='p11_kit_uri' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-538'/>
-    <pointer-type-def type-id='type-id-538' size-in-bits='64' id='type-id-535'/>
-    <class-decl name='pkcs11_session_info' size-in-bits='2816' is-struct='yes' visibility='default' id='type-id-536'>
+    <class-decl name='p11_kit_uri' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-541'/>
+    <pointer-type-def type-id='type-id-541' size-in-bits='64' id='type-id-538'/>
+    <class-decl name='pkcs11_session_info' size-in-bits='2816' is-struct='yes' visibility='default' id='type-id-539'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='module' type-id='type-id-539' visibility='default'/>
+        <var-decl name='module' type-id='type-id-542' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tinfo' type-id='type-id-540' visibility='default'/>
+        <var-decl name='tinfo' type-id='type-id-543' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='slot_info' type-id='type-id-541' visibility='default'/>
+        <var-decl name='slot_info' type-id='type-id-544' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2624'>
-        <var-decl name='pks' type-id='type-id-542' visibility='default'/>
+        <var-decl name='pks' type-id='type-id-545' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2688'>
-        <var-decl name='sid' type-id='type-id-543' visibility='default'/>
+        <var-decl name='sid' type-id='type-id-546' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2752'>
         <var-decl name='init' type-id='type-id-10' visibility='default'/>
@@ -7210,216 +7245,216 @@
         <var-decl name='trusted' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='ck_function_list' size-in-bits='4416' is-struct='yes' visibility='default' id='type-id-544'>
+    <class-decl name='ck_function_list' size-in-bits='4416' is-struct='yes' visibility='default' id='type-id-547'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='version' type-id='type-id-545' visibility='default'/>
+        <var-decl name='version' type-id='type-id-548' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='C_Initialize' type-id='type-id-546' visibility='default'/>
+        <var-decl name='C_Initialize' type-id='type-id-549' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='C_Finalize' type-id='type-id-547' visibility='default'/>
+        <var-decl name='C_Finalize' type-id='type-id-550' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='C_GetInfo' type-id='type-id-548' visibility='default'/>
+        <var-decl name='C_GetInfo' type-id='type-id-551' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='C_GetFunctionList' type-id='type-id-549' visibility='default'/>
+        <var-decl name='C_GetFunctionList' type-id='type-id-552' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='C_GetSlotList' type-id='type-id-550' visibility='default'/>
+        <var-decl name='C_GetSlotList' type-id='type-id-553' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='C_GetSlotInfo' type-id='type-id-551' visibility='default'/>
+        <var-decl name='C_GetSlotInfo' type-id='type-id-554' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='C_GetTokenInfo' type-id='type-id-552' visibility='default'/>
+        <var-decl name='C_GetTokenInfo' type-id='type-id-555' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='C_GetMechanismList' type-id='type-id-553' visibility='default'/>
+        <var-decl name='C_GetMechanismList' type-id='type-id-556' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='C_GetMechanismInfo' type-id='type-id-554' visibility='default'/>
+        <var-decl name='C_GetMechanismInfo' type-id='type-id-557' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='C_InitToken' type-id='type-id-555' visibility='default'/>
+        <var-decl name='C_InitToken' type-id='type-id-558' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='C_InitPIN' type-id='type-id-556' visibility='default'/>
+        <var-decl name='C_InitPIN' type-id='type-id-559' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='C_SetPIN' type-id='type-id-557' visibility='default'/>
+        <var-decl name='C_SetPIN' type-id='type-id-560' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='C_OpenSession' type-id='type-id-558' visibility='default'/>
+        <var-decl name='C_OpenSession' type-id='type-id-561' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='C_CloseSession' type-id='type-id-559' visibility='default'/>
+        <var-decl name='C_CloseSession' type-id='type-id-562' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='C_CloseAllSessions' type-id='type-id-560' visibility='default'/>
+        <var-decl name='C_CloseAllSessions' type-id='type-id-563' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='C_GetSessionInfo' type-id='type-id-561' visibility='default'/>
+        <var-decl name='C_GetSessionInfo' type-id='type-id-564' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='C_GetOperationState' type-id='type-id-562' visibility='default'/>
+        <var-decl name='C_GetOperationState' type-id='type-id-565' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='C_SetOperationState' type-id='type-id-563' visibility='default'/>
+        <var-decl name='C_SetOperationState' type-id='type-id-566' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='C_Login' type-id='type-id-564' visibility='default'/>
+        <var-decl name='C_Login' type-id='type-id-567' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='C_Logout' type-id='type-id-565' visibility='default'/>
+        <var-decl name='C_Logout' type-id='type-id-568' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='C_CreateObject' type-id='type-id-566' visibility='default'/>
+        <var-decl name='C_CreateObject' type-id='type-id-569' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='C_CopyObject' type-id='type-id-567' visibility='default'/>
+        <var-decl name='C_CopyObject' type-id='type-id-570' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='C_DestroyObject' type-id='type-id-568' visibility='default'/>
+        <var-decl name='C_DestroyObject' type-id='type-id-571' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='C_GetObjectSize' type-id='type-id-569' visibility='default'/>
+        <var-decl name='C_GetObjectSize' type-id='type-id-572' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='C_GetAttributeValue' type-id='type-id-570' visibility='default'/>
+        <var-decl name='C_GetAttributeValue' type-id='type-id-573' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='C_SetAttributeValue' type-id='type-id-571' visibility='default'/>
+        <var-decl name='C_SetAttributeValue' type-id='type-id-574' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='C_FindObjectsInit' type-id='type-id-572' visibility='default'/>
+        <var-decl name='C_FindObjectsInit' type-id='type-id-575' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1792'>
-        <var-decl name='C_FindObjects' type-id='type-id-573' visibility='default'/>
+        <var-decl name='C_FindObjects' type-id='type-id-576' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1856'>
-        <var-decl name='C_FindObjectsFinal' type-id='type-id-574' visibility='default'/>
+        <var-decl name='C_FindObjectsFinal' type-id='type-id-577' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1920'>
-        <var-decl name='C_EncryptInit' type-id='type-id-575' visibility='default'/>
+        <var-decl name='C_EncryptInit' type-id='type-id-578' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1984'>
-        <var-decl name='C_Encrypt' type-id='type-id-576' visibility='default'/>
+        <var-decl name='C_Encrypt' type-id='type-id-579' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
-        <var-decl name='C_EncryptUpdate' type-id='type-id-577' visibility='default'/>
+        <var-decl name='C_EncryptUpdate' type-id='type-id-580' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
-        <var-decl name='C_EncryptFinal' type-id='type-id-578' visibility='default'/>
+        <var-decl name='C_EncryptFinal' type-id='type-id-581' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='C_DecryptInit' type-id='type-id-579' visibility='default'/>
+        <var-decl name='C_DecryptInit' type-id='type-id-582' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
-        <var-decl name='C_Decrypt' type-id='type-id-580' visibility='default'/>
+        <var-decl name='C_Decrypt' type-id='type-id-583' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='C_DecryptUpdate' type-id='type-id-581' visibility='default'/>
+        <var-decl name='C_DecryptUpdate' type-id='type-id-584' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='C_DecryptFinal' type-id='type-id-582' visibility='default'/>
+        <var-decl name='C_DecryptFinal' type-id='type-id-585' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
-        <var-decl name='C_DigestInit' type-id='type-id-583' visibility='default'/>
+        <var-decl name='C_DigestInit' type-id='type-id-586' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
-        <var-decl name='C_Digest' type-id='type-id-584' visibility='default'/>
+        <var-decl name='C_Digest' type-id='type-id-587' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2560'>
-        <var-decl name='C_DigestUpdate' type-id='type-id-585' visibility='default'/>
+        <var-decl name='C_DigestUpdate' type-id='type-id-588' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2624'>
-        <var-decl name='C_DigestKey' type-id='type-id-586' visibility='default'/>
+        <var-decl name='C_DigestKey' type-id='type-id-589' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2688'>
-        <var-decl name='C_DigestFinal' type-id='type-id-587' visibility='default'/>
+        <var-decl name='C_DigestFinal' type-id='type-id-590' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2752'>
-        <var-decl name='C_SignInit' type-id='type-id-588' visibility='default'/>
+        <var-decl name='C_SignInit' type-id='type-id-591' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2816'>
-        <var-decl name='C_Sign' type-id='type-id-589' visibility='default'/>
+        <var-decl name='C_Sign' type-id='type-id-592' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2880'>
-        <var-decl name='C_SignUpdate' type-id='type-id-590' visibility='default'/>
+        <var-decl name='C_SignUpdate' type-id='type-id-593' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2944'>
-        <var-decl name='C_SignFinal' type-id='type-id-591' visibility='default'/>
+        <var-decl name='C_SignFinal' type-id='type-id-594' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3008'>
-        <var-decl name='C_SignRecoverInit' type-id='type-id-592' visibility='default'/>
+        <var-decl name='C_SignRecoverInit' type-id='type-id-595' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3072'>
-        <var-decl name='C_SignRecover' type-id='type-id-593' visibility='default'/>
+        <var-decl name='C_SignRecover' type-id='type-id-596' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3136'>
-        <var-decl name='C_VerifyInit' type-id='type-id-594' visibility='default'/>
+        <var-decl name='C_VerifyInit' type-id='type-id-597' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3200'>
-        <var-decl name='C_Verify' type-id='type-id-595' visibility='default'/>
+        <var-decl name='C_Verify' type-id='type-id-598' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
-        <var-decl name='C_VerifyUpdate' type-id='type-id-596' visibility='default'/>
+        <var-decl name='C_VerifyUpdate' type-id='type-id-599' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
-        <var-decl name='C_VerifyFinal' type-id='type-id-597' visibility='default'/>
+        <var-decl name='C_VerifyFinal' type-id='type-id-600' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
-        <var-decl name='C_VerifyRecoverInit' type-id='type-id-598' visibility='default'/>
+        <var-decl name='C_VerifyRecoverInit' type-id='type-id-601' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
-        <var-decl name='C_VerifyRecover' type-id='type-id-599' visibility='default'/>
+        <var-decl name='C_VerifyRecover' type-id='type-id-602' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
-        <var-decl name='C_DigestEncryptUpdate' type-id='type-id-600' visibility='default'/>
+        <var-decl name='C_DigestEncryptUpdate' type-id='type-id-603' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3584'>
-        <var-decl name='C_DecryptDigestUpdate' type-id='type-id-601' visibility='default'/>
+        <var-decl name='C_DecryptDigestUpdate' type-id='type-id-604' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3648'>
-        <var-decl name='C_SignEncryptUpdate' type-id='type-id-602' visibility='default'/>
+        <var-decl name='C_SignEncryptUpdate' type-id='type-id-605' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3712'>
-        <var-decl name='C_DecryptVerifyUpdate' type-id='type-id-603' visibility='default'/>
+        <var-decl name='C_DecryptVerifyUpdate' type-id='type-id-606' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='C_GenerateKey' type-id='type-id-604' visibility='default'/>
+        <var-decl name='C_GenerateKey' type-id='type-id-607' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='C_GenerateKeyPair' type-id='type-id-605' visibility='default'/>
+        <var-decl name='C_GenerateKeyPair' type-id='type-id-608' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='C_WrapKey' type-id='type-id-606' visibility='default'/>
+        <var-decl name='C_WrapKey' type-id='type-id-609' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
-        <var-decl name='C_UnwrapKey' type-id='type-id-607' visibility='default'/>
+        <var-decl name='C_UnwrapKey' type-id='type-id-610' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='C_DeriveKey' type-id='type-id-608' visibility='default'/>
+        <var-decl name='C_DeriveKey' type-id='type-id-611' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
-        <var-decl name='C_SeedRandom' type-id='type-id-609' visibility='default'/>
+        <var-decl name='C_SeedRandom' type-id='type-id-612' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4160'>
-        <var-decl name='C_GenerateRandom' type-id='type-id-610' visibility='default'/>
+        <var-decl name='C_GenerateRandom' type-id='type-id-613' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
-        <var-decl name='C_GetFunctionStatus' type-id='type-id-611' visibility='default'/>
+        <var-decl name='C_GetFunctionStatus' type-id='type-id-614' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4288'>
-        <var-decl name='C_CancelFunction' type-id='type-id-612' visibility='default'/>
+        <var-decl name='C_CancelFunction' type-id='type-id-615' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4352'>
-        <var-decl name='C_WaitForSlotEvent' type-id='type-id-613' visibility='default'/>
+        <var-decl name='C_WaitForSlotEvent' type-id='type-id-616' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='ck_version' size-in-bits='16' is-struct='yes' visibility='default' id='type-id-545'>
+    <class-decl name='ck_version' size-in-bits='16' is-struct='yes' visibility='default' id='type-id-548'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='major' type-id='type-id-35' visibility='default'/>
       </data-member>
@@ -7427,75 +7462,75 @@
         <var-decl name='minor' type-id='type-id-35' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='ck_rv_t' type-id='type-id-38' id='type-id-614'/>
-    <pointer-type-def type-id='type-id-615' size-in-bits='64' id='type-id-616'/>
-    <typedef-decl name='CK_C_Initialize' type-id='type-id-616' id='type-id-546'/>
-    <typedef-decl name='CK_C_Finalize' type-id='type-id-616' id='type-id-547'/>
-    <class-decl name='ck_info' size-in-bits='704' is-struct='yes' visibility='default' id='type-id-617'>
+    <typedef-decl name='ck_rv_t' type-id='type-id-38' id='type-id-617'/>
+    <pointer-type-def type-id='type-id-618' size-in-bits='64' id='type-id-619'/>
+    <typedef-decl name='CK_C_Initialize' type-id='type-id-619' id='type-id-549'/>
+    <typedef-decl name='CK_C_Finalize' type-id='type-id-619' id='type-id-550'/>
+    <class-decl name='ck_info' size-in-bits='704' is-struct='yes' visibility='default' id='type-id-620'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cryptoki_version' type-id='type-id-545' visibility='default'/>
+        <var-decl name='cryptoki_version' type-id='type-id-548' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='manufacturer_id' type-id='type-id-273' visibility='default'/>
+        <var-decl name='manufacturer_id' type-id='type-id-276' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='flags' type-id='type-id-618' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-621' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='library_description' type-id='type-id-273' visibility='default'/>
+        <var-decl name='library_description' type-id='type-id-276' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='library_version' type-id='type-id-545' visibility='default'/>
+        <var-decl name='library_version' type-id='type-id-548' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='ck_flags_t' type-id='type-id-38' id='type-id-618'/>
-    <pointer-type-def type-id='type-id-617' size-in-bits='64' id='type-id-619'/>
-    <pointer-type-def type-id='type-id-620' size-in-bits='64' id='type-id-621'/>
-    <typedef-decl name='CK_C_GetInfo' type-id='type-id-621' id='type-id-548'/>
-    <pointer-type-def type-id='type-id-544' size-in-bits='64' id='type-id-539'/>
-    <pointer-type-def type-id='type-id-539' size-in-bits='64' id='type-id-622'/>
+    <typedef-decl name='ck_flags_t' type-id='type-id-38' id='type-id-621'/>
+    <pointer-type-def type-id='type-id-620' size-in-bits='64' id='type-id-622'/>
     <pointer-type-def type-id='type-id-623' size-in-bits='64' id='type-id-624'/>
-    <typedef-decl name='CK_C_GetFunctionList' type-id='type-id-624' id='type-id-549'/>
-    <typedef-decl name='ck_slot_id_t' type-id='type-id-38' id='type-id-543'/>
-    <pointer-type-def type-id='type-id-543' size-in-bits='64' id='type-id-625'/>
-    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-626'/>
-    <pointer-type-def type-id='type-id-627' size-in-bits='64' id='type-id-628'/>
-    <typedef-decl name='CK_C_GetSlotList' type-id='type-id-628' id='type-id-550'/>
-    <class-decl name='ck_slot_info' size-in-bits='896' is-struct='yes' visibility='default' id='type-id-541'>
+    <typedef-decl name='CK_C_GetInfo' type-id='type-id-624' id='type-id-551'/>
+    <pointer-type-def type-id='type-id-547' size-in-bits='64' id='type-id-542'/>
+    <pointer-type-def type-id='type-id-542' size-in-bits='64' id='type-id-625'/>
+    <pointer-type-def type-id='type-id-626' size-in-bits='64' id='type-id-627'/>
+    <typedef-decl name='CK_C_GetFunctionList' type-id='type-id-627' id='type-id-552'/>
+    <typedef-decl name='ck_slot_id_t' type-id='type-id-38' id='type-id-546'/>
+    <pointer-type-def type-id='type-id-546' size-in-bits='64' id='type-id-628'/>
+    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-629'/>
+    <pointer-type-def type-id='type-id-630' size-in-bits='64' id='type-id-631'/>
+    <typedef-decl name='CK_C_GetSlotList' type-id='type-id-631' id='type-id-553'/>
+    <class-decl name='ck_slot_info' size-in-bits='896' is-struct='yes' visibility='default' id='type-id-544'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='slot_description' type-id='type-id-490' visibility='default'/>
+        <var-decl name='slot_description' type-id='type-id-493' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='manufacturer_id' type-id='type-id-273' visibility='default'/>
+        <var-decl name='manufacturer_id' type-id='type-id-276' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='flags' type-id='type-id-618' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-621' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='hardware_version' type-id='type-id-545' visibility='default'/>
+        <var-decl name='hardware_version' type-id='type-id-548' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='848'>
-        <var-decl name='firmware_version' type-id='type-id-545' visibility='default'/>
+        <var-decl name='firmware_version' type-id='type-id-548' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-541' size-in-bits='64' id='type-id-629'/>
-    <pointer-type-def type-id='type-id-630' size-in-bits='64' id='type-id-631'/>
-    <typedef-decl name='CK_C_GetSlotInfo' type-id='type-id-631' id='type-id-551'/>
-    <class-decl name='ck_token_info' size-in-bits='1664' is-struct='yes' visibility='default' id='type-id-540'>
+    <pointer-type-def type-id='type-id-544' size-in-bits='64' id='type-id-632'/>
+    <pointer-type-def type-id='type-id-633' size-in-bits='64' id='type-id-634'/>
+    <typedef-decl name='CK_C_GetSlotInfo' type-id='type-id-634' id='type-id-554'/>
+    <class-decl name='ck_token_info' size-in-bits='1664' is-struct='yes' visibility='default' id='type-id-543'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='label' type-id='type-id-273' visibility='default'/>
+        <var-decl name='label' type-id='type-id-276' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='manufacturer_id' type-id='type-id-273' visibility='default'/>
+        <var-decl name='manufacturer_id' type-id='type-id-276' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='model' type-id='type-id-632' visibility='default'/>
+        <var-decl name='model' type-id='type-id-635' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='serial_number' type-id='type-id-632' visibility='default'/>
+        <var-decl name='serial_number' type-id='type-id-635' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='flags' type-id='type-id-618' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-621' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <var-decl name='max_session_count' type-id='type-id-38' visibility='default'/>
@@ -7528,28 +7563,28 @@
         <var-decl name='free_private_memory' type-id='type-id-38' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='hardware_version' type-id='type-id-545' visibility='default'/>
+        <var-decl name='hardware_version' type-id='type-id-548' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1488'>
-        <var-decl name='firmware_version' type-id='type-id-545' visibility='default'/>
+        <var-decl name='firmware_version' type-id='type-id-548' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='utc_time' type-id='type-id-632' visibility='default'/>
+        <var-decl name='utc_time' type-id='type-id-635' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='128' id='type-id-632'>
+    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='128' id='type-id-635'>
       <subrange length='16' type-id='type-id-38' id='type-id-93'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-540' size-in-bits='64' id='type-id-633'/>
-    <pointer-type-def type-id='type-id-634' size-in-bits='64' id='type-id-635'/>
-    <typedef-decl name='CK_C_GetTokenInfo' type-id='type-id-635' id='type-id-552'/>
-    <typedef-decl name='ck_mechanism_type_t' type-id='type-id-38' id='type-id-636'/>
-    <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-637'/>
-    <pointer-type-def type-id='type-id-638' size-in-bits='64' id='type-id-639'/>
-    <typedef-decl name='CK_C_GetMechanismList' type-id='type-id-639' id='type-id-553'/>
-    <class-decl name='ck_mechanism_info' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-640'>
+    <pointer-type-def type-id='type-id-543' size-in-bits='64' id='type-id-636'/>
+    <pointer-type-def type-id='type-id-637' size-in-bits='64' id='type-id-638'/>
+    <typedef-decl name='CK_C_GetTokenInfo' type-id='type-id-638' id='type-id-555'/>
+    <typedef-decl name='ck_mechanism_type_t' type-id='type-id-38' id='type-id-639'/>
+    <pointer-type-def type-id='type-id-639' size-in-bits='64' id='type-id-640'/>
+    <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-642'/>
+    <typedef-decl name='CK_C_GetMechanismList' type-id='type-id-642' id='type-id-556'/>
+    <class-decl name='ck_mechanism_info' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-643'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='min_key_size' type-id='type-id-38' visibility='default'/>
       </data-member>
@@ -7557,59 +7592,59 @@
         <var-decl name='max_key_size' type-id='type-id-38' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='flags' type-id='type-id-618' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-621' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-640' size-in-bits='64' id='type-id-641'/>
-    <pointer-type-def type-id='type-id-642' size-in-bits='64' id='type-id-643'/>
-    <typedef-decl name='CK_C_GetMechanismInfo' type-id='type-id-643' id='type-id-554'/>
-    <pointer-type-def type-id='type-id-644' size-in-bits='64' id='type-id-645'/>
-    <typedef-decl name='CK_C_InitToken' type-id='type-id-645' id='type-id-555'/>
-    <typedef-decl name='ck_session_handle_t' type-id='type-id-38' id='type-id-542'/>
-    <pointer-type-def type-id='type-id-646' size-in-bits='64' id='type-id-647'/>
-    <typedef-decl name='CK_C_InitPIN' type-id='type-id-647' id='type-id-556'/>
-    <pointer-type-def type-id='type-id-648' size-in-bits='64' id='type-id-649'/>
-    <typedef-decl name='CK_C_SetPIN' type-id='type-id-649' id='type-id-557'/>
-    <typedef-decl name='ck_notification_t' type-id='type-id-38' id='type-id-650'/>
+    <pointer-type-def type-id='type-id-643' size-in-bits='64' id='type-id-644'/>
+    <pointer-type-def type-id='type-id-645' size-in-bits='64' id='type-id-646'/>
+    <typedef-decl name='CK_C_GetMechanismInfo' type-id='type-id-646' id='type-id-557'/>
+    <pointer-type-def type-id='type-id-647' size-in-bits='64' id='type-id-648'/>
+    <typedef-decl name='CK_C_InitToken' type-id='type-id-648' id='type-id-558'/>
+    <typedef-decl name='ck_session_handle_t' type-id='type-id-38' id='type-id-545'/>
+    <pointer-type-def type-id='type-id-649' size-in-bits='64' id='type-id-650'/>
+    <typedef-decl name='CK_C_InitPIN' type-id='type-id-650' id='type-id-559'/>
     <pointer-type-def type-id='type-id-651' size-in-bits='64' id='type-id-652'/>
-    <typedef-decl name='ck_notify_t' type-id='type-id-652' id='type-id-653'/>
-    <pointer-type-def type-id='type-id-542' size-in-bits='64' id='type-id-654'/>
-    <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-656'/>
-    <typedef-decl name='CK_C_OpenSession' type-id='type-id-656' id='type-id-558'/>
-    <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-658'/>
-    <typedef-decl name='CK_C_CloseSession' type-id='type-id-658' id='type-id-559'/>
-    <pointer-type-def type-id='type-id-659' size-in-bits='64' id='type-id-660'/>
-    <typedef-decl name='CK_C_CloseAllSessions' type-id='type-id-660' id='type-id-560'/>
-    <class-decl name='ck_session_info' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-661'>
+    <typedef-decl name='CK_C_SetPIN' type-id='type-id-652' id='type-id-560'/>
+    <typedef-decl name='ck_notification_t' type-id='type-id-38' id='type-id-653'/>
+    <pointer-type-def type-id='type-id-654' size-in-bits='64' id='type-id-655'/>
+    <typedef-decl name='ck_notify_t' type-id='type-id-655' id='type-id-656'/>
+    <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-657'/>
+    <pointer-type-def type-id='type-id-658' size-in-bits='64' id='type-id-659'/>
+    <typedef-decl name='CK_C_OpenSession' type-id='type-id-659' id='type-id-561'/>
+    <pointer-type-def type-id='type-id-660' size-in-bits='64' id='type-id-661'/>
+    <typedef-decl name='CK_C_CloseSession' type-id='type-id-661' id='type-id-562'/>
+    <pointer-type-def type-id='type-id-662' size-in-bits='64' id='type-id-663'/>
+    <typedef-decl name='CK_C_CloseAllSessions' type-id='type-id-663' id='type-id-563'/>
+    <class-decl name='ck_session_info' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-664'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='slot_id' type-id='type-id-543' visibility='default'/>
+        <var-decl name='slot_id' type-id='type-id-546' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='state' type-id='type-id-662' visibility='default'/>
+        <var-decl name='state' type-id='type-id-665' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='flags' type-id='type-id-618' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-621' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='device_error' type-id='type-id-38' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='ck_state_t' type-id='type-id-38' id='type-id-662'/>
-    <pointer-type-def type-id='type-id-661' size-in-bits='64' id='type-id-663'/>
-    <pointer-type-def type-id='type-id-664' size-in-bits='64' id='type-id-665'/>
-    <typedef-decl name='CK_C_GetSessionInfo' type-id='type-id-665' id='type-id-561'/>
-    <pointer-type-def type-id='type-id-666' size-in-bits='64' id='type-id-667'/>
-    <typedef-decl name='CK_C_GetOperationState' type-id='type-id-667' id='type-id-562'/>
-    <typedef-decl name='ck_object_handle_t' type-id='type-id-38' id='type-id-537'/>
-    <pointer-type-def type-id='type-id-668' size-in-bits='64' id='type-id-669'/>
-    <typedef-decl name='CK_C_SetOperationState' type-id='type-id-669' id='type-id-563'/>
-    <typedef-decl name='ck_user_type_t' type-id='type-id-38' id='type-id-670'/>
+    <typedef-decl name='ck_state_t' type-id='type-id-38' id='type-id-665'/>
+    <pointer-type-def type-id='type-id-664' size-in-bits='64' id='type-id-666'/>
+    <pointer-type-def type-id='type-id-667' size-in-bits='64' id='type-id-668'/>
+    <typedef-decl name='CK_C_GetSessionInfo' type-id='type-id-668' id='type-id-564'/>
+    <pointer-type-def type-id='type-id-669' size-in-bits='64' id='type-id-670'/>
+    <typedef-decl name='CK_C_GetOperationState' type-id='type-id-670' id='type-id-565'/>
+    <typedef-decl name='ck_object_handle_t' type-id='type-id-38' id='type-id-540'/>
     <pointer-type-def type-id='type-id-671' size-in-bits='64' id='type-id-672'/>
-    <typedef-decl name='CK_C_Login' type-id='type-id-672' id='type-id-564'/>
-    <typedef-decl name='CK_C_Logout' type-id='type-id-658' id='type-id-565'/>
-    <class-decl name='ck_attribute' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-673'>
+    <typedef-decl name='CK_C_SetOperationState' type-id='type-id-672' id='type-id-566'/>
+    <typedef-decl name='ck_user_type_t' type-id='type-id-38' id='type-id-673'/>
+    <pointer-type-def type-id='type-id-674' size-in-bits='64' id='type-id-675'/>
+    <typedef-decl name='CK_C_Login' type-id='type-id-675' id='type-id-567'/>
+    <typedef-decl name='CK_C_Logout' type-id='type-id-661' id='type-id-568'/>
+    <class-decl name='ck_attribute' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-676'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-674' visibility='default'/>
+        <var-decl name='type' type-id='type-id-677' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='value' type-id='type-id-101' visibility='default'/>
@@ -7618,28 +7653,28 @@
         <var-decl name='value_len' type-id='type-id-38' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='ck_attribute_type_t' type-id='type-id-38' id='type-id-674'/>
-    <pointer-type-def type-id='type-id-673' size-in-bits='64' id='type-id-675'/>
-    <pointer-type-def type-id='type-id-537' size-in-bits='64' id='type-id-676'/>
-    <pointer-type-def type-id='type-id-677' size-in-bits='64' id='type-id-678'/>
-    <typedef-decl name='CK_C_CreateObject' type-id='type-id-678' id='type-id-566'/>
-    <pointer-type-def type-id='type-id-679' size-in-bits='64' id='type-id-680'/>
-    <typedef-decl name='CK_C_CopyObject' type-id='type-id-680' id='type-id-567'/>
-    <pointer-type-def type-id='type-id-681' size-in-bits='64' id='type-id-682'/>
-    <typedef-decl name='CK_C_DestroyObject' type-id='type-id-682' id='type-id-568'/>
-    <pointer-type-def type-id='type-id-683' size-in-bits='64' id='type-id-684'/>
-    <typedef-decl name='CK_C_GetObjectSize' type-id='type-id-684' id='type-id-569'/>
-    <pointer-type-def type-id='type-id-685' size-in-bits='64' id='type-id-686'/>
-    <typedef-decl name='CK_C_GetAttributeValue' type-id='type-id-686' id='type-id-570'/>
-    <typedef-decl name='CK_C_SetAttributeValue' type-id='type-id-686' id='type-id-571'/>
-    <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-688'/>
-    <typedef-decl name='CK_C_FindObjectsInit' type-id='type-id-688' id='type-id-572'/>
-    <pointer-type-def type-id='type-id-689' size-in-bits='64' id='type-id-690'/>
-    <typedef-decl name='CK_C_FindObjects' type-id='type-id-690' id='type-id-573'/>
-    <typedef-decl name='CK_C_FindObjectsFinal' type-id='type-id-658' id='type-id-574'/>
-    <class-decl name='ck_mechanism' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-691'>
+    <typedef-decl name='ck_attribute_type_t' type-id='type-id-38' id='type-id-677'/>
+    <pointer-type-def type-id='type-id-676' size-in-bits='64' id='type-id-678'/>
+    <pointer-type-def type-id='type-id-540' size-in-bits='64' id='type-id-679'/>
+    <pointer-type-def type-id='type-id-680' size-in-bits='64' id='type-id-681'/>
+    <typedef-decl name='CK_C_CreateObject' type-id='type-id-681' id='type-id-569'/>
+    <pointer-type-def type-id='type-id-682' size-in-bits='64' id='type-id-683'/>
+    <typedef-decl name='CK_C_CopyObject' type-id='type-id-683' id='type-id-570'/>
+    <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-685'/>
+    <typedef-decl name='CK_C_DestroyObject' type-id='type-id-685' id='type-id-571'/>
+    <pointer-type-def type-id='type-id-686' size-in-bits='64' id='type-id-687'/>
+    <typedef-decl name='CK_C_GetObjectSize' type-id='type-id-687' id='type-id-572'/>
+    <pointer-type-def type-id='type-id-688' size-in-bits='64' id='type-id-689'/>
+    <typedef-decl name='CK_C_GetAttributeValue' type-id='type-id-689' id='type-id-573'/>
+    <typedef-decl name='CK_C_SetAttributeValue' type-id='type-id-689' id='type-id-574'/>
+    <pointer-type-def type-id='type-id-690' size-in-bits='64' id='type-id-691'/>
+    <typedef-decl name='CK_C_FindObjectsInit' type-id='type-id-691' id='type-id-575'/>
+    <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-693'/>
+    <typedef-decl name='CK_C_FindObjects' type-id='type-id-693' id='type-id-576'/>
+    <typedef-decl name='CK_C_FindObjectsFinal' type-id='type-id-661' id='type-id-577'/>
+    <class-decl name='ck_mechanism' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-694'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='mechanism' type-id='type-id-636' visibility='default'/>
+        <var-decl name='mechanism' type-id='type-id-639' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='parameter' type-id='type-id-101' visibility='default'/>
@@ -7648,67 +7683,67 @@
         <var-decl name='parameter_len' type-id='type-id-38' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-691' size-in-bits='64' id='type-id-692'/>
-    <pointer-type-def type-id='type-id-693' size-in-bits='64' id='type-id-694'/>
-    <typedef-decl name='CK_C_EncryptInit' type-id='type-id-694' id='type-id-575'/>
-    <pointer-type-def type-id='type-id-695' size-in-bits='64' id='type-id-696'/>
-    <typedef-decl name='CK_C_Encrypt' type-id='type-id-696' id='type-id-576'/>
-    <typedef-decl name='CK_C_EncryptUpdate' type-id='type-id-696' id='type-id-577'/>
-    <typedef-decl name='CK_C_EncryptFinal' type-id='type-id-667' id='type-id-578'/>
-    <typedef-decl name='CK_C_DecryptInit' type-id='type-id-694' id='type-id-579'/>
-    <typedef-decl name='CK_C_Decrypt' type-id='type-id-696' id='type-id-580'/>
-    <typedef-decl name='CK_C_DecryptUpdate' type-id='type-id-696' id='type-id-581'/>
-    <typedef-decl name='CK_C_DecryptFinal' type-id='type-id-667' id='type-id-582'/>
-    <pointer-type-def type-id='type-id-697' size-in-bits='64' id='type-id-698'/>
-    <typedef-decl name='CK_C_DigestInit' type-id='type-id-698' id='type-id-583'/>
-    <typedef-decl name='CK_C_Digest' type-id='type-id-696' id='type-id-584'/>
-    <typedef-decl name='CK_C_DigestUpdate' type-id='type-id-647' id='type-id-585'/>
-    <typedef-decl name='CK_C_DigestKey' type-id='type-id-682' id='type-id-586'/>
-    <typedef-decl name='CK_C_DigestFinal' type-id='type-id-667' id='type-id-587'/>
-    <typedef-decl name='CK_C_SignInit' type-id='type-id-694' id='type-id-588'/>
-    <typedef-decl name='CK_C_Sign' type-id='type-id-696' id='type-id-589'/>
-    <typedef-decl name='CK_C_SignUpdate' type-id='type-id-647' id='type-id-590'/>
-    <typedef-decl name='CK_C_SignFinal' type-id='type-id-667' id='type-id-591'/>
-    <typedef-decl name='CK_C_SignRecoverInit' type-id='type-id-694' id='type-id-592'/>
-    <typedef-decl name='CK_C_SignRecover' type-id='type-id-696' id='type-id-593'/>
-    <typedef-decl name='CK_C_VerifyInit' type-id='type-id-694' id='type-id-594'/>
-    <typedef-decl name='CK_C_Verify' type-id='type-id-649' id='type-id-595'/>
-    <typedef-decl name='CK_C_VerifyUpdate' type-id='type-id-647' id='type-id-596'/>
-    <typedef-decl name='CK_C_VerifyFinal' type-id='type-id-647' id='type-id-597'/>
-    <typedef-decl name='CK_C_VerifyRecoverInit' type-id='type-id-694' id='type-id-598'/>
-    <typedef-decl name='CK_C_VerifyRecover' type-id='type-id-696' id='type-id-599'/>
-    <typedef-decl name='CK_C_DigestEncryptUpdate' type-id='type-id-696' id='type-id-600'/>
-    <typedef-decl name='CK_C_DecryptDigestUpdate' type-id='type-id-696' id='type-id-601'/>
-    <typedef-decl name='CK_C_SignEncryptUpdate' type-id='type-id-696' id='type-id-602'/>
-    <typedef-decl name='CK_C_DecryptVerifyUpdate' type-id='type-id-696' id='type-id-603'/>
-    <pointer-type-def type-id='type-id-699' size-in-bits='64' id='type-id-700'/>
-    <typedef-decl name='CK_C_GenerateKey' type-id='type-id-700' id='type-id-604'/>
-    <pointer-type-def type-id='type-id-701' size-in-bits='64' id='type-id-702'/>
-    <typedef-decl name='CK_C_GenerateKeyPair' type-id='type-id-702' id='type-id-605'/>
-    <pointer-type-def type-id='type-id-703' size-in-bits='64' id='type-id-704'/>
-    <typedef-decl name='CK_C_WrapKey' type-id='type-id-704' id='type-id-606'/>
-    <pointer-type-def type-id='type-id-705' size-in-bits='64' id='type-id-706'/>
-    <typedef-decl name='CK_C_UnwrapKey' type-id='type-id-706' id='type-id-607'/>
-    <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-708'/>
-    <typedef-decl name='CK_C_DeriveKey' type-id='type-id-708' id='type-id-608'/>
-    <typedef-decl name='CK_C_SeedRandom' type-id='type-id-647' id='type-id-609'/>
-    <typedef-decl name='CK_C_GenerateRandom' type-id='type-id-647' id='type-id-610'/>
-    <typedef-decl name='CK_C_GetFunctionStatus' type-id='type-id-658' id='type-id-611'/>
-    <typedef-decl name='CK_C_CancelFunction' type-id='type-id-658' id='type-id-612'/>
-    <pointer-type-def type-id='type-id-709' size-in-bits='64' id='type-id-710'/>
-    <typedef-decl name='CK_C_WaitForSlotEvent' type-id='type-id-710' id='type-id-613'/>
+    <pointer-type-def type-id='type-id-694' size-in-bits='64' id='type-id-695'/>
+    <pointer-type-def type-id='type-id-696' size-in-bits='64' id='type-id-697'/>
+    <typedef-decl name='CK_C_EncryptInit' type-id='type-id-697' id='type-id-578'/>
+    <pointer-type-def type-id='type-id-698' size-in-bits='64' id='type-id-699'/>
+    <typedef-decl name='CK_C_Encrypt' type-id='type-id-699' id='type-id-579'/>
+    <typedef-decl name='CK_C_EncryptUpdate' type-id='type-id-699' id='type-id-580'/>
+    <typedef-decl name='CK_C_EncryptFinal' type-id='type-id-670' id='type-id-581'/>
+    <typedef-decl name='CK_C_DecryptInit' type-id='type-id-697' id='type-id-582'/>
+    <typedef-decl name='CK_C_Decrypt' type-id='type-id-699' id='type-id-583'/>
+    <typedef-decl name='CK_C_DecryptUpdate' type-id='type-id-699' id='type-id-584'/>
+    <typedef-decl name='CK_C_DecryptFinal' type-id='type-id-670' id='type-id-585'/>
+    <pointer-type-def type-id='type-id-700' size-in-bits='64' id='type-id-701'/>
+    <typedef-decl name='CK_C_DigestInit' type-id='type-id-701' id='type-id-586'/>
+    <typedef-decl name='CK_C_Digest' type-id='type-id-699' id='type-id-587'/>
+    <typedef-decl name='CK_C_DigestUpdate' type-id='type-id-650' id='type-id-588'/>
+    <typedef-decl name='CK_C_DigestKey' type-id='type-id-685' id='type-id-589'/>
+    <typedef-decl name='CK_C_DigestFinal' type-id='type-id-670' id='type-id-590'/>
+    <typedef-decl name='CK_C_SignInit' type-id='type-id-697' id='type-id-591'/>
+    <typedef-decl name='CK_C_Sign' type-id='type-id-699' id='type-id-592'/>
+    <typedef-decl name='CK_C_SignUpdate' type-id='type-id-650' id='type-id-593'/>
+    <typedef-decl name='CK_C_SignFinal' type-id='type-id-670' id='type-id-594'/>
+    <typedef-decl name='CK_C_SignRecoverInit' type-id='type-id-697' id='type-id-595'/>
+    <typedef-decl name='CK_C_SignRecover' type-id='type-id-699' id='type-id-596'/>
+    <typedef-decl name='CK_C_VerifyInit' type-id='type-id-697' id='type-id-597'/>
+    <typedef-decl name='CK_C_Verify' type-id='type-id-652' id='type-id-598'/>
+    <typedef-decl name='CK_C_VerifyUpdate' type-id='type-id-650' id='type-id-599'/>
+    <typedef-decl name='CK_C_VerifyFinal' type-id='type-id-650' id='type-id-600'/>
+    <typedef-decl name='CK_C_VerifyRecoverInit' type-id='type-id-697' id='type-id-601'/>
+    <typedef-decl name='CK_C_VerifyRecover' type-id='type-id-699' id='type-id-602'/>
+    <typedef-decl name='CK_C_DigestEncryptUpdate' type-id='type-id-699' id='type-id-603'/>
+    <typedef-decl name='CK_C_DecryptDigestUpdate' type-id='type-id-699' id='type-id-604'/>
+    <typedef-decl name='CK_C_SignEncryptUpdate' type-id='type-id-699' id='type-id-605'/>
+    <typedef-decl name='CK_C_DecryptVerifyUpdate' type-id='type-id-699' id='type-id-606'/>
+    <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-703'/>
+    <typedef-decl name='CK_C_GenerateKey' type-id='type-id-703' id='type-id-607'/>
+    <pointer-type-def type-id='type-id-704' size-in-bits='64' id='type-id-705'/>
+    <typedef-decl name='CK_C_GenerateKeyPair' type-id='type-id-705' id='type-id-608'/>
+    <pointer-type-def type-id='type-id-706' size-in-bits='64' id='type-id-707'/>
+    <typedef-decl name='CK_C_WrapKey' type-id='type-id-707' id='type-id-609'/>
+    <pointer-type-def type-id='type-id-708' size-in-bits='64' id='type-id-709'/>
+    <typedef-decl name='CK_C_UnwrapKey' type-id='type-id-709' id='type-id-610'/>
+    <pointer-type-def type-id='type-id-710' size-in-bits='64' id='type-id-711'/>
+    <typedef-decl name='CK_C_DeriveKey' type-id='type-id-711' id='type-id-611'/>
+    <typedef-decl name='CK_C_SeedRandom' type-id='type-id-650' id='type-id-612'/>
+    <typedef-decl name='CK_C_GenerateRandom' type-id='type-id-650' id='type-id-613'/>
+    <typedef-decl name='CK_C_GetFunctionStatus' type-id='type-id-661' id='type-id-614'/>
+    <typedef-decl name='CK_C_CancelFunction' type-id='type-id-661' id='type-id-615'/>
+    <pointer-type-def type-id='type-id-712' size-in-bits='64' id='type-id-713'/>
+    <typedef-decl name='CK_C_WaitForSlotEvent' type-id='type-id-713' id='type-id-616'/>
     <function-decl name='gnutls_privkey_import_gost_raw' mangled-name='gnutls_privkey_import_gost_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_gost_raw@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-404' name='key'/>
       <parameter type-id='type-id-59' name='curve'/>
-      <parameter type-id='type-id-211' name='digest'/>
-      <parameter type-id='type-id-315' name='paramset'/>
+      <parameter type-id='type-id-212' name='digest'/>
+      <parameter type-id='type-id-318' name='paramset'/>
       <parameter type-id='type-id-57' name='x'/>
       <parameter type-id='type-id-57' name='y'/>
       <parameter type-id='type-id-57' name='k'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_ecc_raw' mangled-name='gnutls_privkey_import_ecc_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_ecc_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-404' name='key'/>
       <parameter type-id='type-id-59' name='curve'/>
       <parameter type-id='type-id-57' name='x'/>
       <parameter type-id='type-id-57' name='y'/>
@@ -7716,7 +7751,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_dsa_raw' mangled-name='gnutls_privkey_import_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-404' name='key'/>
       <parameter type-id='type-id-57' name='p'/>
       <parameter type-id='type-id-57' name='q'/>
       <parameter type-id='type-id-57' name='g'/>
@@ -7725,7 +7760,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_rsa_raw' mangled-name='gnutls_privkey_import_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-404' name='key'/>
       <parameter type-id='type-id-57' name='m'/>
       <parameter type-id='type-id-57' name='e'/>
       <parameter type-id='type-id-57' name='d'/>
@@ -7736,77 +7771,77 @@
       <parameter type-id='type-id-57' name='e2'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-711'/>
-    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-712'/>
+    <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-714'/>
+    <pointer-type-def type-id='type-id-318' size-in-bits='64' id='type-id-715'/>
     <function-decl name='gnutls_privkey_export_gost_raw2' mangled-name='gnutls_privkey_export_gost_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_gost_raw2@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-431' name='digest'/>
-      <parameter type-id='type-id-712' name='paramset'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='k'/>
+      <parameter type-id='type-id-404' name='key'/>
+      <parameter type-id='type-id-714' name='curve'/>
+      <parameter type-id='type-id-434' name='digest'/>
+      <parameter type-id='type-id-715' name='paramset'/>
+      <parameter type-id='type-id-278' name='x'/>
+      <parameter type-id='type-id-278' name='y'/>
+      <parameter type-id='type-id-278' name='k'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_ecc_raw' mangled-name='gnutls_privkey_export_ecc_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_ecc_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='k'/>
+      <parameter type-id='type-id-404' name='key'/>
+      <parameter type-id='type-id-714' name='curve'/>
+      <parameter type-id='type-id-278' name='x'/>
+      <parameter type-id='type-id-278' name='y'/>
+      <parameter type-id='type-id-278' name='k'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_dsa_raw' mangled-name='gnutls_privkey_export_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-404' name='key'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='g'/>
+      <parameter type-id='type-id-278' name='y'/>
+      <parameter type-id='type-id-278' name='x'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_rsa_raw' mangled-name='gnutls_privkey_export_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
-      <parameter type-id='type-id-275' name='d'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='u'/>
-      <parameter type-id='type-id-275' name='e1'/>
-      <parameter type-id='type-id-275' name='e2'/>
+      <parameter type-id='type-id-404' name='key'/>
+      <parameter type-id='type-id-278' name='m'/>
+      <parameter type-id='type-id-278' name='e'/>
+      <parameter type-id='type-id-278' name='d'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='u'/>
+      <parameter type-id='type-id-278' name='e1'/>
+      <parameter type-id='type-id-278' name='e2'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_rsa_raw2' mangled-name='gnutls_privkey_export_rsa_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_rsa_raw2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
-      <parameter type-id='type-id-275' name='d'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='u'/>
-      <parameter type-id='type-id-275' name='e1'/>
-      <parameter type-id='type-id-275' name='e2'/>
+      <parameter type-id='type-id-404' name='key'/>
+      <parameter type-id='type-id-278' name='m'/>
+      <parameter type-id='type-id-278' name='e'/>
+      <parameter type-id='type-id-278' name='d'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='u'/>
+      <parameter type-id='type-id-278' name='e1'/>
+      <parameter type-id='type-id-278' name='e2'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_dsa_raw2' mangled-name='gnutls_privkey_export_dsa_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_dsa_raw2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-404' name='key'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='g'/>
+      <parameter type-id='type-id-278' name='y'/>
+      <parameter type-id='type-id-278' name='x'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_ecc_raw2' mangled-name='gnutls_privkey_export_ecc_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_ecc_raw2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='k'/>
+      <parameter type-id='type-id-404' name='key'/>
+      <parameter type-id='type-id-714' name='curve'/>
+      <parameter type-id='type-id-278' name='x'/>
+      <parameter type-id='type-id-278' name='y'/>
+      <parameter type-id='type-id-278' name='k'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -7843,241 +7878,241 @@
     <function-decl name='_gnutls_params_get_ecc_raw' mangled-name='_gnutls_params_get_ecc_raw' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-type size-in-bits='64' id='type-id-626'>
+      <parameter type-id='type-id-625'/>
+      <return type-id='type-id-617'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-623'>
       <parameter type-id='type-id-622'/>
-      <return type-id='type-id-614'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-620'>
-      <parameter type-id='type-id-619'/>
-      <return type-id='type-id-614'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-709'>
-      <parameter type-id='type-id-618'/>
-      <parameter type-id='type-id-625'/>
+    <function-type size-in-bits='64' id='type-id-712'>
+      <parameter type-id='type-id-621'/>
+      <parameter type-id='type-id-628'/>
       <parameter type-id='type-id-101'/>
-      <return type-id='type-id-614'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-657'>
-      <parameter type-id='type-id-542'/>
-      <return type-id='type-id-614'/>
+    <function-type size-in-bits='64' id='type-id-660'>
+      <parameter type-id='type-id-545'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-687'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-675'/>
+    <function-type size-in-bits='64' id='type-id-690'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-678'/>
       <parameter type-id='type-id-38'/>
-      <return type-id='type-id-614'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-677'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-675'/>
+    <function-type size-in-bits='64' id='type-id-680'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-678'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-676'/>
-      <return type-id='type-id-614'/>
+      <parameter type-id='type-id-679'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-697'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-692'/>
-      <return type-id='type-id-614'/>
+    <function-type size-in-bits='64' id='type-id-700'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-695'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-701'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-692'/>
-      <parameter type-id='type-id-675'/>
+    <function-type size-in-bits='64' id='type-id-704'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-695'/>
+      <parameter type-id='type-id-678'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-675'/>
+      <parameter type-id='type-id-678'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-676'/>
-      <parameter type-id='type-id-676'/>
-      <return type-id='type-id-614'/>
+      <parameter type-id='type-id-679'/>
+      <parameter type-id='type-id-679'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-699'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-692'/>
-      <parameter type-id='type-id-675'/>
+    <function-type size-in-bits='64' id='type-id-702'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-695'/>
+      <parameter type-id='type-id-678'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-676'/>
-      <return type-id='type-id-614'/>
+      <parameter type-id='type-id-679'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-693'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-692'/>
-      <parameter type-id='type-id-537'/>
-      <return type-id='type-id-614'/>
+    <function-type size-in-bits='64' id='type-id-696'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-695'/>
+      <parameter type-id='type-id-540'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-707'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-692'/>
-      <parameter type-id='type-id-537'/>
-      <parameter type-id='type-id-675'/>
+    <function-type size-in-bits='64' id='type-id-710'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-695'/>
+      <parameter type-id='type-id-540'/>
+      <parameter type-id='type-id-678'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-676'/>
-      <return type-id='type-id-614'/>
+      <parameter type-id='type-id-679'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-703'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-692'/>
-      <parameter type-id='type-id-537'/>
-      <parameter type-id='type-id-537'/>
+    <function-type size-in-bits='64' id='type-id-706'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-695'/>
+      <parameter type-id='type-id-540'/>
+      <parameter type-id='type-id-540'/>
       <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-626'/>
-      <return type-id='type-id-614'/>
+      <parameter type-id='type-id-629'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-705'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-692'/>
-      <parameter type-id='type-id-537'/>
+    <function-type size-in-bits='64' id='type-id-708'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-695'/>
+      <parameter type-id='type-id-540'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-675'/>
+      <parameter type-id='type-id-678'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-676'/>
-      <return type-id='type-id-614'/>
+      <parameter type-id='type-id-679'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-689'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-676'/>
+    <function-type size-in-bits='64' id='type-id-692'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-679'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-626'/>
-      <return type-id='type-id-614'/>
+      <parameter type-id='type-id-629'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-664'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-663'/>
-      <return type-id='type-id-614'/>
+    <function-type size-in-bits='64' id='type-id-667'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-666'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-651'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-650'/>
+    <function-type size-in-bits='64' id='type-id-654'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-653'/>
       <parameter type-id='type-id-101'/>
-      <return type-id='type-id-614'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-681'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-537'/>
-      <return type-id='type-id-614'/>
+    <function-type size-in-bits='64' id='type-id-684'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-540'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-685'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-537'/>
-      <parameter type-id='type-id-675'/>
+    <function-type size-in-bits='64' id='type-id-688'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-540'/>
+      <parameter type-id='type-id-678'/>
       <parameter type-id='type-id-38'/>
-      <return type-id='type-id-614'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-679'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-537'/>
-      <parameter type-id='type-id-675'/>
+    <function-type size-in-bits='64' id='type-id-682'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-540'/>
+      <parameter type-id='type-id-678'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-676'/>
-      <return type-id='type-id-614'/>
+      <parameter type-id='type-id-679'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-683'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-537'/>
-      <parameter type-id='type-id-626'/>
-      <return type-id='type-id-614'/>
+    <function-type size-in-bits='64' id='type-id-686'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-540'/>
+      <parameter type-id='type-id-629'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-671'>
-      <parameter type-id='type-id-542'/>
-      <parameter type-id='type-id-670'/>
+    <function-type size-in-bits='64' id='type-id-674'>
+      <parameter type-id='type-id-545'/>
+      <parameter type-id='type-id-673'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-38'/>
-      <return type-id='type-id-614'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-646'>
-      <parameter type-id='type-id-542'/>
+    <function-type size-in-bits='64' id='type-id-649'>
+      <parameter type-id='type-id-545'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-38'/>
-      <return type-id='type-id-614'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-666'>
-      <parameter type-id='type-id-542'/>
+    <function-type size-in-bits='64' id='type-id-669'>
+      <parameter type-id='type-id-545'/>
       <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-626'/>
-      <return type-id='type-id-614'/>
+      <parameter type-id='type-id-629'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-668'>
-      <parameter type-id='type-id-542'/>
+    <function-type size-in-bits='64' id='type-id-671'>
+      <parameter type-id='type-id-545'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-537'/>
-      <parameter type-id='type-id-537'/>
-      <return type-id='type-id-614'/>
+      <parameter type-id='type-id-540'/>
+      <parameter type-id='type-id-540'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-648'>
-      <parameter type-id='type-id-542'/>
+    <function-type size-in-bits='64' id='type-id-651'>
+      <parameter type-id='type-id-545'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-38'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-38'/>
-      <return type-id='type-id-614'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-695'>
-      <parameter type-id='type-id-542'/>
+    <function-type size-in-bits='64' id='type-id-698'>
+      <parameter type-id='type-id-545'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-38'/>
       <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-626'/>
-      <return type-id='type-id-614'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-659'>
-      <parameter type-id='type-id-543'/>
-      <return type-id='type-id-614'/>
+      <parameter type-id='type-id-629'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-638'>
-      <parameter type-id='type-id-543'/>
-      <parameter type-id='type-id-637'/>
-      <parameter type-id='type-id-626'/>
-      <return type-id='type-id-614'/>
+    <function-type size-in-bits='64' id='type-id-662'>
+      <parameter type-id='type-id-546'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-630'>
-      <parameter type-id='type-id-543'/>
+    <function-type size-in-bits='64' id='type-id-641'>
+      <parameter type-id='type-id-546'/>
+      <parameter type-id='type-id-640'/>
       <parameter type-id='type-id-629'/>
-      <return type-id='type-id-614'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-634'>
-      <parameter type-id='type-id-543'/>
-      <parameter type-id='type-id-633'/>
-      <return type-id='type-id-614'/>
+    <function-type size-in-bits='64' id='type-id-633'>
+      <parameter type-id='type-id-546'/>
+      <parameter type-id='type-id-632'/>
+      <return type-id='type-id-617'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-637'>
+      <parameter type-id='type-id-546'/>
+      <parameter type-id='type-id-636'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-655'>
-      <parameter type-id='type-id-543'/>
-      <parameter type-id='type-id-618'/>
+    <function-type size-in-bits='64' id='type-id-658'>
+      <parameter type-id='type-id-546'/>
+      <parameter type-id='type-id-621'/>
       <parameter type-id='type-id-101'/>
-      <parameter type-id='type-id-653'/>
-      <parameter type-id='type-id-654'/>
-      <return type-id='type-id-614'/>
+      <parameter type-id='type-id-656'/>
+      <parameter type-id='type-id-657'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-642'>
-      <parameter type-id='type-id-543'/>
-      <parameter type-id='type-id-636'/>
-      <parameter type-id='type-id-641'/>
-      <return type-id='type-id-614'/>
+    <function-type size-in-bits='64' id='type-id-645'>
+      <parameter type-id='type-id-546'/>
+      <parameter type-id='type-id-639'/>
+      <parameter type-id='type-id-644'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-644'>
-      <parameter type-id='type-id-543'/>
+    <function-type size-in-bits='64' id='type-id-647'>
+      <parameter type-id='type-id-546'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-38'/>
       <parameter type-id='type-id-64'/>
-      <return type-id='type-id-614'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-627'>
+    <function-type size-in-bits='64' id='type-id-630'>
       <parameter type-id='type-id-35'/>
-      <parameter type-id='type-id-625'/>
-      <parameter type-id='type-id-626'/>
-      <return type-id='type-id-614'/>
+      <parameter type-id='type-id-628'/>
+      <parameter type-id='type-id-629'/>
+      <return type-id='type-id-617'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-615'>
+    <function-type size-in-bits='64' id='type-id-618'>
       <parameter type-id='type-id-101'/>
-      <return type-id='type-id-614'/>
+      <return type-id='type-id-617'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='system/certs.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_x509_trust_list_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-713'/>
-    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-714'/>
-    <typedef-decl name='gnutls_x509_trust_list_t' type-id='type-id-714' id='type-id-715'/>
+  <abi-instr version='1.0' address-size='64' path='system/certs.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_x509_trust_list_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-716'/>
+    <pointer-type-def type-id='type-id-716' size-in-bits='64' id='type-id-717'/>
+    <typedef-decl name='gnutls_x509_trust_list_t' type-id='type-id-717' id='type-id-718'/>
     <function-decl name='gnutls_x509_trust_list_add_system_trust' mangled-name='gnutls_x509_trust_list_add_system_trust' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_add_system_trust@@GNUTLS_3_4'>
-      <parameter type-id='type-id-715' name='list'/>
+      <parameter type-id='type-id-718' name='list'/>
       <parameter type-id='type-id-10' name='tl_flags'/>
       <parameter type-id='type-id-10' name='tl_vflags'/>
       <return type-id='type-id-22'/>
@@ -8092,7 +8127,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='system/threads.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system/threads.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='pthread_mutex_destroy' mangled-name='pthread_mutex_destroy' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -8103,7 +8138,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='system/fastopen.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system/fastopen.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_transport_set_pull_function' mangled-name='gnutls_transport_set_pull_function' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -8119,7 +8154,7 @@
     <function-decl name='abort' mangled-name='abort' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='recv' mangled-name='recv' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__recv_alias' mangled-name='recv' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_system_recv_timeout' mangled-name='gnutls_system_recv_timeout' visibility='default' binding='global' size-in-bits='64'>
@@ -8135,28 +8170,28 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='system/sockets.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system/sockets.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_system_recv_timeout' mangled-name='gnutls_system_recv_timeout' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_system_recv_timeout@@GNUTLS_3_4'>
       <parameter type-id='type-id-154' name='ptr'/>
       <parameter type-id='type-id-10' name='ms'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='poll' mangled-name='poll' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__poll_alias' mangled-name='poll' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='str-iconv.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='str-iconv.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls_utf8_to_ucs2' mangled-name='_gnutls_utf8_to_ucs2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_utf8_to_ucs2@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-99' name='size'/>
-      <parameter type-id='type-id-275' name='output'/>
+      <parameter type-id='type-id-278' name='output'/>
       <parameter type-id='type-id-10' name='be'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_ucs2_to_utf8' mangled-name='_gnutls_ucs2_to_utf8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_ucs2_to_utf8@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-99' name='size'/>
-      <parameter type-id='type-id-275' name='output'/>
+      <parameter type-id='type-id-278' name='output'/>
       <parameter type-id='type-id-10' name='be'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -8170,26 +8205,26 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='system.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <var-decl name='gnutls_time' type-id='type-id-517' visibility='default'/>
-    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-716'/>
-    <pointer-type-def type-id='type-id-717' size-in-bits='64' id='type-id-718'/>
-    <typedef-decl name='gnutls_gettime_func' type-id='type-id-718' id='type-id-719'/>
-    <var-decl name='gnutls_gettime' type-id='type-id-719' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='system.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <var-decl name='gnutls_time' type-id='type-id-520' visibility='default'/>
+    <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-719'/>
+    <pointer-type-def type-id='type-id-720' size-in-bits='64' id='type-id-721'/>
+    <typedef-decl name='gnutls_gettime_func' type-id='type-id-721' id='type-id-722'/>
+    <var-decl name='gnutls_gettime' type-id='type-id-722' visibility='default'/>
     <function-decl name='_gnutls_global_set_gettime_function' mangled-name='_gnutls_global_set_gettime_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_global_set_gettime_function@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-719' name='gettime_func'/>
+      <parameter type-id='type-id-722' name='gettime_func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='clock_gettime' mangled-name='clock_gettime' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-717'>
-      <parameter type-id='type-id-716'/>
+    <function-type size-in-bits='64' id='type-id-720'>
+      <parameter type-id='type-id-719'/>
       <return type-id='type-id-111'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='profiles.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <enum-decl name='gnutls_certificate_verification_profiles_t' id='type-id-720'>
+  <abi-instr version='1.0' address-size='64' path='profiles.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <enum-decl name='gnutls_certificate_verification_profiles_t' id='type-id-723'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PROFILE_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_PROFILE_VERY_WEAK' value='1'/>
@@ -8202,95 +8237,95 @@
       <enumerator name='GNUTLS_PROFILE_SUITEB128' value='32'/>
       <enumerator name='GNUTLS_PROFILE_SUITEB192' value='33'/>
     </enum-decl>
-    <typedef-decl name='gnutls_certificate_verification_profiles_t' type-id='type-id-720' id='type-id-721'/>
+    <typedef-decl name='gnutls_certificate_verification_profiles_t' type-id='type-id-723' id='type-id-724'/>
     <function-decl name='gnutls_certificate_verification_profile_get_name' mangled-name='gnutls_certificate_verification_profile_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_verification_profile_get_name@@GNUTLS_3_6_12'>
-      <parameter type-id='type-id-721' name='id'/>
+      <parameter type-id='type-id-724' name='id'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_certificate_verification_profile_get_id' mangled-name='gnutls_certificate_verification_profile_get_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_verification_profile_get_id@@GNUTLS_3_6_12'>
       <parameter type-id='type-id-27' name='name'/>
-      <return type-id='type-id-721'/>
+      <return type-id='type-id-724'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='inih/ini.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <function-decl name='strncpy' mangled-name='strncpy' visibility='default' binding='global' size-in-bits='64'>
+  <abi-instr version='1.0' address-size='64' path='inih/ini.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <function-decl name='__builtin_strncpy' mangled-name='strncpy' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__ctype_b_loc' mangled-name='__ctype_b_loc' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='str.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='str.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_hex_encode2' mangled-name='gnutls_hex_encode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hex_encode2@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-278' name='result'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_hex_encode' mangled-name='gnutls_hex_encode' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hex_encode@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-376' name='result'/>
-      <parameter type-id='type-id-422' name='result_size'/>
+      <parameter type-id='type-id-379' name='result'/>
+      <parameter type-id='type-id-425' name='result_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_hex_decode' mangled-name='gnutls_hex_decode' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hex_decode@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='hex_data'/>
       <parameter type-id='type-id-101' name='result'/>
-      <parameter type-id='type-id-422' name='result_size'/>
+      <parameter type-id='type-id-425' name='result_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_hex_decode2' mangled-name='gnutls_hex_decode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hex_decode2@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='hex_data'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-278' name='result'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_hex2bin' mangled-name='gnutls_hex2bin' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hex2bin@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='hex_data'/>
       <parameter type-id='type-id-99' name='hex_size'/>
       <parameter type-id='type-id-101' name='bin_data'/>
-      <parameter type-id='type-id-422' name='bin_size'/>
+      <parameter type-id='type-id-425' name='bin_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_bin2hex' mangled-name='_gnutls_bin2hex' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_bin2hex@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-101' name='_old'/>
       <parameter type-id='type-id-99' name='oldlen'/>
-      <parameter type-id='type-id-376' name='buffer'/>
+      <parameter type-id='type-id-379' name='buffer'/>
       <parameter type-id='type-id-99' name='buffer_size'/>
       <parameter type-id='type-id-27' name='separator'/>
-      <return type-id='type-id-376'/>
+      <return type-id='type-id-379'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_unescape' mangled-name='_gnutls_buffer_unescape' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_buffer_unescape@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-237' name='dest'/>
+      <parameter type-id='type-id-238' name='dest'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_to_datum' mangled-name='_gnutls_buffer_to_datum' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_buffer_to_datum@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-237' name='str'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-238' name='str'/>
+      <parameter type-id='type-id-278' name='data'/>
       <parameter type-id='type-id-10' name='is_str'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_pop_datum' mangled-name='_gnutls_buffer_pop_datum' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_buffer_pop_datum@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-237' name='str'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-238' name='str'/>
+      <parameter type-id='type-id-278' name='data'/>
       <parameter type-id='type-id-99' name='req_size'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_append_str' mangled-name='_gnutls_buffer_append_str' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_buffer_append_str@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-237' name='dest'/>
+      <parameter type-id='type-id-238' name='dest'/>
       <parameter type-id='type-id-27' name='src'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_buffer_append_data' mangled-name='gnutls_buffer_append_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_buffer_append_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-350' name='dest'/>
+      <parameter type-id='type-id-353' name='dest'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-99' name='data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_clear' mangled-name='_gnutls_buffer_clear' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_buffer_clear@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-237' name='str'/>
+      <parameter type-id='type-id-238' name='str'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_init' mangled-name='_gnutls_buffer_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_buffer_init@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-237' name='str'/>
+      <parameter type-id='type-id-238' name='str'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_mpi_dprint_lz' mangled-name='_gnutls_mpi_dprint_lz' visibility='default' binding='global' size-in-bits='64'>
@@ -8308,18 +8343,18 @@
     <function-decl name='strtoul' mangled-name='strtoul' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='sprintf' mangled-name='sprintf' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__builtin___sprintf_chk' mangled-name='__sprintf_chk' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='strncat' mangled-name='strncat' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__builtin_strncat' mangled-name='strncat' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='str-unicode.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='str-unicode.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_utf8_password_normalize' mangled-name='gnutls_utf8_password_normalize' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_utf8_password_normalize@@GNUTLS_3_4'>
-      <parameter type-id='type-id-346' name='password'/>
+      <parameter type-id='type-id-349' name='password'/>
       <parameter type-id='type-id-10' name='plen'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-278' name='out'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -8354,18 +8389,18 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='str-idna.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='str-idna.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_idna_reverse_map' mangled-name='gnutls_idna_reverse_map' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_idna_reverse_map@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='input'/>
       <parameter type-id='type-id-10' name='ilen'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-278' name='out'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_idna_map' mangled-name='gnutls_idna_map' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_idna_map@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='input'/>
       <parameter type-id='type-id-10' name='ilen'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-278' name='out'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -8385,169 +8420,169 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='state.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='state.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <var-decl name='_gnutls_disable_tls13' type-id='type-id-10' visibility='default'/>
     <function-decl name='gnutls_session_get_flags' mangled-name='gnutls_session_get_flags' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_flags@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_record_set_state' mangled-name='gnutls_record_set_state' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_set_state@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-10' name='read'/>
-      <parameter type-id='type-id-346' name='seq_number'/>
+      <parameter type-id='type-id-349' name='seq_number'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_record_get_state' mangled-name='gnutls_record_get_state' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_get_state@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-10' name='read'/>
-      <parameter type-id='type-id-275' name='mac_key'/>
-      <parameter type-id='type-id-275' name='IV'/>
-      <parameter type-id='type-id-275' name='cipher_key'/>
+      <parameter type-id='type-id-278' name='mac_key'/>
+      <parameter type-id='type-id-278' name='IV'/>
+      <parameter type-id='type-id-278' name='cipher_key'/>
       <parameter type-id='type-id-64' name='seq_number'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_handshake_set_hook_function' mangled-name='gnutls_handshake_set_hook_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_set_hook_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-10' name='htype'/>
       <parameter type-id='type-id-22' name='when'/>
       <parameter type-id='type-id-159' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_handshake_set_random' mangled-name='gnutls_handshake_set_random' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_set_random@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-57' name='random'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_get_master_secret' mangled-name='gnutls_session_get_master_secret' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_master_secret@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-275' name='secret'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <parameter type-id='type-id-278' name='secret'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_session_get_random' mangled-name='gnutls_session_get_random' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_random@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-275' name='client'/>
-      <parameter type-id='type-id-275' name='server'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <parameter type-id='type-id-278' name='client'/>
+      <parameter type-id='type-id-278' name='server'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_protocol_get_version' mangled-name='gnutls_protocol_get_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_protocol_get_version@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='gnutls_group_get' mangled-name='gnutls_group_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_group_get@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-56'/>
     </function-decl>
     <function-decl name='gnutls_ecc_curve_get' mangled-name='gnutls_ecc_curve_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ecc_curve_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-59'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-722'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-725'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_CB_TLS_UNIQUE' value='0'/>
     </enum-decl>
-    <typedef-decl name='gnutls_channel_binding_t' type-id='type-id-722' id='type-id-723'/>
+    <typedef-decl name='gnutls_channel_binding_t' type-id='type-id-725' id='type-id-726'/>
     <function-decl name='gnutls_session_channel_binding' mangled-name='gnutls_session_channel_binding' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_channel_binding@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-723' name='cbtype'/>
-      <parameter type-id='type-id-275' name='cb'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <parameter type-id='type-id-726' name='cbtype'/>
+      <parameter type-id='type-id-278' name='cb'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_enable_compatibility_mode' mangled-name='gnutls_session_enable_compatibility_mode' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_enable_compatibility_mode@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_handshake_set_post_client_hello_function' mangled-name='gnutls_handshake_set_post_client_hello_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_set_post_client_hello_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-158' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_rsa_pms_set_version' mangled-name='_gnutls_rsa_pms_set_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_rsa_pms_set_version@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-35' name='major'/>
       <parameter type-id='type-id-35' name='minor'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_record_get_direction' mangled-name='gnutls_record_get_direction' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_get_direction@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_set_verify_function' mangled-name='gnutls_session_set_verify_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_set_verify_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-171' name='func'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <parameter type-id='type-id-172' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_session_set_ptr' mangled-name='gnutls_session_set_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_set_ptr@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-101' name='ptr'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_session_get_ptr' mangled-name='gnutls_session_get_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_ptr@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-101'/>
     </function-decl>
     <function-decl name='gnutls_session_resumption_requested' mangled-name='gnutls_session_resumption_requested' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_resumption_requested@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_is_resumed' mangled-name='gnutls_session_is_resumed' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_is_resumed@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_handshake_set_private_extensions' mangled-name='gnutls_handshake_set_private_extensions' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_handshake_set_private_extensions@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-22' name='allow'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hello_set_default_version' mangled-name='_gnutls_hello_set_default_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_hello_set_default_version@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-35' name='major'/>
       <parameter type-id='type-id-35' name='minor'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_record_set_default_version' mangled-name='_gnutls_record_set_default_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_record_set_default_version@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-35' name='major'/>
       <parameter type-id='type-id-35' name='minor'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_send_x509_rdn_sequence' mangled-name='gnutls_certificate_send_x509_rdn_sequence' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_send_x509_rdn_sequence@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-22' name='allow'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_deinit' mangled-name='gnutls_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-724'/>
+    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-727'/>
     <function-decl name='gnutls_init' mangled-name='gnutls_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-724' name='session'/>
+      <parameter type-id='type-id-727' name='session'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_compression_get' mangled-name='gnutls_compression_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_compression_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <return type-id='type-id-367'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <return type-id='type-id-370'/>
     </function-decl>
     <function-decl name='gnutls_mac_get' mangled-name='gnutls_mac_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_mac_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-31'/>
     </function-decl>
     <function-decl name='gnutls_kx_get' mangled-name='gnutls_kx_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_kx_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='gnutls_certificate_type_get' mangled-name='gnutls_certificate_type_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_type_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-19'/>
     </function-decl>
     <function-decl name='gnutls_cipher_get' mangled-name='gnutls_cipher_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-29'/>
     </function-decl>
     <function-decl name='gnutls_certificate_type_get2' mangled-name='gnutls_certificate_type_get2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_type_get2@@GNUTLS_3_6_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-429' name='target'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <parameter type-id='type-id-432' name='target'/>
       <return type-id='type-id-19'/>
     </function-decl>
     <function-decl name='gnutls_safe_renegotiation_status' mangled-name='gnutls_safe_renegotiation_status' visibility='default' binding='global' size-in-bits='64'>
@@ -8583,35 +8618,38 @@
     <function-decl name='gnutls_handshake_set_max_packet_length' mangled-name='gnutls_handshake_set_max_packet_length' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='gnutls_session_set_keylog_function' mangled-name='gnutls_session_set_keylog_function' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='gnutls_ocsp_status_request_enable_client' mangled-name='gnutls_ocsp_status_request_enable_client' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cert-cred-x509.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_certificate_credentials_st' size-in-bits='1408' is-struct='yes' visibility='default' id='type-id-725'>
+  <abi-instr version='1.0' address-size='64' path='cert-cred-x509.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_certificate_credentials_st' size-in-bits='1408' is-struct='yes' visibility='default' id='type-id-728'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='dh_params' type-id='type-id-418' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-421' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='deinit_dh_params' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
+        <var-decl name='dh_sec_param' type-id='type-id-203' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='params_func' type-id='type-id-433' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-436' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='certs' type-id='type-id-434' visibility='default'/>
+        <var-decl name='certs' type-id='type-id-437' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='ncerts' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='sorted_cert_idx' type-id='type-id-419' visibility='default'/>
+        <var-decl name='sorted_cert_idx' type-id='type-id-422' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='tlist' type-id='type-id-715' visibility='default'/>
+        <var-decl name='tlist' type-id='type-id-718' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
@@ -8626,25 +8664,25 @@
         <var-decl name='verify_bits' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='legacy_cert_cb1' type-id='type-id-436' visibility='default'/>
+        <var-decl name='legacy_cert_cb1' type-id='type-id-439' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='legacy_cert_cb2' type-id='type-id-437' visibility='default'/>
+        <var-decl name='legacy_cert_cb2' type-id='type-id-440' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='get_cert_callback3' type-id='type-id-438' visibility='default'/>
+        <var-decl name='get_cert_callback3' type-id='type-id-441' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='verify_callback' type-id='type-id-171' visibility='default'/>
+        <var-decl name='verify_callback' type-id='type-id-172' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-377' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='pin_tmp' type-id='type-id-439' visibility='default'/>
+        <var-decl name='pin_tmp' type-id='type-id-442' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='glob_ocsp_func' type-id='type-id-164' visibility='default'/>
+        <var-decl name='glob_ocsp_func' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <var-decl name='glob_ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
@@ -8653,47 +8691,47 @@
         <var-decl name='tls13_ok' type-id='type-id-75' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-725' size-in-bits='64' id='type-id-726'/>
-    <typedef-decl name='gnutls_certificate_credentials_t' type-id='type-id-726' id='type-id-727'/>
+    <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-729'/>
+    <typedef-decl name='gnutls_certificate_credentials_t' type-id='type-id-729' id='type-id-730'/>
     <function-decl name='gnutls_certificate_set_pin_function' mangled-name='gnutls_certificate_set_pin_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_pin_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='cred'/>
-      <parameter type-id='type-id-375' name='fn'/>
+      <parameter type-id='type-id-730' name='cred'/>
+      <parameter type-id='type-id-378' name='fn'/>
       <parameter type-id='type-id-101' name='userdata'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_free_crls' mangled-name='gnutls_certificate_free_crls' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_free_crls@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='sc'/>
+      <parameter type-id='type-id-730' name='sc'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_x509_simple_pkcs12_mem' mangled-name='gnutls_certificate_set_x509_simple_pkcs12_mem' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_simple_pkcs12_mem@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <parameter type-id='type-id-57' name='p12blob'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <parameter type-id='type-id-27' name='password'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_x509_simple_pkcs12_file' mangled-name='gnutls_certificate_set_x509_simple_pkcs12_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_simple_pkcs12_file@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <parameter type-id='type-id-27' name='pkcs12file'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <parameter type-id='type-id-27' name='password'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_x509_crl_file' mangled-name='gnutls_certificate_set_x509_crl_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_crl_file@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <parameter type-id='type-id-27' name='crlfile'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_x509_crl_int' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-728'>
+    <class-decl name='gnutls_x509_crl_int' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-731'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='crl' type-id='type-id-387' visibility='default'/>
+        <var-decl name='crl' type-id='type-id-390' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='expanded' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='rcache' type-id='type-id-387' visibility='default'/>
+        <var-decl name='rcache' type-id='type-id-390' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='rcache_idx' type-id='type-id-10' visibility='default'/>
@@ -8708,111 +8746,111 @@
         <var-decl name='raw_issuer_dn' type-id='type-id-62' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-729'/>
-    <typedef-decl name='gnutls_x509_crl_t' type-id='type-id-729' id='type-id-730'/>
-    <pointer-type-def type-id='type-id-730' size-in-bits='64' id='type-id-731'/>
+    <pointer-type-def type-id='type-id-731' size-in-bits='64' id='type-id-732'/>
+    <typedef-decl name='gnutls_x509_crl_t' type-id='type-id-732' id='type-id-733'/>
+    <pointer-type-def type-id='type-id-733' size-in-bits='64' id='type-id-734'/>
     <function-decl name='gnutls_certificate_set_x509_crl' mangled-name='gnutls_certificate_set_x509_crl' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_crl@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
-      <parameter type-id='type-id-731' name='crl_list'/>
+      <parameter type-id='type-id-730' name='res'/>
+      <parameter type-id='type-id-734' name='crl_list'/>
       <parameter type-id='type-id-22' name='crl_list_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_x509_crl_mem' mangled-name='gnutls_certificate_set_x509_crl_mem' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_crl_mem@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <parameter type-id='type-id-57' name='CRL'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_x509_system_trust' mangled-name='gnutls_certificate_set_x509_system_trust' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_system_trust@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='cred'/>
+      <parameter type-id='type-id-730' name='cred'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_x509_trust_dir' mangled-name='gnutls_certificate_set_x509_trust_dir' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_trust_dir@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='cred'/>
+      <parameter type-id='type-id-730' name='cred'/>
       <parameter type-id='type-id-27' name='ca_dir'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_x509_trust_file' mangled-name='gnutls_certificate_set_x509_trust_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_trust_file@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='cred'/>
+      <parameter type-id='type-id-730' name='cred'/>
       <parameter type-id='type-id-27' name='ca_dir'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_x509_trust' mangled-name='gnutls_certificate_set_x509_trust' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_trust@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
-      <parameter type-id='type-id-458' name='ca_list'/>
+      <parameter type-id='type-id-730' name='res'/>
+      <parameter type-id='type-id-461' name='ca_list'/>
       <parameter type-id='type-id-22' name='ca_list_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_x509_trust_mem' mangled-name='gnutls_certificate_set_x509_trust_mem' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_trust_mem@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <parameter type-id='type-id-57' name='ca'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_x509_key_file' mangled-name='gnutls_certificate_set_x509_key_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_key_file@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <parameter type-id='type-id-27' name='certfile'/>
       <parameter type-id='type-id-27' name='keyfile'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-715' size-in-bits='64' id='type-id-732'/>
+    <pointer-type-def type-id='type-id-718' size-in-bits='64' id='type-id-735'/>
     <function-decl name='gnutls_certificate_get_trust_list' mangled-name='gnutls_certificate_get_trust_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_get_trust_list@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
-      <parameter type-id='type-id-732' name='tlist'/>
+      <parameter type-id='type-id-730' name='res'/>
+      <parameter type-id='type-id-735' name='tlist'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_trust_list' mangled-name='gnutls_certificate_set_trust_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_trust_list@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
-      <parameter type-id='type-id-715' name='tlist'/>
+      <parameter type-id='type-id-730' name='res'/>
+      <parameter type-id='type-id-718' name='tlist'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-733'/>
+    <pointer-type-def type-id='type-id-461' size-in-bits='64' id='type-id-736'/>
     <function-decl name='gnutls_certificate_get_x509_crt' mangled-name='gnutls_certificate_get_x509_crt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_get_x509_crt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <parameter type-id='type-id-10' name='index'/>
-      <parameter type-id='type-id-733' name='crt_list'/>
-      <parameter type-id='type-id-419' name='crt_list_size'/>
+      <parameter type-id='type-id-736' name='crt_list'/>
+      <parameter type-id='type-id-422' name='crt_list_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-734'/>
+    <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-737'/>
     <function-decl name='gnutls_certificate_get_x509_key' mangled-name='gnutls_certificate_get_x509_key' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_get_x509_key@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <parameter type-id='type-id-10' name='index'/>
-      <parameter type-id='type-id-734' name='key'/>
+      <parameter type-id='type-id-737' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_x509_key' mangled-name='gnutls_certificate_set_x509_key' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_key@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
-      <parameter type-id='type-id-458' name='cert_list'/>
+      <parameter type-id='type-id-730' name='res'/>
+      <parameter type-id='type-id-461' name='cert_list'/>
       <parameter type-id='type-id-22' name='cert_list_size'/>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_x509_key_mem' mangled-name='gnutls_certificate_set_x509_key_mem' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_key_mem@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <parameter type-id='type-id-57' name='cert'/>
       <parameter type-id='type-id-57' name='key'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_x509_key_mem2' mangled-name='gnutls_certificate_set_x509_key_mem2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_key_mem2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <parameter type-id='type-id-57' name='cert'/>
       <parameter type-id='type-id-57' name='key'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <parameter type-id='type-id-27' name='pass'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_x509_key_file2' mangled-name='gnutls_certificate_set_x509_key_file2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_x509_key_file2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <parameter type-id='type-id-27' name='certfile'/>
       <parameter type-id='type-id-27' name='keyfile'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <parameter type-id='type-id-27' name='pass'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
@@ -8908,79 +8946,79 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='file.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='file.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_load_file' mangled-name='gnutls_load_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_load_file@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='filename'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-278' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='supplemental.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_supplemental_entry_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-295'>
+  <abi-instr version='1.0' address-size='64' path='supplemental.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_supplemental_entry_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-298'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='name' type-id='type-id-376' visibility='default'/>
+        <var-decl name='name' type-id='type-id-379' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='type' type-id='type-id-735' visibility='default'/>
+        <var-decl name='type' type-id='type-id-738' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='supp_recv_func' type-id='type-id-736' visibility='default'/>
+        <var-decl name='supp_recv_func' type-id='type-id-739' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='supp_send_func' type-id='type-id-737' visibility='default'/>
+        <var-decl name='supp_send_func' type-id='type-id-740' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-738'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-741'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_SUPPLEMENTAL_UNKNOWN' value='0'/>
     </enum-decl>
-    <typedef-decl name='gnutls_supplemental_data_format_type_t' type-id='type-id-738' id='type-id-735'/>
-    <typedef-decl name='gnutls_supp_recv_func' type-id='type-id-348' id='type-id-736'/>
-    <typedef-decl name='gnutls_supp_send_func' type-id='type-id-352' id='type-id-737'/>
+    <typedef-decl name='gnutls_supplemental_data_format_type_t' type-id='type-id-741' id='type-id-738'/>
+    <typedef-decl name='gnutls_supp_recv_func' type-id='type-id-351' id='type-id-739'/>
+    <typedef-decl name='gnutls_supp_send_func' type-id='type-id-355' id='type-id-740'/>
     <function-decl name='gnutls_supplemental_send' mangled-name='gnutls_supplemental_send' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_supplemental_send@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='do_send_supplemental'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_supplemental_recv' mangled-name='gnutls_supplemental_recv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_supplemental_recv@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='do_send_supplemental'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_session_supplemental_register' mangled-name='gnutls_session_supplemental_register' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_supplemental_register@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-27' name='name'/>
-      <parameter type-id='type-id-735' name='type'/>
-      <parameter type-id='type-id-736' name='recv_func'/>
-      <parameter type-id='type-id-737' name='send_func'/>
+      <parameter type-id='type-id-738' name='type'/>
+      <parameter type-id='type-id-739' name='recv_func'/>
+      <parameter type-id='type-id-740' name='send_func'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_supplemental_register' mangled-name='gnutls_supplemental_register' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_supplemental_register@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='name'/>
-      <parameter type-id='type-id-735' name='type'/>
-      <parameter type-id='type-id-736' name='recv_func'/>
-      <parameter type-id='type-id-737' name='send_func'/>
+      <parameter type-id='type-id-738' name='type'/>
+      <parameter type-id='type-id-739' name='recv_func'/>
+      <parameter type-id='type-id-740' name='send_func'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_supplemental_get_name' mangled-name='gnutls_supplemental_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_supplemental_get_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-735' name='type'/>
+      <parameter type-id='type-id-738' name='type'/>
       <return type-id='type-id-27'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='random.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='random.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_rnd_refresh' mangled-name='gnutls_rnd_refresh' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_rnd_refresh@@GNUTLS_3_4'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <enum-decl name='gnutls_rnd_level' id='type-id-739'>
+    <enum-decl name='gnutls_rnd_level' id='type-id-742'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_RND_NONCE' value='0'/>
       <enumerator name='GNUTLS_RND_RANDOM' value='1'/>
       <enumerator name='GNUTLS_RND_KEY' value='2'/>
     </enum-decl>
-    <typedef-decl name='gnutls_rnd_level_t' type-id='type-id-739' id='type-id-740'/>
+    <typedef-decl name='gnutls_rnd_level_t' type-id='type-id-742' id='type-id-743'/>
     <function-decl name='gnutls_rnd' mangled-name='gnutls_rnd' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_rnd@@GNUTLS_3_4'>
-      <parameter type-id='type-id-740' name='level'/>
+      <parameter type-id='type-id-743' name='level'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-99' name='len'/>
       <return type-id='type-id-22'/>
@@ -8992,52 +9030,76 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='crypto-api.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-741'/>
-    <typedef-decl name='gnutls_aead_cipher_hd_t' type-id='type-id-741' id='type-id-742'/>
+  <abi-instr version='1.0' address-size='64' path='crypto-api.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <function-decl name='gnutls_pbkdf2' mangled-name='gnutls_pbkdf2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pbkdf2@@GNUTLS_3_6_13'>
+      <parameter type-id='type-id-31' name='mac'/>
+      <parameter type-id='type-id-57' name='key'/>
+      <parameter type-id='type-id-57' name='salt'/>
+      <parameter type-id='type-id-10' name='iter_count'/>
+      <parameter type-id='type-id-101' name='output'/>
+      <parameter type-id='type-id-99' name='length'/>
+      <return type-id='type-id-22'/>
+    </function-decl>
+    <function-decl name='gnutls_hkdf_expand' mangled-name='gnutls_hkdf_expand' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hkdf_expand@@GNUTLS_3_6_13'>
+      <parameter type-id='type-id-31' name='mac'/>
+      <parameter type-id='type-id-57' name='key'/>
+      <parameter type-id='type-id-57' name='info'/>
+      <parameter type-id='type-id-101' name='output'/>
+      <parameter type-id='type-id-99' name='length'/>
+      <return type-id='type-id-22'/>
+    </function-decl>
+    <function-decl name='gnutls_hkdf_extract' mangled-name='gnutls_hkdf_extract' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hkdf_extract@@GNUTLS_3_6_13'>
+      <parameter type-id='type-id-31' name='mac'/>
+      <parameter type-id='type-id-57' name='key'/>
+      <parameter type-id='type-id-57' name='salt'/>
+      <parameter type-id='type-id-101' name='output'/>
+      <return type-id='type-id-22'/>
+    </function-decl>
+    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-744'/>
+    <typedef-decl name='gnutls_aead_cipher_hd_t' type-id='type-id-744' id='type-id-745'/>
     <function-decl name='gnutls_aead_cipher_deinit' mangled-name='gnutls_aead_cipher_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_aead_cipher_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-742' name='handle'/>
+      <parameter type-id='type-id-745' name='handle'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_aead_cipher_decryptv2' mangled-name='gnutls_aead_cipher_decryptv2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_aead_cipher_decryptv2@@GNUTLS_3_6_10'>
-      <parameter type-id='type-id-742' name='handle'/>
+      <parameter type-id='type-id-745' name='handle'/>
       <parameter type-id='type-id-101' name='nonce'/>
       <parameter type-id='type-id-99' name='nonce_len'/>
-      <parameter type-id='type-id-249' name='auth_iov'/>
+      <parameter type-id='type-id-250' name='auth_iov'/>
       <parameter type-id='type-id-22' name='auth_iovcnt'/>
-      <parameter type-id='type-id-249' name='iov'/>
+      <parameter type-id='type-id-250' name='iov'/>
       <parameter type-id='type-id-22' name='iovcnt'/>
       <parameter type-id='type-id-101' name='tag'/>
       <parameter type-id='type-id-99' name='tag_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_aead_cipher_encryptv2' mangled-name='gnutls_aead_cipher_encryptv2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_aead_cipher_encryptv2@@GNUTLS_3_6_10'>
-      <parameter type-id='type-id-742' name='handle'/>
+      <parameter type-id='type-id-745' name='handle'/>
       <parameter type-id='type-id-101' name='nonce'/>
       <parameter type-id='type-id-99' name='nonce_len'/>
-      <parameter type-id='type-id-249' name='auth_iov'/>
+      <parameter type-id='type-id-250' name='auth_iov'/>
       <parameter type-id='type-id-22' name='auth_iovcnt'/>
-      <parameter type-id='type-id-249' name='iov'/>
+      <parameter type-id='type-id-250' name='iov'/>
       <parameter type-id='type-id-22' name='iovcnt'/>
       <parameter type-id='type-id-101' name='tag'/>
-      <parameter type-id='type-id-422' name='tag_size'/>
+      <parameter type-id='type-id-425' name='tag_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_aead_cipher_encryptv' mangled-name='gnutls_aead_cipher_encryptv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_aead_cipher_encryptv@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-742' name='handle'/>
+      <parameter type-id='type-id-745' name='handle'/>
       <parameter type-id='type-id-101' name='nonce'/>
       <parameter type-id='type-id-99' name='nonce_len'/>
-      <parameter type-id='type-id-249' name='auth_iov'/>
+      <parameter type-id='type-id-250' name='auth_iov'/>
       <parameter type-id='type-id-22' name='auth_iovcnt'/>
       <parameter type-id='type-id-99' name='tag_size'/>
-      <parameter type-id='type-id-249' name='iov'/>
+      <parameter type-id='type-id-250' name='iov'/>
       <parameter type-id='type-id-22' name='iovcnt'/>
       <parameter type-id='type-id-101' name='ctext'/>
-      <parameter type-id='type-id-422' name='ctext_len'/>
+      <parameter type-id='type-id-425' name='ctext_len'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_aead_cipher_encrypt' mangled-name='gnutls_aead_cipher_encrypt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_aead_cipher_encrypt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-742' name='handle'/>
+      <parameter type-id='type-id-745' name='handle'/>
       <parameter type-id='type-id-101' name='nonce'/>
       <parameter type-id='type-id-99' name='nonce_len'/>
       <parameter type-id='type-id-101' name='auth'/>
@@ -9046,11 +9108,11 @@
       <parameter type-id='type-id-101' name='ptext'/>
       <parameter type-id='type-id-99' name='ptext_len'/>
       <parameter type-id='type-id-101' name='ctext'/>
-      <parameter type-id='type-id-422' name='ctext_len'/>
+      <parameter type-id='type-id-425' name='ctext_len'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_aead_cipher_decrypt' mangled-name='gnutls_aead_cipher_decrypt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_aead_cipher_decrypt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-742' name='handle'/>
+      <parameter type-id='type-id-745' name='handle'/>
       <parameter type-id='type-id-101' name='nonce'/>
       <parameter type-id='type-id-99' name='nonce_len'/>
       <parameter type-id='type-id-101' name='auth'/>
@@ -9059,63 +9121,63 @@
       <parameter type-id='type-id-101' name='ptext'/>
       <parameter type-id='type-id-99' name='ptext_len'/>
       <parameter type-id='type-id-101' name='ctext'/>
-      <parameter type-id='type-id-422' name='ctext_len'/>
+      <parameter type-id='type-id-425' name='ctext_len'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-742' size-in-bits='64' id='type-id-743'/>
+    <pointer-type-def type-id='type-id-745' size-in-bits='64' id='type-id-746'/>
     <function-decl name='gnutls_aead_cipher_init' mangled-name='gnutls_aead_cipher_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_aead_cipher_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-743' name='handle'/>
+      <parameter type-id='type-id-746' name='handle'/>
       <parameter type-id='type-id-29' name='cipher'/>
       <parameter type-id='type-id-57' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_key_generate' mangled-name='gnutls_key_generate' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_key_generate@@GNUTLS_3_4'>
-      <parameter type-id='type-id-275' name='key'/>
+      <parameter type-id='type-id-278' name='key'/>
       <parameter type-id='type-id-10' name='key_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='hash_hd_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-744'/>
-    <pointer-type-def type-id='type-id-744' size-in-bits='64' id='type-id-745'/>
-    <typedef-decl name='gnutls_hash_hd_t' type-id='type-id-745' id='type-id-746'/>
+    <class-decl name='hash_hd_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-747'/>
+    <pointer-type-def type-id='type-id-747' size-in-bits='64' id='type-id-748'/>
+    <typedef-decl name='gnutls_hash_hd_t' type-id='type-id-748' id='type-id-749'/>
     <function-decl name='gnutls_hash_copy' mangled-name='gnutls_hash_copy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hash_copy@@GNUTLS_3_6_9'>
-      <parameter type-id='type-id-746' name='handle'/>
-      <return type-id='type-id-746'/>
+      <parameter type-id='type-id-749' name='handle'/>
+      <return type-id='type-id-749'/>
     </function-decl>
     <function-decl name='gnutls_hash_fast' mangled-name='gnutls_hash_fast' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hash_fast@@GNUTLS_3_4'>
-      <parameter type-id='type-id-211' name='algorithm'/>
+      <parameter type-id='type-id-212' name='algorithm'/>
       <parameter type-id='type-id-101' name='ptext'/>
       <parameter type-id='type-id-99' name='ptext_len'/>
       <parameter type-id='type-id-101' name='digest'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_hash_deinit' mangled-name='gnutls_hash_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hash_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-746' name='handle'/>
+      <parameter type-id='type-id-749' name='handle'/>
       <parameter type-id='type-id-101' name='digest'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hash_output' mangled-name='gnutls_hash_output' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hash_output@@GNUTLS_3_4'>
-      <parameter type-id='type-id-746' name='handle'/>
+      <parameter type-id='type-id-749' name='handle'/>
       <parameter type-id='type-id-101' name='digest'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hash' mangled-name='gnutls_hash' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hash@@GNUTLS_3_4'>
-      <parameter type-id='type-id-746' name='handle'/>
+      <parameter type-id='type-id-749' name='handle'/>
       <parameter type-id='type-id-101' name='ptext'/>
       <parameter type-id='type-id-99' name='ptext_len'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-746' size-in-bits='64' id='type-id-747'/>
+    <pointer-type-def type-id='type-id-749' size-in-bits='64' id='type-id-750'/>
     <function-decl name='gnutls_hash_init' mangled-name='gnutls_hash_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hash_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-747' name='dig'/>
-      <parameter type-id='type-id-211' name='algorithm'/>
+      <parameter type-id='type-id-750' name='dig'/>
+      <parameter type-id='type-id-212' name='algorithm'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='hmac_hd_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-748'/>
-    <pointer-type-def type-id='type-id-748' size-in-bits='64' id='type-id-749'/>
-    <typedef-decl name='gnutls_hmac_hd_t' type-id='type-id-749' id='type-id-750'/>
+    <class-decl name='hmac_hd_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-751'/>
+    <pointer-type-def type-id='type-id-751' size-in-bits='64' id='type-id-752'/>
+    <typedef-decl name='gnutls_hmac_hd_t' type-id='type-id-752' id='type-id-753'/>
     <function-decl name='gnutls_hmac_copy' mangled-name='gnutls_hmac_copy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hmac_copy@@GNUTLS_3_6_9'>
-      <parameter type-id='type-id-750' name='handle'/>
-      <return type-id='type-id-750'/>
+      <parameter type-id='type-id-753' name='handle'/>
+      <return type-id='type-id-753'/>
     </function-decl>
     <function-decl name='gnutls_hmac_fast' mangled-name='gnutls_hmac_fast' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hmac_fast@@GNUTLS_3_4'>
       <parameter type-id='type-id-31' name='algorithm'/>
@@ -9126,41 +9188,45 @@
       <parameter type-id='type-id-101' name='digest'/>
       <return type-id='type-id-22'/>
     </function-decl>
+    <function-decl name='gnutls_hmac_get_key_size' mangled-name='gnutls_hmac_get_key_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hmac_get_key_size@@GNUTLS_3_6_12'>
+      <parameter type-id='type-id-31' name='algorithm'/>
+      <return type-id='type-id-10'/>
+    </function-decl>
     <function-decl name='gnutls_hmac_get_len' mangled-name='gnutls_hmac_get_len' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hmac_get_len@@GNUTLS_3_4'>
       <parameter type-id='type-id-31' name='algorithm'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_hmac_deinit' mangled-name='gnutls_hmac_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hmac_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-750' name='handle'/>
+      <parameter type-id='type-id-753' name='handle'/>
       <parameter type-id='type-id-101' name='digest'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hmac_output' mangled-name='gnutls_hmac_output' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hmac_output@@GNUTLS_3_4'>
-      <parameter type-id='type-id-750' name='handle'/>
+      <parameter type-id='type-id-753' name='handle'/>
       <parameter type-id='type-id-101' name='digest'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hmac' mangled-name='gnutls_hmac' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hmac@@GNUTLS_3_4'>
-      <parameter type-id='type-id-750' name='handle'/>
+      <parameter type-id='type-id-753' name='handle'/>
       <parameter type-id='type-id-101' name='ptext'/>
       <parameter type-id='type-id-99' name='ptext_len'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_hmac_set_nonce' mangled-name='gnutls_hmac_set_nonce' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hmac_set_nonce@@GNUTLS_3_4'>
-      <parameter type-id='type-id-750' name='handle'/>
+      <parameter type-id='type-id-753' name='handle'/>
       <parameter type-id='type-id-101' name='nonce'/>
       <parameter type-id='type-id-99' name='nonce_len'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-750' size-in-bits='64' id='type-id-751'/>
+    <pointer-type-def type-id='type-id-753' size-in-bits='64' id='type-id-754'/>
     <function-decl name='gnutls_hmac_init' mangled-name='gnutls_hmac_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hmac_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-751' name='dig'/>
+      <parameter type-id='type-id-754' name='dig'/>
       <parameter type-id='type-id-31' name='algorithm'/>
       <parameter type-id='type-id-101' name='key'/>
       <parameter type-id='type-id-99' name='keylen'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='api_cipher_hd_st' size-in-bits='1408' is-struct='yes' visibility='default' id='type-id-752'>
+    <class-decl name='api_cipher_hd_st' size-in-bits='1408' is-struct='yes' visibility='default' id='type-id-755'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='ctx_enc' type-id='type-id-97' visibility='default'/>
       </data-member>
@@ -9168,14 +9234,14 @@
         <var-decl name='ctx_dec' type-id='type-id-97' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-752' size-in-bits='64' id='type-id-753'/>
-    <typedef-decl name='gnutls_cipher_hd_t' type-id='type-id-753' id='type-id-754'/>
+    <pointer-type-def type-id='type-id-755' size-in-bits='64' id='type-id-756'/>
+    <typedef-decl name='gnutls_cipher_hd_t' type-id='type-id-756' id='type-id-757'/>
     <function-decl name='gnutls_cipher_deinit' mangled-name='gnutls_cipher_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-754' name='handle'/>
+      <parameter type-id='type-id-757' name='handle'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_cipher_decrypt2' mangled-name='gnutls_cipher_decrypt2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_decrypt2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-754' name='handle'/>
+      <parameter type-id='type-id-757' name='handle'/>
       <parameter type-id='type-id-101' name='ctext'/>
       <parameter type-id='type-id-99' name='ctext_len'/>
       <parameter type-id='type-id-101' name='ptext'/>
@@ -9183,7 +9249,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_cipher_encrypt2' mangled-name='gnutls_cipher_encrypt2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_encrypt2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-754' name='handle'/>
+      <parameter type-id='type-id-757' name='handle'/>
       <parameter type-id='type-id-101' name='ptext'/>
       <parameter type-id='type-id-99' name='ptext_len'/>
       <parameter type-id='type-id-101' name='ctext'/>
@@ -9191,44 +9257,44 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_cipher_decrypt' mangled-name='gnutls_cipher_decrypt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_decrypt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-754' name='handle'/>
+      <parameter type-id='type-id-757' name='handle'/>
       <parameter type-id='type-id-101' name='ctext'/>
       <parameter type-id='type-id-99' name='ctext_len'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_cipher_encrypt' mangled-name='gnutls_cipher_encrypt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_encrypt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-754' name='handle'/>
+      <parameter type-id='type-id-757' name='handle'/>
       <parameter type-id='type-id-101' name='ptext'/>
       <parameter type-id='type-id-99' name='ptext_len'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_cipher_get_iv' mangled-name='_gnutls_cipher_get_iv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_cipher_get_iv@@GNUTLS_FIPS140_3_4'>
-      <parameter type-id='type-id-754' name='handle'/>
+      <parameter type-id='type-id-757' name='handle'/>
       <parameter type-id='type-id-101' name='ptext'/>
       <parameter type-id='type-id-99' name='ptext_len'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_cipher_set_iv' mangled-name='gnutls_cipher_set_iv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_set_iv@@GNUTLS_3_4'>
-      <parameter type-id='type-id-754' name='handle'/>
+      <parameter type-id='type-id-757' name='handle'/>
       <parameter type-id='type-id-101' name='iv'/>
       <parameter type-id='type-id-99' name='ivlen'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_cipher_add_auth' mangled-name='gnutls_cipher_add_auth' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_add_auth@@GNUTLS_3_4'>
-      <parameter type-id='type-id-754' name='handle'/>
+      <parameter type-id='type-id-757' name='handle'/>
       <parameter type-id='type-id-101' name='ptext'/>
       <parameter type-id='type-id-99' name='ptext_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_cipher_tag' mangled-name='gnutls_cipher_tag' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_tag@@GNUTLS_3_4'>
-      <parameter type-id='type-id-754' name='handle'/>
+      <parameter type-id='type-id-757' name='handle'/>
       <parameter type-id='type-id-101' name='tag'/>
       <parameter type-id='type-id-99' name='tag_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-754' size-in-bits='64' id='type-id-755'/>
+    <pointer-type-def type-id='type-id-757' size-in-bits='64' id='type-id-758'/>
     <function-decl name='gnutls_cipher_init' mangled-name='gnutls_cipher_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-755' name='handle'/>
+      <parameter type-id='type-id-758' name='handle'/>
       <parameter type-id='type-id-29' name='cipher'/>
       <parameter type-id='type-id-57' name='key'/>
       <parameter type-id='type-id-57' name='iv'/>
@@ -9250,57 +9316,57 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='privkey.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-756'/>
-    <typedef-decl name='gnutls_x509_spki_t' type-id='type-id-756' id='type-id-757'/>
-    <qualified-type-def type-id='type-id-757' const='yes' id='type-id-758'/>
+  <abi-instr version='1.0' address-size='64' path='privkey.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-759'/>
+    <typedef-decl name='gnutls_x509_spki_t' type-id='type-id-759' id='type-id-760'/>
+    <qualified-type-def type-id='type-id-760' const='yes' id='type-id-761'/>
     <function-decl name='gnutls_privkey_set_spki' mangled-name='gnutls_privkey_set_spki' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_set_spki@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-401' name='privkey'/>
-      <parameter type-id='type-id-758' name='spki'/>
+      <parameter type-id='type-id-404' name='privkey'/>
+      <parameter type-id='type-id-761' name='spki'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_get_spki' mangled-name='gnutls_privkey_get_spki' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_get_spki@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-401' name='privkey'/>
-      <parameter type-id='type-id-757' name='spki'/>
+      <parameter type-id='type-id-404' name='privkey'/>
+      <parameter type-id='type-id-760' name='spki'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_verify_params' mangled-name='gnutls_privkey_verify_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_verify_params@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-404' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_status' mangled-name='gnutls_privkey_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-404' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_set_flags' mangled-name='gnutls_privkey_set_flags' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_set_flags@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-404' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_privkey_set_pin_function' mangled-name='gnutls_privkey_set_pin_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_set_pin_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-375' name='fn'/>
+      <parameter type-id='type-id-404' name='key'/>
+      <parameter type-id='type-id-378' name='fn'/>
       <parameter type-id='type-id-101' name='userdata'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_url' mangled-name='gnutls_privkey_import_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-404' name='key'/>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_x509_raw' mangled-name='gnutls_privkey_import_x509_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_x509_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-404' name='pkey'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_decrypt_data2' mangled-name='gnutls_privkey_decrypt_data2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_decrypt_data2@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-404' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='ciphertext'/>
       <parameter type-id='type-id-64' name='plaintext'/>
@@ -9308,148 +9374,148 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_decrypt_data' mangled-name='gnutls_privkey_decrypt_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_decrypt_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-404' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='ciphertext'/>
-      <parameter type-id='type-id-275' name='plaintext'/>
+      <parameter type-id='type-id-278' name='plaintext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_sign_hash' mangled-name='gnutls_privkey_sign_hash' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_sign_hash@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='signer'/>
-      <parameter type-id='type-id-211' name='hash_algo'/>
+      <parameter type-id='type-id-404' name='signer'/>
+      <parameter type-id='type-id-212' name='hash_algo'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='hash_data'/>
-      <parameter type-id='type-id-275' name='signature'/>
+      <parameter type-id='type-id-278' name='signature'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_sign_hash2' mangled-name='gnutls_privkey_sign_hash2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_sign_hash2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-401' name='signer'/>
+      <parameter type-id='type-id-404' name='signer'/>
       <parameter type-id='type-id-21' name='algo'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='hash_data'/>
-      <parameter type-id='type-id-275' name='signature'/>
+      <parameter type-id='type-id-278' name='signature'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_sign_data2' mangled-name='gnutls_privkey_sign_data2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_sign_data2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-401' name='signer'/>
+      <parameter type-id='type-id-404' name='signer'/>
       <parameter type-id='type-id-21' name='algo'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-275' name='signature'/>
+      <parameter type-id='type-id-278' name='signature'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_sign_data' mangled-name='gnutls_privkey_sign_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_sign_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='signer'/>
-      <parameter type-id='type-id-211' name='hash'/>
+      <parameter type-id='type-id-404' name='signer'/>
+      <parameter type-id='type-id-212' name='hash'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-275' name='signature'/>
+      <parameter type-id='type-id-278' name='signature'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_generate' mangled-name='gnutls_privkey_generate' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_generate@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-404' name='pkey'/>
       <parameter type-id='type-id-60' name='algo'/>
       <parameter type-id='type-id-10' name='bits'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_x509' mangled-name='gnutls_privkey_export_x509' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_x509@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
-      <parameter type-id='type-id-734' name='key'/>
+      <parameter type-id='type-id-404' name='pkey'/>
+      <parameter type-id='type-id-737' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_x509' mangled-name='gnutls_privkey_import_x509' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_x509@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-404' name='pkey'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_ext4' mangled-name='gnutls_privkey_import_ext4' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_ext4@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-404' name='pkey'/>
       <parameter type-id='type-id-101' name='userdata'/>
-      <parameter type-id='type-id-395' name='sign_data_fn'/>
-      <parameter type-id='type-id-396' name='sign_hash_fn'/>
-      <parameter type-id='type-id-397' name='decrypt_fn'/>
-      <parameter type-id='type-id-399' name='deinit_fn'/>
-      <parameter type-id='type-id-400' name='info_fn'/>
+      <parameter type-id='type-id-398' name='sign_data_fn'/>
+      <parameter type-id='type-id-399' name='sign_hash_fn'/>
+      <parameter type-id='type-id-400' name='decrypt_fn'/>
+      <parameter type-id='type-id-402' name='deinit_fn'/>
+      <parameter type-id='type-id-403' name='info_fn'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_ext3' mangled-name='gnutls_privkey_import_ext3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_ext3@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-404' name='pkey'/>
       <parameter type-id='type-id-101' name='userdata'/>
-      <parameter type-id='type-id-394' name='sign_fn'/>
-      <parameter type-id='type-id-397' name='decrypt_fn'/>
-      <parameter type-id='type-id-399' name='deinit_fn'/>
-      <parameter type-id='type-id-400' name='info_fn'/>
+      <parameter type-id='type-id-397' name='sign_fn'/>
+      <parameter type-id='type-id-400' name='decrypt_fn'/>
+      <parameter type-id='type-id-402' name='deinit_fn'/>
+      <parameter type-id='type-id-403' name='info_fn'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_ext2' mangled-name='gnutls_privkey_import_ext2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_ext2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-404' name='pkey'/>
       <parameter type-id='type-id-60' name='pk'/>
       <parameter type-id='type-id-101' name='userdata'/>
-      <parameter type-id='type-id-394' name='sign_fn'/>
-      <parameter type-id='type-id-397' name='decrypt_fn'/>
-      <parameter type-id='type-id-399' name='deinit_fn'/>
+      <parameter type-id='type-id-397' name='sign_fn'/>
+      <parameter type-id='type-id-400' name='decrypt_fn'/>
+      <parameter type-id='type-id-402' name='deinit_fn'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_ext' mangled-name='gnutls_privkey_import_ext' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_ext@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-404' name='pkey'/>
       <parameter type-id='type-id-60' name='pk'/>
       <parameter type-id='type-id-101' name='userdata'/>
-      <parameter type-id='type-id-394' name='sign_func'/>
-      <parameter type-id='type-id-397' name='decrypt_func'/>
+      <parameter type-id='type-id-397' name='sign_func'/>
+      <parameter type-id='type-id-400' name='decrypt_func'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-759'/>
+    <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-762'/>
     <function-decl name='gnutls_privkey_export_pkcs11' mangled-name='gnutls_privkey_export_pkcs11' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_export_pkcs11@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
-      <parameter type-id='type-id-759' name='key'/>
+      <parameter type-id='type-id-404' name='pkey'/>
+      <parameter type-id='type-id-762' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_deinit' mangled-name='gnutls_privkey_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-404' name='key'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_privkey_init' mangled-name='gnutls_privkey_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-485' name='key'/>
+      <parameter type-id='type-id-488' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_verify_seed' mangled-name='gnutls_privkey_verify_seed' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_verify_seed@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-211' name='digest'/>
+      <parameter type-id='type-id-404' name='key'/>
+      <parameter type-id='type-id-212' name='digest'/>
       <parameter type-id='type-id-101' name='seed'/>
       <parameter type-id='type-id-99' name='seed_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_get_seed' mangled-name='gnutls_privkey_get_seed' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_get_seed@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-431' name='digest'/>
+      <parameter type-id='type-id-404' name='key'/>
+      <parameter type-id='type-id-434' name='digest'/>
       <parameter type-id='type-id-101' name='seed'/>
-      <parameter type-id='type-id-422' name='seed_size'/>
+      <parameter type-id='type-id-425' name='seed_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_get_type' mangled-name='gnutls_privkey_get_type' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_get_type@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
-      <return type-id='type-id-380'/>
+      <parameter type-id='type-id-404' name='key'/>
+      <return type-id='type-id-383'/>
     </function-decl>
     <function-decl name='gnutls_privkey_get_pk_algorithm' mangled-name='gnutls_privkey_get_pk_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_get_pk_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-419' name='bits'/>
+      <parameter type-id='type-id-404' name='key'/>
+      <parameter type-id='type-id-422' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_pkcs11' mangled-name='gnutls_privkey_import_pkcs11' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_pkcs11@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
-      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-404' name='pkey'/>
+      <parameter type-id='type-id-387' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-760' visibility='default' id='type-id-761'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-763' visibility='default' id='type-id-764'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-762' visibility='default'/>
+        <var-decl name='type' type-id='type-id-765' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data' type-id='type-id-64' visibility='default'/>
@@ -9458,22 +9524,22 @@
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-763'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-766'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_KEYGEN_SEED' value='1'/>
       <enumerator name='GNUTLS_KEYGEN_DIGEST' value='2'/>
       <enumerator name='GNUTLS_KEYGEN_SPKI' value='3'/>
     </enum-decl>
-    <typedef-decl name='gnutls_keygen_types_t' type-id='type-id-763' id='type-id-762'/>
-    <typedef-decl name='gnutls_keygen_data_st' type-id='type-id-761' id='type-id-760'/>
-    <qualified-type-def type-id='type-id-760' const='yes' id='type-id-764'/>
-    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-765'/>
+    <typedef-decl name='gnutls_keygen_types_t' type-id='type-id-766' id='type-id-765'/>
+    <typedef-decl name='gnutls_keygen_data_st' type-id='type-id-764' id='type-id-763'/>
+    <qualified-type-def type-id='type-id-763' const='yes' id='type-id-767'/>
+    <pointer-type-def type-id='type-id-767' size-in-bits='64' id='type-id-768'/>
     <function-decl name='gnutls_privkey_generate2' mangled-name='gnutls_privkey_generate2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_generate2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-404' name='pkey'/>
       <parameter type-id='type-id-60' name='algo'/>
       <parameter type-id='type-id-10' name='bits'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-765' name='data'/>
+      <parameter type-id='type-id-768' name='data'/>
       <parameter type-id='type-id-10' name='data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -9580,64 +9646,64 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pcert.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pcert.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_pcert_deinit' mangled-name='gnutls_pcert_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pcert_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-161' name='pcert'/>
+      <parameter type-id='type-id-162' name='pcert'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pcert_export_x509' mangled-name='gnutls_pcert_export_x509' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pcert_export_x509@@GNUTLS_3_4'>
-      <parameter type-id='type-id-161' name='pcert'/>
-      <parameter type-id='type-id-458' name='crt'/>
+      <parameter type-id='type-id-162' name='pcert'/>
+      <parameter type-id='type-id-461' name='crt'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pcert_import_rawpk' mangled-name='gnutls_pcert_import_rawpk' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pcert_import_rawpk@@GNUTLS_3_6_6'>
-      <parameter type-id='type-id-161' name='pcert'/>
-      <parameter type-id='type-id-267' name='pubkey'/>
+      <parameter type-id='type-id-162' name='pcert'/>
+      <parameter type-id='type-id-270' name='pubkey'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pcert_import_x509_raw' mangled-name='gnutls_pcert_import_x509_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pcert_import_x509_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-161' name='pcert'/>
+      <parameter type-id='type-id-162' name='pcert'/>
       <parameter type-id='type-id-57' name='cert'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pcert_list_import_x509_file' mangled-name='gnutls_pcert_list_import_x509_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pcert_list_import_x509_file@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-161' name='pcert_list'/>
-      <parameter type-id='type-id-419' name='pcert_list_size'/>
+      <parameter type-id='type-id-162' name='pcert_list'/>
+      <parameter type-id='type-id-422' name='pcert_list_size'/>
       <parameter type-id='type-id-27' name='file'/>
-      <parameter type-id='type-id-421' name='format'/>
-      <parameter type-id='type-id-375' name='pin_fn'/>
+      <parameter type-id='type-id-424' name='format'/>
+      <parameter type-id='type-id-378' name='pin_fn'/>
       <parameter type-id='type-id-101' name='pin_fn_userdata'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pcert_list_import_x509_raw' mangled-name='gnutls_pcert_list_import_x509_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pcert_list_import_x509_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-161' name='pcert_list'/>
-      <parameter type-id='type-id-419' name='pcert_list_size'/>
+      <parameter type-id='type-id-162' name='pcert_list'/>
+      <parameter type-id='type-id-422' name='pcert_list_size'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pcert_import_x509_list' mangled-name='gnutls_pcert_import_x509_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pcert_import_x509_list@@GNUTLS_3_4'>
-      <parameter type-id='type-id-161' name='pcert_list'/>
-      <parameter type-id='type-id-458' name='crt'/>
-      <parameter type-id='type-id-419' name='ncrt'/>
+      <parameter type-id='type-id-162' name='pcert_list'/>
+      <parameter type-id='type-id-461' name='crt'/>
+      <parameter type-id='type-id-422' name='ncrt'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pcert_import_x509' mangled-name='gnutls_pcert_import_x509' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pcert_import_x509@@GNUTLS_3_4'>
-      <parameter type-id='type-id-161' name='pcert'/>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-162' name='pcert'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pcert_import_rawpk_raw' mangled-name='gnutls_pcert_import_rawpk_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pcert_import_rawpk_raw@@GNUTLS_3_6_6'>
-      <parameter type-id='type-id-161' name='pcert'/>
+      <parameter type-id='type-id-162' name='pcert'/>
       <parameter type-id='type-id-57' name='rawpubkey'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-10' name='key_usage'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
@@ -9676,45 +9742,45 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pubkey.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pubkey.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_pubkey_set_spki' mangled-name='gnutls_pubkey_set_spki' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_set_spki@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-267' name='pubkey'/>
-      <parameter type-id='type-id-758' name='spki'/>
+      <parameter type-id='type-id-270' name='pubkey'/>
+      <parameter type-id='type-id-761' name='spki'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_get_spki' mangled-name='gnutls_pubkey_get_spki' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_get_spki@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-267' name='pubkey'/>
-      <parameter type-id='type-id-757' name='spki'/>
+      <parameter type-id='type-id-270' name='pubkey'/>
+      <parameter type-id='type-id-760' name='spki'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_verify_params' mangled-name='gnutls_pubkey_verify_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_verify_params@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-270' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_x509_raw' mangled-name='gnutls_pubkey_import_x509_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_x509_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='pkey'/>
+      <parameter type-id='type-id-270' name='pkey'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_set_pin_function' mangled-name='gnutls_pubkey_set_pin_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_set_pin_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-375' name='fn'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-378' name='fn'/>
       <parameter type-id='type-id-101' name='userdata'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_encrypt_data' mangled-name='gnutls_pubkey_encrypt_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_encrypt_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-270' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='plaintext'/>
-      <parameter type-id='type-id-275' name='ciphertext'/>
+      <parameter type-id='type-id-278' name='ciphertext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_verify_hash2' mangled-name='gnutls_pubkey_verify_hash2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_verify_hash2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-270' name='key'/>
       <parameter type-id='type-id-21' name='algo'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='hash'/>
@@ -9722,7 +9788,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_verify_data2' mangled-name='gnutls_pubkey_verify_data2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_verify_data2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='pubkey'/>
+      <parameter type-id='type-id-270' name='pubkey'/>
       <parameter type-id='type-id-21' name='algo'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='data'/>
@@ -9730,7 +9796,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_dsa_raw' mangled-name='gnutls_pubkey_import_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-270' name='key'/>
       <parameter type-id='type-id-57' name='p'/>
       <parameter type-id='type-id-57' name='q'/>
       <parameter type-id='type-id-57' name='g'/>
@@ -9738,166 +9804,166 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_gost_raw' mangled-name='gnutls_pubkey_import_gost_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_gost_raw@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-270' name='key'/>
       <parameter type-id='type-id-59' name='curve'/>
-      <parameter type-id='type-id-211' name='digest'/>
-      <parameter type-id='type-id-315' name='paramset'/>
+      <parameter type-id='type-id-212' name='digest'/>
+      <parameter type-id='type-id-318' name='paramset'/>
       <parameter type-id='type-id-57' name='x'/>
       <parameter type-id='type-id-57' name='y'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_ecc_x962' mangled-name='gnutls_pubkey_import_ecc_x962' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_ecc_x962@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-270' name='key'/>
       <parameter type-id='type-id-57' name='parameters'/>
       <parameter type-id='type-id-57' name='ecpoint'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_ecc_raw' mangled-name='gnutls_pubkey_import_ecc_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_ecc_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-270' name='key'/>
       <parameter type-id='type-id-59' name='curve'/>
       <parameter type-id='type-id-57' name='x'/>
       <parameter type-id='type-id-57' name='y'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_rsa_raw' mangled-name='gnutls_pubkey_import_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-270' name='key'/>
       <parameter type-id='type-id-57' name='m'/>
       <parameter type-id='type-id-57' name='e'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_url' mangled-name='gnutls_pubkey_import_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-270' name='key'/>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_set_key_usage' mangled-name='gnutls_pubkey_set_key_usage' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_set_key_usage@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-270' name='key'/>
       <parameter type-id='type-id-10' name='usage'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_x509_crq_int' size-in-bits='64' is-struct='yes' visibility='default' id='type-id-766'>
+    <class-decl name='gnutls_x509_crq_int' size-in-bits='64' is-struct='yes' visibility='default' id='type-id-769'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='crq' type-id='type-id-387' visibility='default'/>
+        <var-decl name='crq' type-id='type-id-390' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-766' size-in-bits='64' id='type-id-767'/>
-    <typedef-decl name='gnutls_x509_crq_t' type-id='type-id-767' id='type-id-768'/>
+    <pointer-type-def type-id='type-id-769' size-in-bits='64' id='type-id-770'/>
+    <typedef-decl name='gnutls_x509_crq_t' type-id='type-id-770' id='type-id-771'/>
     <function-decl name='gnutls_x509_crq_set_pubkey' mangled-name='gnutls_x509_crq_set_pubkey' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_pubkey@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-270' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_pubkey' mangled-name='gnutls_x509_crt_set_pubkey' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_pubkey@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-270' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import' mangled-name='gnutls_pubkey_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-270' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_gost_raw2' mangled-name='gnutls_pubkey_export_gost_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_gost_raw2@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-431' name='digest'/>
-      <parameter type-id='type-id-712' name='paramset'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-714' name='curve'/>
+      <parameter type-id='type-id-434' name='digest'/>
+      <parameter type-id='type-id-715' name='paramset'/>
+      <parameter type-id='type-id-278' name='x'/>
+      <parameter type-id='type-id-278' name='y'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_ecc_x962' mangled-name='gnutls_pubkey_export_ecc_x962' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_ecc_x962@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-275' name='parameters'/>
-      <parameter type-id='type-id-275' name='ecpoint'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-278' name='parameters'/>
+      <parameter type-id='type-id-278' name='ecpoint'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_ecc_raw2' mangled-name='gnutls_pubkey_export_ecc_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_ecc_raw2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-714' name='curve'/>
+      <parameter type-id='type-id-278' name='x'/>
+      <parameter type-id='type-id-278' name='y'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_ecc_raw' mangled-name='gnutls_pubkey_export_ecc_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_ecc_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-714' name='curve'/>
+      <parameter type-id='type-id-278' name='x'/>
+      <parameter type-id='type-id-278' name='y'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_dsa_raw2' mangled-name='gnutls_pubkey_export_dsa_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_dsa_raw2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='g'/>
+      <parameter type-id='type-id-278' name='y'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_dsa_raw' mangled-name='gnutls_pubkey_export_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='g'/>
+      <parameter type-id='type-id-278' name='y'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_rsa_raw' mangled-name='gnutls_pubkey_export_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-278' name='m'/>
+      <parameter type-id='type-id-278' name='e'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export_rsa_raw2' mangled-name='gnutls_pubkey_export_rsa_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export_rsa_raw2@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-278' name='m'/>
+      <parameter type-id='type-id-278' name='e'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_get_key_id' mangled-name='gnutls_pubkey_get_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_get_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-270' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export2' mangled-name='gnutls_pubkey_export2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-421' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-424' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export' mangled-name='gnutls_pubkey_export' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_export@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-101' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_pkcs11_obj_st' size-in-bits='1152' is-struct='yes' visibility='default' id='type-id-769'>
+    <class-decl name='gnutls_pkcs11_obj_st' size-in-bits='1152' is-struct='yes' visibility='default' id='type-id-772'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='raw' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='type' type-id='type-id-770' visibility='default'/>
+        <var-decl name='type' type-id='type-id-773' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='class' type-id='type-id-771' visibility='default'/>
+        <var-decl name='class' type-id='type-id-774' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='info' type-id='type-id-535' visibility='default'/>
+        <var-decl name='info' type-id='type-id-538' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='pubkey' type-id='type-id-772' visibility='default'/>
+        <var-decl name='pubkey' type-id='type-id-775' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <var-decl name='pubkey_size' type-id='type-id-10' visibility='default'/>
@@ -9909,10 +9975,10 @@
         <var-decl name='key_usage' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-377' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-773'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-776'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_X509_CRT' value='1'/>
@@ -9922,63 +9988,63 @@
       <enumerator name='GNUTLS_PKCS11_OBJ_DATA' value='5'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_X509_CRT_EXTENSION' value='6'/>
     </enum-decl>
-    <typedef-decl name='gnutls_pkcs11_obj_type_t' type-id='type-id-773' id='type-id-770'/>
-    <typedef-decl name='ck_object_class_t' type-id='type-id-38' id='type-id-771'/>
+    <typedef-decl name='gnutls_pkcs11_obj_type_t' type-id='type-id-776' id='type-id-773'/>
+    <typedef-decl name='ck_object_class_t' type-id='type-id-38' id='type-id-774'/>
 
-    <array-type-def dimensions='1' type-id='type-id-62' size-in-bits='512' id='type-id-772'>
+    <array-type-def dimensions='1' type-id='type-id-62' size-in-bits='512' id='type-id-775'>
       <subrange length='4' type-id='type-id-38' id='type-id-136'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-769' size-in-bits='64' id='type-id-774'/>
-    <typedef-decl name='gnutls_pkcs11_obj_t' type-id='type-id-774' id='type-id-775'/>
+    <pointer-type-def type-id='type-id-772' size-in-bits='64' id='type-id-777'/>
+    <typedef-decl name='gnutls_pkcs11_obj_t' type-id='type-id-777' id='type-id-778'/>
     <function-decl name='gnutls_pubkey_import_pkcs11' mangled-name='gnutls_pubkey_import_pkcs11' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_pkcs11@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-775' name='obj'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-778' name='obj'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_get_preferred_hash_algorithm' mangled-name='gnutls_pubkey_get_preferred_hash_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_get_preferred_hash_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-431' name='hash'/>
-      <parameter type-id='type-id-419' name='mand'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-434' name='hash'/>
+      <parameter type-id='type-id-422' name='mand'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_privkey' mangled-name='gnutls_pubkey_import_privkey' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_privkey@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-404' name='pkey'/>
       <parameter type-id='type-id-10' name='usage'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_x509_crq' mangled-name='gnutls_pubkey_import_x509_crq' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_x509_crq@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_x509' mangled-name='gnutls_pubkey_import_x509' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_x509@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_deinit' mangled-name='gnutls_pubkey_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-270' name='key'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-776'/>
+    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-779'/>
     <function-decl name='gnutls_pubkey_init' mangled-name='gnutls_pubkey_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-776' name='key'/>
+      <parameter type-id='type-id-779' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_get_key_usage' mangled-name='gnutls_pubkey_get_key_usage' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_get_key_usage@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-419' name='usage'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-422' name='usage'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_get_pk_algorithm' mangled-name='gnutls_pubkey_get_pk_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_get_pk_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
-      <parameter type-id='type-id-419' name='usage'/>
+      <parameter type-id='type-id-270' name='key'/>
+      <parameter type-id='type-id-422' name='usage'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_pk_are_compat' mangled-name='_gnutls_pk_are_compat' visibility='default' binding='global' size-in-bits='64'>
@@ -10096,33 +10162,33 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='locks.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-777' size-in-bits='64' id='type-id-778'/>
-    <typedef-decl name='mutex_init_func' type-id='type-id-778' id='type-id-779'/>
-    <typedef-decl name='mutex_deinit_func' type-id='type-id-778' id='type-id-780'/>
-    <typedef-decl name='mutex_lock_func' type-id='type-id-778' id='type-id-781'/>
-    <typedef-decl name='mutex_unlock_func' type-id='type-id-778' id='type-id-782'/>
+  <abi-instr version='1.0' address-size='64' path='locks.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-780' size-in-bits='64' id='type-id-781'/>
+    <typedef-decl name='mutex_init_func' type-id='type-id-781' id='type-id-782'/>
+    <typedef-decl name='mutex_deinit_func' type-id='type-id-781' id='type-id-783'/>
+    <typedef-decl name='mutex_lock_func' type-id='type-id-781' id='type-id-784'/>
+    <typedef-decl name='mutex_unlock_func' type-id='type-id-781' id='type-id-785'/>
     <function-decl name='gnutls_global_set_mutex' mangled-name='gnutls_global_set_mutex' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_global_set_mutex@@GNUTLS_3_4'>
-      <parameter type-id='type-id-779' name='init'/>
-      <parameter type-id='type-id-780' name='deinit'/>
-      <parameter type-id='type-id-781' name='lock'/>
-      <parameter type-id='type-id-782' name='unlock'/>
+      <parameter type-id='type-id-782' name='init'/>
+      <parameter type-id='type-id-783' name='deinit'/>
+      <parameter type-id='type-id-784' name='lock'/>
+      <parameter type-id='type-id-785' name='unlock'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_global_init' mangled-name='gnutls_global_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-777'>
-      <parameter type-id='type-id-430'/>
+    <function-type size-in-bits='64' id='type-id-780'>
+      <parameter type-id='type-id-433'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dtls.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dtls.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_record_get_discarded' mangled-name='gnutls_record_get_discarded' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_get_discarded@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-783' visibility='default' id='type-id-784'>
+    <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-786' visibility='default' id='type-id-787'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='record_seq' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -10133,57 +10199,57 @@
         <var-decl name='hsk_write_seq' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_dtls_prestate_st' type-id='type-id-784' id='type-id-783'/>
-    <pointer-type-def type-id='type-id-783' size-in-bits='64' id='type-id-785'/>
+    <typedef-decl name='gnutls_dtls_prestate_st' type-id='type-id-787' id='type-id-786'/>
+    <pointer-type-def type-id='type-id-786' size-in-bits='64' id='type-id-788'/>
     <function-decl name='gnutls_dtls_prestate_set' mangled-name='gnutls_dtls_prestate_set' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_prestate_set@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-785' name='prestate'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-788' name='prestate'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_dtls_cookie_verify' mangled-name='gnutls_dtls_cookie_verify' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_cookie_verify@@GNUTLS_3_4'>
-      <parameter type-id='type-id-275' name='key'/>
+      <parameter type-id='type-id-278' name='key'/>
       <parameter type-id='type-id-101' name='client_data'/>
       <parameter type-id='type-id-99' name='client_data_size'/>
       <parameter type-id='type-id-101' name='_msg'/>
       <parameter type-id='type-id-99' name='msg_size'/>
-      <parameter type-id='type-id-785' name='prestate'/>
+      <parameter type-id='type-id-788' name='prestate'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dtls_cookie_send' mangled-name='gnutls_dtls_cookie_send' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_cookie_send@@GNUTLS_3_4'>
-      <parameter type-id='type-id-275' name='key'/>
+      <parameter type-id='type-id-278' name='key'/>
       <parameter type-id='type-id-101' name='client_data'/>
       <parameter type-id='type-id-99' name='client_data_size'/>
-      <parameter type-id='type-id-785' name='prestate'/>
+      <parameter type-id='type-id-788' name='prestate'/>
       <parameter type-id='type-id-154' name='ptr'/>
       <parameter type-id='type-id-151' name='push_func'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dtls_get_timeout' mangled-name='gnutls_dtls_get_timeout' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_get_timeout@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_dtls_get_mtu' mangled-name='gnutls_dtls_get_mtu' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_get_mtu@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_dtls_set_data_mtu' mangled-name='gnutls_dtls_set_data_mtu' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_set_data_mtu@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='mtu'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dtls_get_data_mtu' mangled-name='gnutls_dtls_get_data_mtu' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_get_data_mtu@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_record_overhead_size' mangled-name='gnutls_record_overhead_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_overhead_size@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-99'/>
     </function-decl>
     <function-decl name='gnutls_est_record_overhead_size' mangled-name='gnutls_est_record_overhead_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_est_record_overhead_size@@GNUTLS_3_4'>
       <parameter type-id='type-id-32' name='version'/>
       <parameter type-id='type-id-29' name='cipher'/>
       <parameter type-id='type-id-31' name='mac'/>
-      <parameter type-id='type-id-367' name='comp'/>
+      <parameter type-id='type-id-370' name='comp'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-99'/>
     </function-decl>
@@ -10195,12 +10261,12 @@
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_dtls_set_mtu' mangled-name='gnutls_dtls_set_mtu' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_set_mtu@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='mtu'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_dtls_set_timeouts' mangled-name='gnutls_dtls_set_timeouts' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dtls_set_timeouts@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='retrans_timeout'/>
       <parameter type-id='type-id-10' name='total_timeout'/>
       <return type-id='type-id-111'/>
@@ -10212,134 +10278,134 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='system_override.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system_override.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_transport_set_errno_function' mangled-name='gnutls_transport_set_errno_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_errno_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-153' name='errno_func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_vec_push_function' mangled-name='gnutls_transport_set_vec_push_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_vec_push_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-152' name='vec_func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_push_function' mangled-name='gnutls_transport_set_push_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_push_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-151' name='push_func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_pull_timeout_function' mangled-name='gnutls_transport_set_pull_timeout_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_pull_timeout_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-149' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_pull_function' mangled-name='gnutls_transport_set_pull_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_pull_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-150' name='pull_func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_transport_set_errno' mangled-name='gnutls_transport_set_errno' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_transport_set_errno@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-22' name='err'/>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='crypto-backend.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crypto-backend.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <var-decl name='crypto_mac_prio' type-id='type-id-22' visibility='default'/>
     <var-decl name='crypto_digest_prio' type-id='type-id-22' visibility='default'/>
     <var-decl name='crypto_cipher_prio' type-id='type-id-22' visibility='default'/>
-    <pointer-type-def type-id='type-id-786' size-in-bits='64' id='type-id-787'/>
-    <typedef-decl name='gnutls_digest_init_func' type-id='type-id-787' id='type-id-788'/>
-    <typedef-decl name='gnutls_digest_hash_func' type-id='type-id-117' id='type-id-789'/>
-    <typedef-decl name='gnutls_digest_output_func' type-id='type-id-117' id='type-id-790'/>
-    <typedef-decl name='gnutls_digest_deinit_func' type-id='type-id-121' id='type-id-791'/>
-    <pointer-type-def type-id='type-id-792' size-in-bits='64' id='type-id-793'/>
-    <typedef-decl name='gnutls_digest_fast_func' type-id='type-id-793' id='type-id-794'/>
+    <pointer-type-def type-id='type-id-789' size-in-bits='64' id='type-id-790'/>
+    <typedef-decl name='gnutls_digest_init_func' type-id='type-id-790' id='type-id-791'/>
+    <typedef-decl name='gnutls_digest_hash_func' type-id='type-id-117' id='type-id-792'/>
+    <typedef-decl name='gnutls_digest_output_func' type-id='type-id-117' id='type-id-793'/>
+    <typedef-decl name='gnutls_digest_deinit_func' type-id='type-id-121' id='type-id-794'/>
+    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-796'/>
+    <typedef-decl name='gnutls_digest_fast_func' type-id='type-id-796' id='type-id-797'/>
     <function-decl name='gnutls_crypto_register_digest' mangled-name='gnutls_crypto_register_digest' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_crypto_register_digest@@GNUTLS_3_4'>
-      <parameter type-id='type-id-211' name='algorithm'/>
+      <parameter type-id='type-id-212' name='algorithm'/>
       <parameter type-id='type-id-22' name='priority'/>
-      <parameter type-id='type-id-788' name='init'/>
-      <parameter type-id='type-id-789' name='hash'/>
-      <parameter type-id='type-id-790' name='output'/>
-      <parameter type-id='type-id-791' name='deinit'/>
-      <parameter type-id='type-id-794' name='hash_fast'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-796'/>
-    <typedef-decl name='gnutls_mac_init_func' type-id='type-id-796' id='type-id-797'/>
-    <typedef-decl name='gnutls_mac_setkey_func' type-id='type-id-117' id='type-id-798'/>
-    <typedef-decl name='gnutls_mac_setnonce_func' type-id='type-id-117' id='type-id-799'/>
-    <typedef-decl name='gnutls_mac_hash_func' type-id='type-id-117' id='type-id-800'/>
-    <typedef-decl name='gnutls_mac_output_func' type-id='type-id-117' id='type-id-801'/>
-    <typedef-decl name='gnutls_mac_deinit_func' type-id='type-id-121' id='type-id-802'/>
-    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-804'/>
-    <typedef-decl name='gnutls_mac_fast_func' type-id='type-id-804' id='type-id-805'/>
+      <parameter type-id='type-id-791' name='init'/>
+      <parameter type-id='type-id-792' name='hash'/>
+      <parameter type-id='type-id-793' name='output'/>
+      <parameter type-id='type-id-794' name='deinit'/>
+      <parameter type-id='type-id-797' name='hash_fast'/>
+      <return type-id='type-id-22'/>
+    </function-decl>
+    <pointer-type-def type-id='type-id-798' size-in-bits='64' id='type-id-799'/>
+    <typedef-decl name='gnutls_mac_init_func' type-id='type-id-799' id='type-id-800'/>
+    <typedef-decl name='gnutls_mac_setkey_func' type-id='type-id-117' id='type-id-801'/>
+    <typedef-decl name='gnutls_mac_setnonce_func' type-id='type-id-117' id='type-id-802'/>
+    <typedef-decl name='gnutls_mac_hash_func' type-id='type-id-117' id='type-id-803'/>
+    <typedef-decl name='gnutls_mac_output_func' type-id='type-id-117' id='type-id-804'/>
+    <typedef-decl name='gnutls_mac_deinit_func' type-id='type-id-121' id='type-id-805'/>
+    <pointer-type-def type-id='type-id-806' size-in-bits='64' id='type-id-807'/>
+    <typedef-decl name='gnutls_mac_fast_func' type-id='type-id-807' id='type-id-808'/>
     <function-decl name='gnutls_crypto_register_mac' mangled-name='gnutls_crypto_register_mac' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_crypto_register_mac@@GNUTLS_3_4'>
       <parameter type-id='type-id-31' name='algorithm'/>
       <parameter type-id='type-id-22' name='priority'/>
-      <parameter type-id='type-id-797' name='init'/>
-      <parameter type-id='type-id-798' name='setkey'/>
-      <parameter type-id='type-id-799' name='setnonce'/>
-      <parameter type-id='type-id-800' name='hash'/>
-      <parameter type-id='type-id-801' name='output'/>
-      <parameter type-id='type-id-802' name='deinit'/>
-      <parameter type-id='type-id-805' name='hash_fast'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <pointer-type-def type-id='type-id-806' size-in-bits='64' id='type-id-807'/>
-    <typedef-decl name='gnutls_cipher_init_func' type-id='type-id-807' id='type-id-808'/>
-    <typedef-decl name='gnutls_cipher_setkey_func' type-id='type-id-117' id='type-id-809'/>
-    <typedef-decl name='gnutls_cipher_aead_encrypt_func' type-id='type-id-115' id='type-id-810'/>
-    <typedef-decl name='gnutls_cipher_aead_decrypt_func' type-id='type-id-115' id='type-id-811'/>
-    <typedef-decl name='gnutls_cipher_deinit_func' type-id='type-id-121' id='type-id-812'/>
+      <parameter type-id='type-id-800' name='init'/>
+      <parameter type-id='type-id-801' name='setkey'/>
+      <parameter type-id='type-id-802' name='setnonce'/>
+      <parameter type-id='type-id-803' name='hash'/>
+      <parameter type-id='type-id-804' name='output'/>
+      <parameter type-id='type-id-805' name='deinit'/>
+      <parameter type-id='type-id-808' name='hash_fast'/>
+      <return type-id='type-id-22'/>
+    </function-decl>
+    <pointer-type-def type-id='type-id-809' size-in-bits='64' id='type-id-810'/>
+    <typedef-decl name='gnutls_cipher_init_func' type-id='type-id-810' id='type-id-811'/>
+    <typedef-decl name='gnutls_cipher_setkey_func' type-id='type-id-117' id='type-id-812'/>
+    <typedef-decl name='gnutls_cipher_aead_encrypt_func' type-id='type-id-115' id='type-id-813'/>
+    <typedef-decl name='gnutls_cipher_aead_decrypt_func' type-id='type-id-115' id='type-id-814'/>
+    <typedef-decl name='gnutls_cipher_deinit_func' type-id='type-id-121' id='type-id-815'/>
     <function-decl name='gnutls_crypto_register_aead_cipher' mangled-name='gnutls_crypto_register_aead_cipher' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_crypto_register_aead_cipher@@GNUTLS_3_4'>
       <parameter type-id='type-id-29' name='algorithm'/>
       <parameter type-id='type-id-22' name='priority'/>
-      <parameter type-id='type-id-808' name='init'/>
-      <parameter type-id='type-id-809' name='setkey'/>
-      <parameter type-id='type-id-810' name='aead_encrypt'/>
-      <parameter type-id='type-id-811' name='aead_decrypt'/>
-      <parameter type-id='type-id-812' name='deinit'/>
+      <parameter type-id='type-id-811' name='init'/>
+      <parameter type-id='type-id-812' name='setkey'/>
+      <parameter type-id='type-id-813' name='aead_encrypt'/>
+      <parameter type-id='type-id-814' name='aead_decrypt'/>
+      <parameter type-id='type-id-815' name='deinit'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <typedef-decl name='gnutls_cipher_setiv_func' type-id='type-id-117' id='type-id-813'/>
-    <typedef-decl name='gnutls_cipher_encrypt_func' type-id='type-id-113' id='type-id-814'/>
-    <typedef-decl name='gnutls_cipher_decrypt_func' type-id='type-id-113' id='type-id-815'/>
+    <typedef-decl name='gnutls_cipher_setiv_func' type-id='type-id-117' id='type-id-816'/>
+    <typedef-decl name='gnutls_cipher_encrypt_func' type-id='type-id-113' id='type-id-817'/>
+    <typedef-decl name='gnutls_cipher_decrypt_func' type-id='type-id-113' id='type-id-818'/>
     <function-decl name='gnutls_crypto_register_cipher' mangled-name='gnutls_crypto_register_cipher' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_crypto_register_cipher@@GNUTLS_3_4'>
       <parameter type-id='type-id-29' name='algorithm'/>
       <parameter type-id='type-id-22' name='priority'/>
-      <parameter type-id='type-id-808' name='init'/>
-      <parameter type-id='type-id-809' name='setkey'/>
-      <parameter type-id='type-id-813' name='setiv'/>
-      <parameter type-id='type-id-814' name='encrypt'/>
-      <parameter type-id='type-id-815' name='decrypt'/>
-      <parameter type-id='type-id-812' name='deinit'/>
+      <parameter type-id='type-id-811' name='init'/>
+      <parameter type-id='type-id-812' name='setkey'/>
+      <parameter type-id='type-id-816' name='setiv'/>
+      <parameter type-id='type-id-817' name='encrypt'/>
+      <parameter type-id='type-id-818' name='decrypt'/>
+      <parameter type-id='type-id-815' name='deinit'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-806'>
+    <function-type size-in-bits='64' id='type-id-809'>
       <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-430'/>
+      <parameter type-id='type-id-433'/>
       <parameter type-id='type-id-22'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-786'>
-      <parameter type-id='type-id-211'/>
-      <parameter type-id='type-id-430'/>
+    <function-type size-in-bits='64' id='type-id-789'>
+      <parameter type-id='type-id-212'/>
+      <parameter type-id='type-id-433'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-792'>
-      <parameter type-id='type-id-211'/>
+    <function-type size-in-bits='64' id='type-id-795'>
+      <parameter type-id='type-id-212'/>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-99'/>
       <parameter type-id='type-id-101'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-795'>
+    <function-type size-in-bits='64' id='type-id-798'>
       <parameter type-id='type-id-31'/>
-      <parameter type-id='type-id-430'/>
+      <parameter type-id='type-id-433'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-803'>
+    <function-type size-in-bits='64' id='type-id-806'>
       <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-99'/>
@@ -10351,56 +10417,56 @@
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='verify-tofu.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_tdb_int' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-816'>
+  <abi-instr version='1.0' address-size='64' path='verify-tofu.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_tdb_int' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-819'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='store' type-id='type-id-817' visibility='default'/>
+        <var-decl name='store' type-id='type-id-820' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cstore' type-id='type-id-818' visibility='default'/>
+        <var-decl name='cstore' type-id='type-id-821' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='verify' type-id='type-id-819' visibility='default'/>
+        <var-decl name='verify' type-id='type-id-822' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-820' size-in-bits='64' id='type-id-821'/>
-    <typedef-decl name='gnutls_tdb_store_func' type-id='type-id-821' id='type-id-817'/>
-    <pointer-type-def type-id='type-id-822' size-in-bits='64' id='type-id-823'/>
-    <typedef-decl name='gnutls_tdb_store_commitment_func' type-id='type-id-823' id='type-id-818'/>
-    <pointer-type-def type-id='type-id-824' size-in-bits='64' id='type-id-825'/>
-    <typedef-decl name='gnutls_tdb_verify_func' type-id='type-id-825' id='type-id-819'/>
-    <pointer-type-def type-id='type-id-816' size-in-bits='64' id='type-id-826'/>
-    <typedef-decl name='gnutls_tdb_t' type-id='type-id-826' id='type-id-827'/>
+    <pointer-type-def type-id='type-id-823' size-in-bits='64' id='type-id-824'/>
+    <typedef-decl name='gnutls_tdb_store_func' type-id='type-id-824' id='type-id-820'/>
+    <pointer-type-def type-id='type-id-825' size-in-bits='64' id='type-id-826'/>
+    <typedef-decl name='gnutls_tdb_store_commitment_func' type-id='type-id-826' id='type-id-821'/>
+    <pointer-type-def type-id='type-id-827' size-in-bits='64' id='type-id-828'/>
+    <typedef-decl name='gnutls_tdb_verify_func' type-id='type-id-828' id='type-id-822'/>
+    <pointer-type-def type-id='type-id-819' size-in-bits='64' id='type-id-829'/>
+    <typedef-decl name='gnutls_tdb_t' type-id='type-id-829' id='type-id-830'/>
     <function-decl name='gnutls_tdb_deinit' mangled-name='gnutls_tdb_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_tdb_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-827' name='tdb'/>
+      <parameter type-id='type-id-830' name='tdb'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_tdb_set_verify_func' mangled-name='gnutls_tdb_set_verify_func' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_tdb_set_verify_func@@GNUTLS_3_4'>
-      <parameter type-id='type-id-827' name='tdb'/>
-      <parameter type-id='type-id-819' name='verify'/>
+      <parameter type-id='type-id-830' name='tdb'/>
+      <parameter type-id='type-id-822' name='verify'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_tdb_set_store_commitment_func' mangled-name='gnutls_tdb_set_store_commitment_func' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_tdb_set_store_commitment_func@@GNUTLS_3_4'>
-      <parameter type-id='type-id-827' name='tdb'/>
-      <parameter type-id='type-id-818' name='cstore'/>
+      <parameter type-id='type-id-830' name='tdb'/>
+      <parameter type-id='type-id-821' name='cstore'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_tdb_set_store_func' mangled-name='gnutls_tdb_set_store_func' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_tdb_set_store_func@@GNUTLS_3_4'>
-      <parameter type-id='type-id-827' name='tdb'/>
-      <parameter type-id='type-id-817' name='store'/>
+      <parameter type-id='type-id-830' name='tdb'/>
+      <parameter type-id='type-id-820' name='store'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-827' size-in-bits='64' id='type-id-828'/>
+    <pointer-type-def type-id='type-id-830' size-in-bits='64' id='type-id-831'/>
     <function-decl name='gnutls_tdb_init' mangled-name='gnutls_tdb_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_tdb_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-828' name='tdb'/>
+      <parameter type-id='type-id-831' name='tdb'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_store_commitment' mangled-name='gnutls_store_commitment' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_store_commitment@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='db_name'/>
-      <parameter type-id='type-id-827' name='tdb'/>
+      <parameter type-id='type-id-830' name='tdb'/>
       <parameter type-id='type-id-27' name='host'/>
       <parameter type-id='type-id-27' name='service'/>
-      <parameter type-id='type-id-211' name='hash_algo'/>
+      <parameter type-id='type-id-212' name='hash_algo'/>
       <parameter type-id='type-id-57' name='hash'/>
       <parameter type-id='type-id-17' name='expiration'/>
       <parameter type-id='type-id-10' name='flags'/>
@@ -10408,7 +10474,7 @@
     </function-decl>
     <function-decl name='gnutls_store_pubkey' mangled-name='gnutls_store_pubkey' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_store_pubkey@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='db_name'/>
-      <parameter type-id='type-id-827' name='tdb'/>
+      <parameter type-id='type-id-830' name='tdb'/>
       <parameter type-id='type-id-27' name='host'/>
       <parameter type-id='type-id-27' name='service'/>
       <parameter type-id='type-id-19' name='cert_type'/>
@@ -10419,7 +10485,7 @@
     </function-decl>
     <function-decl name='gnutls_verify_stored_pubkey' mangled-name='gnutls_verify_stored_pubkey' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_verify_stored_pubkey@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='db_name'/>
-      <parameter type-id='type-id-827' name='tdb'/>
+      <parameter type-id='type-id-830' name='tdb'/>
       <parameter type-id='type-id-27' name='host'/>
       <parameter type-id='type-id-27' name='service'/>
       <parameter type-id='type-id-19' name='cert_type'/>
@@ -10445,14 +10511,14 @@
     <function-decl name='__getdelim' mangled-name='__getdelim' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-824'>
+    <function-type size-in-bits='64' id='type-id-827'>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-57'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-820'>
+    <function-type size-in-bits='64' id='type-id-823'>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-27'/>
@@ -10460,176 +10526,176 @@
       <parameter type-id='type-id-57'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-822'>
+    <function-type size-in-bits='64' id='type-id-825'>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-211'/>
+      <parameter type-id='type-id-212'/>
       <parameter type-id='type-id-57'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pin.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <var-decl name='_gnutls_pin_func' type-id='type-id-375' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='pin.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <var-decl name='_gnutls_pin_func' type-id='type-id-378' visibility='default'/>
     <var-decl name='_gnutls_pin_data' type-id='type-id-101' visibility='default'/>
     <function-decl name='gnutls_pkcs11_get_pin_function' mangled-name='gnutls_pkcs11_get_pin_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_get_pin_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-430' name='userdata'/>
-      <return type-id='type-id-375'/>
+      <parameter type-id='type-id-433' name='userdata'/>
+      <return type-id='type-id-378'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_set_pin_function' mangled-name='gnutls_pkcs11_set_pin_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_set_pin_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-375' name='fn'/>
+      <parameter type-id='type-id-378' name='fn'/>
       <parameter type-id='type-id-101' name='userdata'/>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tpm.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tpm.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_tpm_privkey_delete' mangled-name='gnutls_tpm_privkey_delete' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_tpm_privkey_delete@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-27' name='srk_password'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='tpm_key_list_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-829'>
+    <class-decl name='tpm_key_list_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-832'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='size' type-id='type-id-830' visibility='default'/>
+        <var-decl name='size' type-id='type-id-833' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='ki' type-id='type-id-831' visibility='default'/>
+        <var-decl name='ki' type-id='type-id-834' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='tpm_ctx' type-id='type-id-832' visibility='default'/>
+        <var-decl name='tpm_ctx' type-id='type-id-835' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='UINT32' type-id='type-id-18' id='type-id-830'/>
-    <class-decl name='tdTSS_KM_KEYINFO2' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-833'>
+    <typedef-decl name='UINT32' type-id='type-id-18' id='type-id-833'/>
+    <class-decl name='tdTSS_KM_KEYINFO2' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-836'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='versionInfo' type-id='type-id-834' visibility='default'/>
+        <var-decl name='versionInfo' type-id='type-id-837' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='keyUUID' type-id='type-id-835' visibility='default'/>
+        <var-decl name='keyUUID' type-id='type-id-838' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='parentKeyUUID' type-id='type-id-835' visibility='default'/>
+        <var-decl name='parentKeyUUID' type-id='type-id-838' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='bAuthDataUsage' type-id='type-id-836' visibility='default'/>
+        <var-decl name='bAuthDataUsage' type-id='type-id-839' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='persistentStorageType' type-id='type-id-837' visibility='default'/>
+        <var-decl name='persistentStorageType' type-id='type-id-840' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='persistentStorageTypeParent' type-id='type-id-837' visibility='default'/>
+        <var-decl name='persistentStorageTypeParent' type-id='type-id-840' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='fIsLoaded' type-id='type-id-838' visibility='default'/>
+        <var-decl name='fIsLoaded' type-id='type-id-841' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='ulVendorDataLength' type-id='type-id-830' visibility='default'/>
+        <var-decl name='ulVendorDataLength' type-id='type-id-833' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='rgbVendorData' type-id='type-id-839' visibility='default'/>
+        <var-decl name='rgbVendorData' type-id='type-id-842' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='tdTSS_VERSION' size-in-bits='32' is-struct='yes' visibility='default' id='type-id-840'>
+    <class-decl name='tdTSS_VERSION' size-in-bits='32' is-struct='yes' visibility='default' id='type-id-843'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='bMajor' type-id='type-id-836' visibility='default'/>
+        <var-decl name='bMajor' type-id='type-id-839' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='bMinor' type-id='type-id-836' visibility='default'/>
+        <var-decl name='bMinor' type-id='type-id-839' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='bRevMajor' type-id='type-id-836' visibility='default'/>
+        <var-decl name='bRevMajor' type-id='type-id-839' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='bRevMinor' type-id='type-id-836' visibility='default'/>
+        <var-decl name='bRevMinor' type-id='type-id-839' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='BYTE' type-id='type-id-16' id='type-id-836'/>
-    <typedef-decl name='TSS_VERSION' type-id='type-id-840' id='type-id-834'/>
-    <class-decl name='tdTSS_UUID' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-841'>
+    <typedef-decl name='BYTE' type-id='type-id-16' id='type-id-839'/>
+    <typedef-decl name='TSS_VERSION' type-id='type-id-843' id='type-id-837'/>
+    <class-decl name='tdTSS_UUID' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-844'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ulTimeLow' type-id='type-id-830' visibility='default'/>
+        <var-decl name='ulTimeLow' type-id='type-id-833' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='usTimeMid' type-id='type-id-842' visibility='default'/>
+        <var-decl name='usTimeMid' type-id='type-id-845' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='usTimeHigh' type-id='type-id-842' visibility='default'/>
+        <var-decl name='usTimeHigh' type-id='type-id-845' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='bClockSeqHigh' type-id='type-id-836' visibility='default'/>
+        <var-decl name='bClockSeqHigh' type-id='type-id-839' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='72'>
-        <var-decl name='bClockSeqLow' type-id='type-id-836' visibility='default'/>
+        <var-decl name='bClockSeqLow' type-id='type-id-839' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='rgbNode' type-id='type-id-843' visibility='default'/>
+        <var-decl name='rgbNode' type-id='type-id-846' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='UINT16' type-id='type-id-11' id='type-id-842'/>
+    <typedef-decl name='UINT16' type-id='type-id-11' id='type-id-845'/>
 
-    <array-type-def dimensions='1' type-id='type-id-836' size-in-bits='48' id='type-id-843'>
-      <subrange length='6' type-id='type-id-38' id='type-id-230'/>
+    <array-type-def dimensions='1' type-id='type-id-839' size-in-bits='48' id='type-id-846'>
+      <subrange length='6' type-id='type-id-38' id='type-id-231'/>
 
     </array-type-def>
-    <typedef-decl name='TSS_UUID' type-id='type-id-841' id='type-id-835'/>
-    <typedef-decl name='TSS_FLAG' type-id='type-id-830' id='type-id-837'/>
-    <type-decl name='signed char' size-in-bits='8' id='type-id-844'/>
-    <typedef-decl name='__int8_t' type-id='type-id-844' id='type-id-845'/>
-    <typedef-decl name='int8_t' type-id='type-id-845' id='type-id-846'/>
-    <typedef-decl name='TSS_BOOL' type-id='type-id-846' id='type-id-838'/>
-    <pointer-type-def type-id='type-id-836' size-in-bits='64' id='type-id-839'/>
-    <typedef-decl name='TSS_KM_KEYINFO2' type-id='type-id-833' id='type-id-847'/>
-    <pointer-type-def type-id='type-id-847' size-in-bits='64' id='type-id-831'/>
-    <typedef-decl name='TSS_HOBJECT' type-id='type-id-830' id='type-id-848'/>
-    <typedef-decl name='TSS_HCONTEXT' type-id='type-id-848' id='type-id-832'/>
-    <pointer-type-def type-id='type-id-829' size-in-bits='64' id='type-id-849'/>
-    <typedef-decl name='gnutls_tpm_key_list_t' type-id='type-id-849' id='type-id-850'/>
-    <pointer-type-def type-id='type-id-850' size-in-bits='64' id='type-id-851'/>
+    <typedef-decl name='TSS_UUID' type-id='type-id-844' id='type-id-838'/>
+    <typedef-decl name='TSS_FLAG' type-id='type-id-833' id='type-id-840'/>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-847'/>
+    <typedef-decl name='__int8_t' type-id='type-id-847' id='type-id-848'/>
+    <typedef-decl name='int8_t' type-id='type-id-848' id='type-id-849'/>
+    <typedef-decl name='TSS_BOOL' type-id='type-id-849' id='type-id-841'/>
+    <pointer-type-def type-id='type-id-839' size-in-bits='64' id='type-id-842'/>
+    <typedef-decl name='TSS_KM_KEYINFO2' type-id='type-id-836' id='type-id-850'/>
+    <pointer-type-def type-id='type-id-850' size-in-bits='64' id='type-id-834'/>
+    <typedef-decl name='TSS_HOBJECT' type-id='type-id-833' id='type-id-851'/>
+    <typedef-decl name='TSS_HCONTEXT' type-id='type-id-851' id='type-id-835'/>
+    <pointer-type-def type-id='type-id-832' size-in-bits='64' id='type-id-852'/>
+    <typedef-decl name='gnutls_tpm_key_list_t' type-id='type-id-852' id='type-id-853'/>
+    <pointer-type-def type-id='type-id-853' size-in-bits='64' id='type-id-854'/>
     <function-decl name='gnutls_tpm_get_registered' mangled-name='gnutls_tpm_get_registered' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_tpm_get_registered@@GNUTLS_3_4'>
-      <parameter type-id='type-id-851' name='list'/>
+      <parameter type-id='type-id-854' name='list'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-852'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-855'/>
     <function-decl name='gnutls_tpm_key_list_get_url' mangled-name='gnutls_tpm_key_list_get_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_tpm_key_list_get_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-850' name='list'/>
+      <parameter type-id='type-id-853' name='list'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-852' name='url'/>
+      <parameter type-id='type-id-855' name='url'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_tpm_key_list_deinit' mangled-name='gnutls_tpm_key_list_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_tpm_key_list_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-850' name='list'/>
+      <parameter type-id='type-id-853' name='list'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-853'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-856'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_TPMKEY_FMT_RAW' value='0'/>
       <enumerator name='GNUTLS_TPMKEY_FMT_DER' value='0'/>
       <enumerator name='GNUTLS_TPMKEY_FMT_CTK_PEM' value='1'/>
     </enum-decl>
-    <typedef-decl name='gnutls_tpmkey_fmt_t' type-id='type-id-853' id='type-id-854'/>
+    <typedef-decl name='gnutls_tpmkey_fmt_t' type-id='type-id-856' id='type-id-857'/>
     <function-decl name='gnutls_tpm_privkey_generate' mangled-name='gnutls_tpm_privkey_generate' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_tpm_privkey_generate@@GNUTLS_3_4'>
       <parameter type-id='type-id-60' name='pk'/>
       <parameter type-id='type-id-10' name='bits'/>
       <parameter type-id='type-id-27' name='srk_password'/>
       <parameter type-id='type-id-27' name='key_password'/>
-      <parameter type-id='type-id-854' name='format'/>
-      <parameter type-id='type-id-421' name='pub_format'/>
-      <parameter type-id='type-id-275' name='privkey'/>
-      <parameter type-id='type-id-275' name='pubkey'/>
+      <parameter type-id='type-id-857' name='format'/>
+      <parameter type-id='type-id-424' name='pub_format'/>
+      <parameter type-id='type-id-278' name='privkey'/>
+      <parameter type-id='type-id-278' name='pubkey'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_tpm_url' mangled-name='gnutls_pubkey_import_tpm_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_tpm_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='pkey'/>
+      <parameter type-id='type-id-270' name='pkey'/>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-27' name='srk_password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_tpm_url' mangled-name='gnutls_privkey_import_tpm_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_tpm_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-404' name='pkey'/>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-27' name='srk_password'/>
       <parameter type-id='type-id-27' name='key_password'/>
@@ -10637,18 +10703,18 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_tpm_raw' mangled-name='gnutls_privkey_import_tpm_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_tpm_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-404' name='pkey'/>
       <parameter type-id='type-id-57' name='fdata'/>
-      <parameter type-id='type-id-854' name='format'/>
+      <parameter type-id='type-id-857' name='format'/>
       <parameter type-id='type-id-27' name='srk_password'/>
       <parameter type-id='type-id-27' name='key_password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_tpm_raw' mangled-name='gnutls_pubkey_import_tpm_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_import_tpm_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='pkey'/>
+      <parameter type-id='type-id-270' name='pkey'/>
       <parameter type-id='type-id-57' name='fdata'/>
-      <parameter type-id='type-id-854' name='format'/>
+      <parameter type-id='type-id-857' name='format'/>
       <parameter type-id='type-id-27' name='srk_password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
@@ -10699,7 +10765,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='fips.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='fips.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <var-decl name='_gnutls_lib_state' type-id='type-id-10' visibility='default'/>
     <function-decl name='_gnutls_lib_force_operational' mangled-name='_gnutls_lib_force_operational' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_lib_force_operational@@GNUTLS_PRIVATE_3_4'>
       <return type-id='type-id-111'/>
@@ -10707,7 +10773,7 @@
     <function-decl name='_gnutls_lib_simulate_error' mangled-name='_gnutls_lib_simulate_error' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_lib_simulate_error@@GNUTLS_PRIVATE_3_4'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <enum-decl name='gnutls_fips_mode_t' id='type-id-855'>
+    <enum-decl name='gnutls_fips_mode_t' id='type-id-858'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_FIPS140_DISABLED' value='0'/>
       <enumerator name='GNUTLS_FIPS140_STRICT' value='1'/>
@@ -10715,9 +10781,9 @@
       <enumerator name='GNUTLS_FIPS140_LAX' value='3'/>
       <enumerator name='GNUTLS_FIPS140_LOG' value='4'/>
     </enum-decl>
-    <typedef-decl name='gnutls_fips_mode_t' type-id='type-id-855' id='type-id-856'/>
+    <typedef-decl name='gnutls_fips_mode_t' type-id='type-id-858' id='type-id-859'/>
     <function-decl name='gnutls_fips140_set_mode' mangled-name='gnutls_fips140_set_mode' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_fips140_set_mode@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-856' name='mode'/>
+      <parameter type-id='type-id-859' name='mode'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -10725,7 +10791,7 @@
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='safe-memfuncs.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='safe-memfuncs.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_memcmp' mangled-name='gnutls_memcmp' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_memcmp@@GNUTLS_3_4'>
       <parameter type-id='type-id-101' name='s1'/>
       <parameter type-id='type-id-101' name='s2'/>
@@ -10738,37 +10804,37 @@
       <parameter type-id='type-id-99' name='size'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='explicit_bzero' mangled-name='explicit_bzero' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__explicit_bzero_chk' mangled-name='__explicit_bzero_chk' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='atfork.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='atfork.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <var-decl name='_gnutls_forkid' type-id='type-id-10' visibility='default'/>
     <function-decl name='__register_atfork' mangled-name='__register_atfork' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='randomart.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <enum-decl name='gnutls_random_art' id='type-id-857'>
+  <abi-instr version='1.0' address-size='64' path='randomart.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <enum-decl name='gnutls_random_art' id='type-id-860'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_RANDOM_ART_OPENSSH' value='1'/>
     </enum-decl>
-    <typedef-decl name='gnutls_random_art_t' type-id='type-id-857' id='type-id-858'/>
+    <typedef-decl name='gnutls_random_art_t' type-id='type-id-860' id='type-id-861'/>
     <function-decl name='gnutls_random_art' mangled-name='gnutls_random_art' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_random_art@@GNUTLS_3_4'>
-      <parameter type-id='type-id-858' name='type'/>
+      <parameter type-id='type-id-861' name='type'/>
       <parameter type-id='type-id-27' name='key_type'/>
       <parameter type-id='type-id-10' name='key_size'/>
       <parameter type-id='type-id-101' name='fpr'/>
       <parameter type-id='type-id-99' name='fpr_size'/>
-      <parameter type-id='type-id-275' name='art'/>
+      <parameter type-id='type-id-278' name='art'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_key_fingerprint_randomart' mangled-name='_gnutls_key_fingerprint_randomart' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='urls.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_custom_url_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-859'>
+  <abi-instr version='1.0' address-size='64' path='urls.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_custom_url_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-862'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
@@ -10776,16 +10842,16 @@
         <var-decl name='name_size' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='import_key' type-id='type-id-860' visibility='default'/>
+        <var-decl name='import_key' type-id='type-id-863' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='import_crt' type-id='type-id-861' visibility='default'/>
+        <var-decl name='import_crt' type-id='type-id-864' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='import_pubkey' type-id='type-id-862' visibility='default'/>
+        <var-decl name='import_pubkey' type-id='type-id-865' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='get_issuer' type-id='type-id-863' visibility='default'/>
+        <var-decl name='get_issuer' type-id='type-id-866' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='future1' type-id='type-id-101' visibility='default'/>
@@ -10794,30 +10860,30 @@
         <var-decl name='future2' type-id='type-id-101' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_privkey_t' type-id='type-id-162' id='type-id-864'/>
-    <pointer-type-def type-id='type-id-865' size-in-bits='64' id='type-id-866'/>
-    <typedef-decl name='gnutls_privkey_import_url_func' type-id='type-id-866' id='type-id-860'/>
-    <class-decl name='gnutls_x509_crt_int' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-867'/>
-    <pointer-type-def type-id='type-id-867' size-in-bits='64' id='type-id-868'/>
-    <typedef-decl name='gnutls_x509_crt_t' type-id='type-id-868' id='type-id-869'/>
+    <typedef-decl name='gnutls_privkey_t' type-id='type-id-163' id='type-id-867'/>
+    <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-869'/>
+    <typedef-decl name='gnutls_privkey_import_url_func' type-id='type-id-869' id='type-id-863'/>
+    <class-decl name='gnutls_x509_crt_int' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-870'/>
     <pointer-type-def type-id='type-id-870' size-in-bits='64' id='type-id-871'/>
-    <typedef-decl name='gnutls_x509_crt_import_url_func' type-id='type-id-871' id='type-id-861'/>
-    <pointer-type-def type-id='type-id-872' size-in-bits='64' id='type-id-873'/>
-    <typedef-decl name='gnutls_pubkey_import_url_func' type-id='type-id-873' id='type-id-862'/>
-    <pointer-type-def type-id='type-id-874' size-in-bits='64' id='type-id-875'/>
-    <typedef-decl name='gnutls_get_raw_issuer_func' type-id='type-id-875' id='type-id-863'/>
-    <typedef-decl name='gnutls_custom_url_st' type-id='type-id-859' id='type-id-876'/>
+    <typedef-decl name='gnutls_x509_crt_t' type-id='type-id-871' id='type-id-872'/>
+    <pointer-type-def type-id='type-id-873' size-in-bits='64' id='type-id-874'/>
+    <typedef-decl name='gnutls_x509_crt_import_url_func' type-id='type-id-874' id='type-id-864'/>
+    <pointer-type-def type-id='type-id-875' size-in-bits='64' id='type-id-876'/>
+    <typedef-decl name='gnutls_pubkey_import_url_func' type-id='type-id-876' id='type-id-865'/>
+    <pointer-type-def type-id='type-id-877' size-in-bits='64' id='type-id-878'/>
+    <typedef-decl name='gnutls_get_raw_issuer_func' type-id='type-id-878' id='type-id-866'/>
+    <typedef-decl name='gnutls_custom_url_st' type-id='type-id-862' id='type-id-879'/>
 
-    <array-type-def dimensions='1' type-id='type-id-876' size-in-bits='infinite' id='type-id-877'>
-      <subrange length='infinite' id='type-id-878'/>
+    <array-type-def dimensions='1' type-id='type-id-879' size-in-bits='infinite' id='type-id-880'>
+      <subrange length='infinite' id='type-id-881'/>
 
     </array-type-def>
-    <var-decl name='_gnutls_custom_urls' type-id='type-id-877' visibility='default'/>
+    <var-decl name='_gnutls_custom_urls' type-id='type-id-880' visibility='default'/>
     <var-decl name='_gnutls_custom_urls_size' type-id='type-id-10' visibility='default'/>
-    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-879'/>
-    <pointer-type-def type-id='type-id-879' size-in-bits='64' id='type-id-880'/>
+    <qualified-type-def type-id='type-id-879' const='yes' id='type-id-882'/>
+    <pointer-type-def type-id='type-id-882' size-in-bits='64' id='type-id-883'/>
     <function-decl name='gnutls_register_custom_url' mangled-name='gnutls_register_custom_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_register_custom_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-880' name='st'/>
+      <parameter type-id='type-id-883' name='st'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_url_is_supported' mangled-name='gnutls_url_is_supported' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_url_is_supported@@GNUTLS_3_4'>
@@ -10827,72 +10893,72 @@
     <function-decl name='gnutls_pkcs11_get_raw_issuer' mangled-name='gnutls_pkcs11_get_raw_issuer' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-874'>
+    <function-type size-in-bits='64' id='type-id-877'>
       <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-869'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-872'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-865'>
-      <parameter type-id='type-id-864'/>
+    <function-type size-in-bits='64' id='type-id-868'>
+      <parameter type-id='type-id-867'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-872'>
-      <parameter type-id='type-id-267'/>
+    <function-type size-in-bits='64' id='type-id-875'>
+      <parameter type-id='type-id-270'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-870'>
-      <parameter type-id='type-id-869'/>
+    <function-type size-in-bits='64' id='type-id-873'>
+      <parameter type-id='type-id-872'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='prf.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='prf.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_prf' mangled-name='gnutls_prf' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_prf@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-99' name='label_size'/>
       <parameter type-id='type-id-27' name='label'/>
       <parameter type-id='type-id-22' name='server_random_first'/>
       <parameter type-id='type-id-99' name='extra_size'/>
       <parameter type-id='type-id-27' name='extra'/>
       <parameter type-id='type-id-99' name='outsize'/>
-      <parameter type-id='type-id-376' name='out'/>
+      <parameter type-id='type-id-379' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_prf_early' mangled-name='gnutls_prf_early' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_prf_early@@GNUTLS_3_6_8'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-99' name='label_size'/>
       <parameter type-id='type-id-27' name='label'/>
       <parameter type-id='type-id-99' name='context_size'/>
       <parameter type-id='type-id-27' name='context'/>
       <parameter type-id='type-id-99' name='outsize'/>
-      <parameter type-id='type-id-376' name='out'/>
+      <parameter type-id='type-id-379' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_prf_rfc5705' mangled-name='gnutls_prf_rfc5705' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_prf_rfc5705@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-99' name='label_size'/>
       <parameter type-id='type-id-27' name='label'/>
       <parameter type-id='type-id-99' name='context_size'/>
       <parameter type-id='type-id-27' name='context'/>
       <parameter type-id='type-id-99' name='outsize'/>
-      <parameter type-id='type-id-376' name='out'/>
+      <parameter type-id='type-id-379' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_prf_raw' mangled-name='gnutls_prf_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_prf_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-99' name='label_size'/>
       <parameter type-id='type-id-27' name='label'/>
       <parameter type-id='type-id-99' name='seed_size'/>
       <parameter type-id='type-id-27' name='seed'/>
       <parameter type-id='type-id-99' name='outsize'/>
-      <parameter type-id='type-id-376' name='out'/>
+      <parameter type-id='type-id-379' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_tls13_derive_secret2' mangled-name='_tls13_derive_secret2' visibility='default' binding='global' size-in-bits='64'>
@@ -10902,20 +10968,20 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='auto-verify.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='auto-verify.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_session_get_verify_cert_status' mangled-name='gnutls_session_get_verify_cert_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_get_verify_cert_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_session_set_verify_cert2' mangled-name='gnutls_session_set_verify_cert2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_set_verify_cert2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-172' name='data'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <parameter type-id='type-id-173' name='data'/>
       <parameter type-id='type-id-10' name='elements'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_session_set_verify_cert' mangled-name='gnutls_session_set_verify_cert' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_set_verify_cert@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-27' name='hostname'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-111'/>
@@ -10930,99 +10996,99 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dh-session.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dh-session.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_dh_get_peers_public_bits' mangled-name='gnutls_dh_get_peers_public_bits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_get_peers_public_bits@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_get_prime_bits' mangled-name='gnutls_dh_get_prime_bits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_get_prime_bits@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_get_secret_bits' mangled-name='gnutls_dh_get_secret_bits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_get_secret_bits@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_get_pubkey' mangled-name='gnutls_dh_get_pubkey' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_get_pubkey@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-275' name='raw_key'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <parameter type-id='type-id-278' name='raw_key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_get_group' mangled-name='gnutls_dh_get_group' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_get_group@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-275' name='raw_gen'/>
-      <parameter type-id='type-id-275' name='raw_prime'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <parameter type-id='type-id-278' name='raw_gen'/>
+      <parameter type-id='type-id-278' name='raw_prime'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_dh_set_prime_bits' mangled-name='gnutls_dh_set_prime_bits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_dh_set_prime_bits@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-10' name='bits'/>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cert-session.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cert-session.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_certificate_activation_time_peers' mangled-name='gnutls_certificate_activation_time_peers' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_activation_time_peers@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_certificate_expiration_time_peers' mangled-name='gnutls_certificate_expiration_time_peers' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_expiration_time_peers@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_certificate_verify_peers3' mangled-name='gnutls_certificate_verify_peers3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_verify_peers3@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-27' name='hostname'/>
-      <parameter type-id='type-id-419' name='status'/>
+      <parameter type-id='type-id-422' name='status'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_verify_peers2' mangled-name='gnutls_certificate_verify_peers2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_verify_peers2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-419' name='status'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <parameter type-id='type-id-422' name='status'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_verify_limits' mangled-name='gnutls_certificate_set_verify_limits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_verify_limits@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <parameter type-id='type-id-10' name='max_bits'/>
       <parameter type-id='type-id-10' name='max_depth'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_get_verify_flags' mangled-name='gnutls_certificate_get_verify_flags' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_get_verify_flags@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_verify_flags' mangled-name='gnutls_certificate_set_verify_flags' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_verify_flags@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_flags' mangled-name='gnutls_certificate_set_flags' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_flags@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
+      <parameter type-id='type-id-730' name='res'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_params_function' mangled-name='gnutls_certificate_set_params_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_params_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='res'/>
-      <parameter type-id='type-id-433' name='func'/>
+      <parameter type-id='type-id-730' name='res'/>
+      <parameter type-id='type-id-436' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_client_get_request_status' mangled-name='gnutls_certificate_client_get_request_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_client_get_request_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_certificate_get_peers' mangled-name='gnutls_certificate_get_peers' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_get_peers@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-419' name='list_size'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <parameter type-id='type-id-422' name='list_size'/>
       <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='gnutls_certificate_get_ours' mangled-name='gnutls_certificate_get_ours' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_get_ours@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='gnutls_certificate_verify_peers' mangled-name='gnutls_certificate_verify_peers' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_verify_peers@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-172' name='data'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <parameter type-id='type-id-173' name='data'/>
       <parameter type-id='type-id-10' name='elements'/>
-      <parameter type-id='type-id-419' name='status'/>
+      <parameter type-id='type-id-422' name='status'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_activation_time' mangled-name='gnutls_x509_crt_get_activation_time' visibility='default' binding='global' size-in-bits='64'>
@@ -11074,7 +11140,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dh-primes.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dh-primes.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <var-decl name='gnutls_ffdhe_2048_group_prime' type-id='type-id-65' mangled-name='gnutls_ffdhe_2048_group_prime' visibility='default' elf-symbol-id='gnutls_ffdhe_2048_group_prime@@GNUTLS_3_4'/>
     <var-decl name='gnutls_ffdhe_2048_group_q' type-id='type-id-65' mangled-name='gnutls_ffdhe_2048_group_q' visibility='default' elf-symbol-id='gnutls_ffdhe_2048_group_q@@GNUTLS_3_6_8'/>
     <var-decl name='gnutls_ffdhe_2048_group_generator' type-id='type-id-65' mangled-name='gnutls_ffdhe_2048_group_generator' visibility='default' elf-symbol-id='gnutls_ffdhe_2048_group_generator@@GNUTLS_3_4'/>
@@ -11096,257 +11162,257 @@
     <var-decl name='gnutls_ffdhe_8192_group_generator' type-id='type-id-65' mangled-name='gnutls_ffdhe_8192_group_generator' visibility='default' elf-symbol-id='gnutls_ffdhe_8192_group_generator@@GNUTLS_3_4'/>
     <var-decl name='gnutls_ffdhe_8192_key_bits' type-id='type-id-66' mangled-name='gnutls_ffdhe_8192_key_bits' visibility='default' elf-symbol-id='gnutls_ffdhe_8192_key_bits@@GNUTLS_3_4'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='openpgp_compat.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='openpgp_compat.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_openpgp_privkey_sign_hash' mangled-name='gnutls_openpgp_privkey_sign_hash' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_privkey_sign_hash@@GNUTLS_3_4'>
-      <parameter type-id='type-id-477' name='key'/>
+      <parameter type-id='type-id-480' name='key'/>
       <parameter type-id='type-id-57' name='hash'/>
-      <parameter type-id='type-id-275' name='signature'/>
+      <parameter type-id='type-id-278' name='signature'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_get_peers_subkey_id' mangled-name='gnutls_certificate_get_peers_subkey_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_get_peers_subkey_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-275' name='session_id'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-278' name='session_id'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-881'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-884'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_OPENPGP_CERT' value='0'/>
       <enumerator name='GNUTLS_OPENPGP_CERT_FINGERPRINT' value='1'/>
     </enum-decl>
-    <typedef-decl name='gnutls_openpgp_crt_status_t' type-id='type-id-881' id='type-id-882'/>
+    <typedef-decl name='gnutls_openpgp_crt_status_t' type-id='type-id-884' id='type-id-885'/>
     <function-decl name='gnutls_openpgp_send_cert' mangled-name='gnutls_openpgp_send_cert' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_send_cert@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-882' name='status'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-885' name='status'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <enum-decl name='gnutls_openpgp_crt_fmt' id='type-id-883'>
+    <enum-decl name='gnutls_openpgp_crt_fmt' id='type-id-886'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_OPENPGP_FMT_RAW' value='0'/>
       <enumerator name='GNUTLS_OPENPGP_FMT_BASE64' value='1'/>
     </enum-decl>
-    <typedef-decl name='gnutls_openpgp_crt_fmt_t' type-id='type-id-883' id='type-id-884'/>
+    <typedef-decl name='gnutls_openpgp_crt_fmt_t' type-id='type-id-886' id='type-id-887'/>
     <function-decl name='gnutls_privkey_import_openpgp_raw' mangled-name='gnutls_privkey_import_openpgp_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_privkey_import_openpgp_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-864' name='pkey'/>
+      <parameter type-id='type-id-867' name='pkey'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-884' name='format'/>
-      <parameter type-id='type-id-346' name='keyid'/>
+      <parameter type-id='type-id-887' name='format'/>
+      <parameter type-id='type-id-349' name='keyid'/>
       <parameter type-id='type-id-27' name='password'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_get_openpgp_key_id' mangled-name='gnutls_pubkey_get_openpgp_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_get_openpgp_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-270' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
-      <parameter type-id='type-id-419' name='subkey'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
+      <parameter type-id='type-id-422' name='subkey'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_certificate_credentials_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-885'/>
-    <pointer-type-def type-id='type-id-885' size-in-bits='64' id='type-id-886'/>
-    <typedef-decl name='gnutls_certificate_credentials_t' type-id='type-id-886' id='type-id-887'/>
+    <class-decl name='gnutls_certificate_credentials_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-888'/>
+    <pointer-type-def type-id='type-id-888' size-in-bits='64' id='type-id-889'/>
+    <typedef-decl name='gnutls_certificate_credentials_t' type-id='type-id-889' id='type-id-890'/>
     <function-decl name='gnutls_certificate_set_openpgp_keyring_mem' mangled-name='gnutls_certificate_set_openpgp_keyring_mem' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_openpgp_keyring_mem@@GNUTLS_3_4'>
-      <parameter type-id='type-id-887' name='c'/>
-      <parameter type-id='type-id-346' name='data'/>
+      <parameter type-id='type-id-890' name='c'/>
+      <parameter type-id='type-id-349' name='data'/>
       <parameter type-id='type-id-99' name='dlen'/>
-      <parameter type-id='type-id-884' name='format'/>
+      <parameter type-id='type-id-887' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-888' size-in-bits='64' id='type-id-889'/>
-    <typedef-decl name='gnutls_openpgp_recv_key_func' type-id='type-id-889' id='type-id-890'/>
+    <pointer-type-def type-id='type-id-891' size-in-bits='64' id='type-id-892'/>
+    <typedef-decl name='gnutls_openpgp_recv_key_func' type-id='type-id-892' id='type-id-893'/>
     <function-decl name='gnutls_openpgp_set_recv_key_function' mangled-name='gnutls_openpgp_set_recv_key_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_set_recv_key_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-890' name='func'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-893' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <class-decl name='gnutls_openpgp_keyring_int' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-891'/>
-    <pointer-type-def type-id='type-id-891' size-in-bits='64' id='type-id-892'/>
-    <typedef-decl name='gnutls_openpgp_keyring_t' type-id='type-id-892' id='type-id-893'/>
+    <class-decl name='gnutls_openpgp_keyring_int' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-894'/>
+    <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-895'/>
+    <typedef-decl name='gnutls_openpgp_keyring_t' type-id='type-id-895' id='type-id-896'/>
     <function-decl name='gnutls_openpgp_crt_verify_ring' mangled-name='gnutls_openpgp_crt_verify_ring' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_verify_ring@@GNUTLS_3_4'>
-      <parameter type-id='type-id-474' name='key'/>
-      <parameter type-id='type-id-893' name='keyring'/>
+      <parameter type-id='type-id-477' name='key'/>
+      <parameter type-id='type-id-896' name='keyring'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-419' name='verify'/>
+      <parameter type-id='type-id-422' name='verify'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_privkey_export2' mangled-name='gnutls_openpgp_privkey_export2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_privkey_export2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-477' name='key'/>
-      <parameter type-id='type-id-884' name='format'/>
+      <parameter type-id='type-id-480' name='key'/>
+      <parameter type-id='type-id-887' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_privkey_export' mangled-name='gnutls_openpgp_privkey_export' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_privkey_export@@GNUTLS_3_4'>
-      <parameter type-id='type-id-477' name='key'/>
-      <parameter type-id='type-id-884' name='format'/>
+      <parameter type-id='type-id-480' name='key'/>
+      <parameter type-id='type-id-887' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-101' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_privkey_export_rsa_raw' mangled-name='gnutls_openpgp_privkey_export_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_privkey_export_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-477' name='pkey'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
-      <parameter type-id='type-id-275' name='d'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='u'/>
+      <parameter type-id='type-id-480' name='pkey'/>
+      <parameter type-id='type-id-278' name='m'/>
+      <parameter type-id='type-id-278' name='e'/>
+      <parameter type-id='type-id-278' name='d'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='u'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_privkey_export_dsa_raw' mangled-name='gnutls_openpgp_privkey_export_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_privkey_export_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-477' name='pkey'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-480' name='pkey'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='g'/>
+      <parameter type-id='type-id-278' name='y'/>
+      <parameter type-id='type-id-278' name='x'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_privkey_export_subkey_rsa_raw' mangled-name='gnutls_openpgp_privkey_export_subkey_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_privkey_export_subkey_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-477' name='pkey'/>
+      <parameter type-id='type-id-480' name='pkey'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
-      <parameter type-id='type-id-275' name='d'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='u'/>
+      <parameter type-id='type-id-278' name='m'/>
+      <parameter type-id='type-id-278' name='e'/>
+      <parameter type-id='type-id-278' name='d'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='u'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_privkey_export_subkey_dsa_raw' mangled-name='gnutls_openpgp_privkey_export_subkey_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_privkey_export_subkey_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-477' name='pkey'/>
+      <parameter type-id='type-id-480' name='pkey'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='g'/>
+      <parameter type-id='type-id-278' name='y'/>
+      <parameter type-id='type-id-278' name='x'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_privkey_get_subkey_pk_algorithm' mangled-name='gnutls_openpgp_privkey_get_subkey_pk_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_privkey_get_subkey_pk_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-477' name='key'/>
+      <parameter type-id='type-id-480' name='key'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-419' name='bits'/>
+      <parameter type-id='type-id-422' name='bits'/>
       <return type-id='type-id-60'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_privkey_sec_param' mangled-name='gnutls_openpgp_privkey_sec_param' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_privkey_sec_param@@GNUTLS_3_4'>
-      <parameter type-id='type-id-477' name='key'/>
-      <return type-id='type-id-202'/>
+      <parameter type-id='type-id-480' name='key'/>
+      <return type-id='type-id-203'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_crt_get_pk_dsa_raw' mangled-name='gnutls_openpgp_crt_get_pk_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_get_pk_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-474' name='crt'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-477' name='crt'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='g'/>
+      <parameter type-id='type-id-278' name='y'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_crt_get_subkey_pk_dsa_raw' mangled-name='gnutls_openpgp_crt_get_subkey_pk_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_get_subkey_pk_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-474' name='crt'/>
+      <parameter type-id='type-id-477' name='crt'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='g'/>
+      <parameter type-id='type-id-278' name='y'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_crt_get_subkey_pk_algorithm' mangled-name='gnutls_openpgp_crt_get_subkey_pk_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_get_subkey_pk_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-474' name='key'/>
+      <parameter type-id='type-id-477' name='key'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-419' name='bits'/>
+      <parameter type-id='type-id-422' name='bits'/>
       <return type-id='type-id-60'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_crt_get_name' mangled-name='gnutls_openpgp_crt_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_get_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-474' name='key'/>
+      <parameter type-id='type-id-477' name='key'/>
       <parameter type-id='type-id-22' name='idx'/>
-      <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-422' name='sizeof_buf'/>
+      <parameter type-id='type-id-379' name='buf'/>
+      <parameter type-id='type-id-425' name='sizeof_buf'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-474' size-in-bits='64' id='type-id-894'/>
+    <pointer-type-def type-id='type-id-477' size-in-bits='64' id='type-id-897'/>
     <function-decl name='gnutls_openpgp_crt_init' mangled-name='gnutls_openpgp_crt_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-894' name='key'/>
+      <parameter type-id='type-id-897' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_crt_deinit' mangled-name='gnutls_openpgp_crt_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-474' name='key'/>
+      <parameter type-id='type-id-477' name='key'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_crt_import' mangled-name='gnutls_openpgp_crt_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-474' name='key'/>
+      <parameter type-id='type-id-477' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-884' name='format'/>
+      <parameter type-id='type-id-887' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_crt_export' mangled-name='gnutls_openpgp_crt_export' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_export@@GNUTLS_3_4'>
-      <parameter type-id='type-id-474' name='key'/>
-      <parameter type-id='type-id-884' name='format'/>
+      <parameter type-id='type-id-477' name='key'/>
+      <parameter type-id='type-id-887' name='format'/>
       <parameter type-id='type-id-101' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_crt_export2' mangled-name='gnutls_openpgp_crt_export2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_export2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-474' name='key'/>
-      <parameter type-id='type-id-884' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-477' name='key'/>
+      <parameter type-id='type-id-887' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_crt_get_pk_algorithm' mangled-name='gnutls_openpgp_crt_get_pk_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_get_pk_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-474' name='key'/>
-      <parameter type-id='type-id-419' name='bits'/>
+      <parameter type-id='type-id-477' name='key'/>
+      <parameter type-id='type-id-422' name='bits'/>
       <return type-id='type-id-60'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_crt_get_creation_time' mangled-name='gnutls_openpgp_crt_get_creation_time' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_get_creation_time@@GNUTLS_3_4'>
-      <parameter type-id='type-id-474' name='key'/>
+      <parameter type-id='type-id-477' name='key'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_crt_get_subkey_revoked_status' mangled-name='gnutls_openpgp_crt_get_subkey_revoked_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_get_subkey_revoked_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-474' name='key'/>
+      <parameter type-id='type-id-477' name='key'/>
       <parameter type-id='type-id-10' name='idx'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_crt_get_subkey_creation_time' mangled-name='gnutls_openpgp_crt_get_subkey_creation_time' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_crt_get_subkey_creation_time@@GNUTLS_3_4'>
-      <parameter type-id='type-id-474' name='key'/>
+      <parameter type-id='type-id-477' name='key'/>
       <parameter type-id='type-id-10' name='idx'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_openpgp_privkey_import' mangled-name='gnutls_openpgp_privkey_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_openpgp_privkey_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-477' name='key'/>
+      <parameter type-id='type-id-480' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-884' name='format'/>
+      <parameter type-id='type-id-887' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_openpgp_key_file' mangled-name='gnutls_certificate_set_openpgp_key_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_openpgp_key_file@@GNUTLS_3_4'>
-      <parameter type-id='type-id-887' name='res'/>
+      <parameter type-id='type-id-890' name='res'/>
       <parameter type-id='type-id-27' name='certfile'/>
       <parameter type-id='type-id-27' name='keyfile'/>
-      <parameter type-id='type-id-884' name='format'/>
+      <parameter type-id='type-id-887' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_openpgp_key_file2' mangled-name='gnutls_certificate_set_openpgp_key_file2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_openpgp_key_file2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-887' name='res'/>
+      <parameter type-id='type-id-890' name='res'/>
       <parameter type-id='type-id-27' name='certfile'/>
       <parameter type-id='type-id-27' name='keyfile'/>
       <parameter type-id='type-id-27' name='subkey_id'/>
-      <parameter type-id='type-id-884' name='format'/>
+      <parameter type-id='type-id-887' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-888'>
-      <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-346'/>
+    <function-type size-in-bits='64' id='type-id-891'>
+      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-349'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='crypto-selftests.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crypto-selftests.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_digest_self_test' mangled-name='gnutls_digest_self_test' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_digest_self_test@@GNUTLS_FIPS140_3_4'>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-211' name='digest'/>
+      <parameter type-id='type-id-212' name='digest'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_mac_self_test' mangled-name='gnutls_mac_self_test' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_mac_self_test@@GNUTLS_FIPS140_3_4'>
@@ -11441,7 +11507,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='crypto-selftests-pk.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crypto-selftests-pk.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_pk_self_test' mangled-name='gnutls_pk_self_test' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pk_self_test@@GNUTLS_FIPS140_3_4'>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-60' name='pk'/>
@@ -11460,39 +11526,36 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='secrets.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <function-decl name='nettle_hmac_sha256_set_key' mangled-name='nettle_hmac_sha256_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='nettle_hkdf_expand' mangled-name='nettle_hkdf_expand' visibility='default' binding='global' size-in-bits='64'>
+  <abi-instr version='1.0' address-size='64' path='secrets.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <function-decl name='gnutls_hkdf_expand' mangled-name='gnutls_hkdf_expand' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='nettle_hmac_sha384_set_key' mangled-name='nettle_hmac_sha384_set_key' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='gnutls_hkdf_extract' mangled-name='gnutls_hkdf_extract' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hmac_fast' mangled-name='gnutls_hmac_fast' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='extv.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-895' size-in-bits='64' id='type-id-896'/>
-    <typedef-decl name='gnutls_ext_raw_process_func' type-id='type-id-896' id='type-id-897'/>
+  <abi-instr version='1.0' address-size='64' path='extv.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-899'/>
+    <typedef-decl name='gnutls_ext_raw_process_func' type-id='type-id-899' id='type-id-900'/>
     <function-decl name='gnutls_ext_raw_parse' mangled-name='gnutls_ext_raw_parse' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ext_raw_parse@@GNUTLS_3_6_3'>
       <parameter type-id='type-id-101' name='ctx'/>
-      <parameter type-id='type-id-897' name='cb'/>
+      <parameter type-id='type-id-900' name='cb'/>
       <parameter type-id='type-id-57' name='data'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-895'>
+    <function-type size-in-bits='64' id='type-id-898'>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-349'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hello_ext_lib.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='hello_ext_lib.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls_buffer_pop_datum_prefix16' mangled-name='_gnutls_buffer_pop_datum_prefix16' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -11506,61 +11569,61 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ocsp-api.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ocsp-api.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_ocsp_status_request_is_checked' mangled-name='gnutls_ocsp_status_request_is_checked' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_status_request_is_checked@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-22'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_certificate_get_ocsp_expiration' mangled-name='gnutls_certificate_get_ocsp_expiration' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_get_ocsp_expiration@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-727' name='sc'/>
+      <parameter type-id='type-id-730' name='sc'/>
       <parameter type-id='type-id-10' name='idx'/>
       <parameter type-id='type-id-22' name='oidx'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_ocsp_status_request_mem' mangled-name='gnutls_certificate_set_ocsp_status_request_mem' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_ocsp_status_request_mem@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-727' name='sc'/>
+      <parameter type-id='type-id-730' name='sc'/>
       <parameter type-id='type-id-57' name='resp_data'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-421' name='fmt'/>
+      <parameter type-id='type-id-424' name='fmt'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_ocsp_status_request_file' mangled-name='gnutls_certificate_set_ocsp_status_request_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_ocsp_status_request_file@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='sc'/>
+      <parameter type-id='type-id-730' name='sc'/>
       <parameter type-id='type-id-27' name='response_file'/>
       <parameter type-id='type-id-10' name='idx'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_ocsp_status_request_function2' mangled-name='gnutls_certificate_set_ocsp_status_request_function2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_ocsp_status_request_function2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='sc'/>
+      <parameter type-id='type-id-730' name='sc'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-164' name='ocsp_func'/>
+      <parameter type-id='type-id-165' name='ocsp_func'/>
       <parameter type-id='type-id-101' name='ptr'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_ocsp_status_request_function' mangled-name='gnutls_certificate_set_ocsp_status_request_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_ocsp_status_request_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-727' name='sc'/>
-      <parameter type-id='type-id-164' name='ocsp_func'/>
+      <parameter type-id='type-id-730' name='sc'/>
+      <parameter type-id='type-id-165' name='ocsp_func'/>
       <parameter type-id='type-id-101' name='ptr'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_status_request_get2' mangled-name='gnutls_ocsp_status_request_get2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_status_request_get2@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-275' name='response'/>
+      <parameter type-id='type-id-278' name='response'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_status_request_get' mangled-name='gnutls_ocsp_status_request_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_status_request_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-275' name='response'/>
+      <parameter type-id='type-id-416' name='session'/>
+      <parameter type-id='type-id-278' name='response'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_ocsp_status_request_file2' mangled-name='gnutls_certificate_set_ocsp_status_request_file2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_ocsp_status_request_file2@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-727' name='sc'/>
+      <parameter type-id='type-id-730' name='sc'/>
       <parameter type-id='type-id-27' name='response_file'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-421' name='fmt'/>
+      <parameter type-id='type-id-424' name='fmt'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_ocsp_get_validity' mangled-name='_gnutls_ocsp_get_validity' visibility='default' binding='global' size-in-bits='64'>
@@ -11570,35 +11633,35 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='stek.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='stek.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls_set_session_ticket_key_rotation_callback' mangled-name='_gnutls_set_session_ticket_key_rotation_callback' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_set_session_ticket_key_rotation_callback@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-330' name='cb'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-333' name='cb'/>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cert-cred-rawpk.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cert-cred-rawpk.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_certificate_set_rawpk_key_file' mangled-name='gnutls_certificate_set_rawpk_key_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_rawpk_key_file@@GNUTLS_3_6_6'>
-      <parameter type-id='type-id-727' name='cred'/>
+      <parameter type-id='type-id-730' name='cred'/>
       <parameter type-id='type-id-27' name='rawpkfile'/>
       <parameter type-id='type-id-27' name='privkeyfile'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-27' name='pass'/>
       <parameter type-id='type-id-10' name='key_usage'/>
-      <parameter type-id='type-id-426' name='names'/>
+      <parameter type-id='type-id-429' name='names'/>
       <parameter type-id='type-id-10' name='names_length'/>
       <parameter type-id='type-id-10' name='privkey_flags'/>
       <parameter type-id='type-id-10' name='pkcs11_flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_certificate_set_rawpk_key_mem' mangled-name='gnutls_certificate_set_rawpk_key_mem' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_set_rawpk_key_mem@@GNUTLS_3_6_6'>
-      <parameter type-id='type-id-727' name='cred'/>
+      <parameter type-id='type-id-730' name='cred'/>
       <parameter type-id='type-id-57' name='spki'/>
       <parameter type-id='type-id-57' name='pkey'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-27' name='pass'/>
       <parameter type-id='type-id-10' name='key_usage'/>
-      <parameter type-id='type-id-426' name='names'/>
+      <parameter type-id='type-id-429' name='names'/>
       <parameter type-id='type-id-10' name='names_length'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
@@ -11619,10 +11682,10 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='iov.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='iov_iter_st' size-in-bits='896' is-struct='yes' visibility='default' id='type-id-898'>
+  <abi-instr version='1.0' address-size='64' path='iov.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='iov_iter_st' size-in-bits='896' is-struct='yes' visibility='default' id='type-id-901'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='iov' type-id='type-id-249' visibility='default'/>
+        <var-decl name='iov' type-id='type-id-250' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='iov_count' type-id='type-id-99' visibility='default'/>
@@ -11643,29 +11706,29 @@
         <var-decl name='block_offset' type-id='type-id-99' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-899'/>
-    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-900'/>
+    <pointer-type-def type-id='type-id-901' size-in-bits='64' id='type-id-902'/>
+    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-903'/>
     <function-decl name='_gnutls_iov_iter_sync' mangled-name='_gnutls_iov_iter_sync' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_iov_iter_sync@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-899' name='iter'/>
-      <parameter type-id='type-id-900' name='data'/>
+      <parameter type-id='type-id-902' name='iter'/>
+      <parameter type-id='type-id-903' name='data'/>
       <parameter type-id='type-id-99' name='data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-191' size-in-bits='64' id='type-id-901'/>
+    <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-904'/>
     <function-decl name='_gnutls_iov_iter_next' mangled-name='_gnutls_iov_iter_next' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_iov_iter_next@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-899' name='iter'/>
-      <parameter type-id='type-id-901' name='data'/>
+      <parameter type-id='type-id-902' name='iter'/>
+      <parameter type-id='type-id-904' name='data'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='_gnutls_iov_iter_init' mangled-name='_gnutls_iov_iter_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_iov_iter_init@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-899' name='iter'/>
-      <parameter type-id='type-id-249' name='iov'/>
+      <parameter type-id='type-id-902' name='iter'/>
+      <parameter type-id='type-id-250' name='iov'/>
       <parameter type-id='type-id-99' name='iov_count'/>
       <parameter type-id='type-id-99' name='block_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='vko.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='vko.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_oid_to_gost_paramset' mangled-name='gnutls_oid_to_gost_paramset' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -11682,31 +11745,31 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='system/keys-dummy.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system/keys-dummy.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_system_key_add_x509' mangled-name='gnutls_system_key_add_x509' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_system_key_add_x509@@GNUTLS_3_4'>
-      <parameter type-id='type-id-869' name='crt'/>
-      <parameter type-id='type-id-383' name='privkey'/>
+      <parameter type-id='type-id-872' name='crt'/>
+      <parameter type-id='type-id-386' name='privkey'/>
       <parameter type-id='type-id-27' name='label'/>
-      <parameter type-id='type-id-852' name='cert_url'/>
-      <parameter type-id='type-id-852' name='key_url'/>
+      <parameter type-id='type-id-855' name='cert_url'/>
+      <parameter type-id='type-id-855' name='key_url'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='system_key_iter_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-902'/>
-    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-903'/>
-    <typedef-decl name='gnutls_system_key_iter_t' type-id='type-id-903' id='type-id-904'/>
-    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-905'/>
+    <class-decl name='system_key_iter_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-905'/>
+    <pointer-type-def type-id='type-id-905' size-in-bits='64' id='type-id-906'/>
+    <typedef-decl name='gnutls_system_key_iter_t' type-id='type-id-906' id='type-id-907'/>
+    <pointer-type-def type-id='type-id-907' size-in-bits='64' id='type-id-908'/>
     <function-decl name='gnutls_system_key_iter_get_info' mangled-name='gnutls_system_key_iter_get_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_system_key_iter_get_info@@GNUTLS_3_4'>
-      <parameter type-id='type-id-905' name='iter'/>
+      <parameter type-id='type-id-908' name='iter'/>
       <parameter type-id='type-id-10' name='cert_type'/>
-      <parameter type-id='type-id-852' name='cert_url'/>
-      <parameter type-id='type-id-852' name='key_url'/>
-      <parameter type-id='type-id-852' name='label'/>
-      <parameter type-id='type-id-275' name='der'/>
+      <parameter type-id='type-id-855' name='cert_url'/>
+      <parameter type-id='type-id-855' name='key_url'/>
+      <parameter type-id='type-id-855' name='label'/>
+      <parameter type-id='type-id-278' name='der'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_system_key_iter_deinit' mangled-name='gnutls_system_key_iter_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_system_key_iter_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-904' name='iter'/>
+      <parameter type-id='type-id-907' name='iter'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_system_key_delete' mangled-name='gnutls_system_key_delete' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_system_key_delete@@GNUTLS_3_4'>
@@ -11715,7 +11778,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls13/certificate_request.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/certificate_request.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls_select_client_cert' mangled-name='_gnutls_select_client_cert' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -11729,7 +11792,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls13/certificate_verify.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/certificate_verify.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls13_handshake_sign_data' mangled-name='_gnutls13_handshake_sign_data' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -11743,24 +11806,24 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls13-sig.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13-sig.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls_check_key_usage_for_sig' mangled-name='_gnutls_check_key_usage_for_sig' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls13/finished.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/finished.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_mbuffer_append_data' mangled-name='_mbuffer_append_data' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls13/key_update.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/key_update.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_session_key_update' mangled-name='gnutls_session_key_update' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_key_update@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls13/session_ticket.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/session_ticket.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls_decrypt_session_ticket' mangled-name='_gnutls_decrypt_session_ticket' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -11777,20 +11840,20 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls13/certificate.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/certificate.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='_gnutls_parse_ocsp_response' mangled-name='_gnutls_parse_ocsp_response' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls13/early_data.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/early_data.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_record_send' mangled-name='gnutls_record_send' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls13/post_handshake.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/post_handshake.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
 
     <function-decl name='gnutls_reauth' mangled-name='gnutls_reauth' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_reauth@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -11798,29 +11861,29 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls13/psk_ext_parser.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='psk_ext_parser_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-906'>
+  <abi-instr version='1.0' address-size='64' path='tls13/psk_ext_parser.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='psk_ext_parser_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-909'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='identities_data' type-id='type-id-346' visibility='default'/>
+        <var-decl name='identities_data' type-id='type-id-349' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='identities_len' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='binders_data' type-id='type-id-346' visibility='default'/>
+        <var-decl name='binders_data' type-id='type-id-349' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='binders_len' type-id='type-id-99' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='psk_ext_iter_st' type-id='type-id-906' id='type-id-907'/>
-    <pointer-type-def type-id='type-id-907' size-in-bits='64' id='type-id-908'/>
+    <typedef-decl name='psk_ext_iter_st' type-id='type-id-909' id='type-id-910'/>
+    <pointer-type-def type-id='type-id-910' size-in-bits='64' id='type-id-911'/>
     <function-decl name='_gnutls13_psk_ext_iter_next_binder' mangled-name='_gnutls13_psk_ext_iter_next_binder' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls13_psk_ext_iter_next_binder@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-908' name='iter'/>
-      <parameter type-id='type-id-275' name='binder'/>
+      <parameter type-id='type-id-911' name='iter'/>
+      <parameter type-id='type-id-278' name='binder'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='psk_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-909'>
+    <class-decl name='psk_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-912'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='identity' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -11828,75 +11891,75 @@
         <var-decl name='ob_ticket_age' type-id='type-id-18' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-910'/>
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-913'/>
     <function-decl name='_gnutls13_psk_ext_iter_next_identity' mangled-name='_gnutls13_psk_ext_iter_next_identity' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls13_psk_ext_iter_next_identity@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-908' name='iter'/>
-      <parameter type-id='type-id-910' name='psk'/>
+      <parameter type-id='type-id-911' name='iter'/>
+      <parameter type-id='type-id-913' name='psk'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <typedef-decl name='psk_ext_parser_st' type-id='type-id-906' id='type-id-911'/>
-    <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-912'/>
+    <typedef-decl name='psk_ext_parser_st' type-id='type-id-909' id='type-id-914'/>
+    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-915'/>
     <function-decl name='_gnutls13_psk_ext_parser_init' mangled-name='_gnutls13_psk_ext_parser_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls13_psk_ext_parser_init@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-912' name='p'/>
-      <parameter type-id='type-id-346' name='data'/>
+      <parameter type-id='type-id-915' name='p'/>
+      <parameter type-id='type-id-349' name='data'/>
       <parameter type-id='type-id-99' name='len'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls13/anti_replay.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_anti_replay_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-303'>
+  <abi-instr version='1.0' address-size='64' path='tls13/anti_replay.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_anti_replay_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-306'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='window' type-id='type-id-18' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='start_time' type-id='type-id-168' visibility='default'/>
+        <var-decl name='start_time' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='db_add_func' type-id='type-id-913' visibility='default'/>
+        <var-decl name='db_add_func' type-id='type-id-916' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='db_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-915'/>
-    <typedef-decl name='gnutls_db_add_func' type-id='type-id-915' id='type-id-913'/>
+    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-918'/>
+    <typedef-decl name='gnutls_db_add_func' type-id='type-id-918' id='type-id-916'/>
     <function-decl name='gnutls_anti_replay_set_add_function' mangled-name='gnutls_anti_replay_set_add_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anti_replay_set_add_function@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-181' name='anti_replay'/>
-      <parameter type-id='type-id-913' name='add_func'/>
+      <parameter type-id='type-id-182' name='anti_replay'/>
+      <parameter type-id='type-id-916' name='add_func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_anti_replay_set_ptr' mangled-name='gnutls_anti_replay_set_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anti_replay_set_ptr@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-181' name='anti_replay'/>
+      <parameter type-id='type-id-182' name='anti_replay'/>
       <parameter type-id='type-id-101' name='ptr'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_anti_replay_check' mangled-name='_gnutls_anti_replay_check' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_anti_replay_check@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-181' name='anti_replay'/>
+      <parameter type-id='type-id-182' name='anti_replay'/>
       <parameter type-id='type-id-18' name='client_ticket_age'/>
-      <parameter type-id='type-id-716' name='ticket_creation_time'/>
-      <parameter type-id='type-id-275' name='id'/>
+      <parameter type-id='type-id-719' name='ticket_creation_time'/>
+      <parameter type-id='type-id-278' name='id'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_anti_replay_enable' mangled-name='gnutls_anti_replay_enable' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anti_replay_enable@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-181' name='anti_replay'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-182' name='anti_replay'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_anti_replay_deinit' mangled-name='gnutls_anti_replay_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anti_replay_deinit@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-181' name='anti_replay'/>
+      <parameter type-id='type-id-182' name='anti_replay'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_anti_replay_set_window' mangled-name='gnutls_anti_replay_set_window' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anti_replay_set_window@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-181' name='anti_replay'/>
+      <parameter type-id='type-id-182' name='anti_replay'/>
       <parameter type-id='type-id-10' name='window'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-916'/>
+    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-919'/>
     <function-decl name='gnutls_anti_replay_init' mangled-name='gnutls_anti_replay_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_anti_replay_init@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-916' name='anti_replay'/>
+      <parameter type-id='type-id-919' name='anti_replay'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-914'>
+    <function-type size-in-bits='64' id='type-id-917'>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-57'/>
@@ -11904,25 +11967,25 @@
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pkcs11.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-101' const='yes' id='type-id-917'/>
-    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-918'/>
-    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-920'/>
-    <typedef-decl name='gnutls_pkcs11_token_callback_t' type-id='type-id-920' id='type-id-921'/>
-    <var-decl name='_gnutls_token_func' type-id='type-id-921' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='pkcs11.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-101' const='yes' id='type-id-920'/>
+    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-921'/>
+    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-923'/>
+    <typedef-decl name='gnutls_pkcs11_token_callback_t' type-id='type-id-923' id='type-id-924'/>
+    <var-decl name='_gnutls_token_func' type-id='type-id-924' visibility='default'/>
     <var-decl name='_gnutls_token_data' type-id='type-id-101' visibility='default'/>
     <function-decl name='gnutls_pkcs11_obj_flags_get_str' mangled-name='gnutls_pkcs11_obj_flags_get_str' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_flags_get_str@@GNUTLS_3_4'>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-376'/>
+      <return type-id='type-id-379'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_obj_get_flags' mangled-name='gnutls_pkcs11_obj_get_flags' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_get_flags@@GNUTLS_3_4'>
-      <parameter type-id='type-id-775' name='obj'/>
-      <parameter type-id='type-id-419' name='oflags'/>
+      <parameter type-id='type-id-778' name='obj'/>
+      <parameter type-id='type-id-422' name='oflags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_crt_is_known' mangled-name='gnutls_pkcs11_crt_is_known' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_crt_is_known@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='url'/>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-10'/>
     </function-decl>
@@ -11930,29 +11993,29 @@
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-57' name='dn'/>
       <parameter type-id='type-id-57' name='spki'/>
-      <parameter type-id='type-id-275' name='issuer'/>
-      <parameter type-id='type-id-421' name='fmt'/>
+      <parameter type-id='type-id-278' name='issuer'/>
+      <parameter type-id='type-id-424' name='fmt'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_get_raw_issuer_by_dn' mangled-name='gnutls_pkcs11_get_raw_issuer_by_dn' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_get_raw_issuer_by_dn@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-57' name='dn'/>
-      <parameter type-id='type-id-275' name='issuer'/>
-      <parameter type-id='type-id-421' name='fmt'/>
+      <parameter type-id='type-id-278' name='issuer'/>
+      <parameter type-id='type-id-424' name='fmt'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_get_raw_issuer' mangled-name='gnutls_pkcs11_get_raw_issuer' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_get_raw_issuer@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='url'/>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-275' name='issuer'/>
-      <parameter type-id='type-id-421' name='fmt'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-278' name='issuer'/>
+      <parameter type-id='type-id-424' name='fmt'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_type_get_name' mangled-name='gnutls_pkcs11_type_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_type_get_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-770' name='type'/>
+      <parameter type-id='type-id-773' name='type'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_token_check_mechanism' mangled-name='gnutls_pkcs11_token_check_mechanism' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_token_check_mechanism@@GNUTLS_3_6_0'>
@@ -11966,60 +12029,60 @@
     <function-decl name='gnutls_pkcs11_token_get_mechanism' mangled-name='gnutls_pkcs11_token_get_mechanism' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_token_get_mechanism@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-626' name='mechanism'/>
+      <parameter type-id='type-id-629' name='mechanism'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_token_get_flags' mangled-name='gnutls_pkcs11_token_get_flags' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_token_get_flags@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='url'/>
-      <parameter type-id='type-id-419' name='flags'/>
+      <parameter type-id='type-id-422' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-922'/>
-    <qualified-type-def type-id='type-id-922' const='yes' id='type-id-923'/>
+    <pointer-type-def type-id='type-id-778' size-in-bits='64' id='type-id-925'/>
+    <qualified-type-def type-id='type-id-925' const='yes' id='type-id-926'/>
     <function-decl name='gnutls_x509_crt_list_import_pkcs11' mangled-name='gnutls_x509_crt_list_import_pkcs11' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_list_import_pkcs11@@GNUTLS_3_4'>
-      <parameter type-id='type-id-458' name='certs'/>
+      <parameter type-id='type-id-461' name='certs'/>
       <parameter type-id='type-id-10' name='cert_max'/>
-      <parameter type-id='type-id-923' name='objs'/>
+      <parameter type-id='type-id-926' name='objs'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_import_pkcs11' mangled-name='gnutls_x509_crt_import_pkcs11' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_import_pkcs11@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-775' name='pkcs11_crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-778' name='pkcs11_crt'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_obj_list_import_url3' mangled-name='gnutls_pkcs11_obj_list_import_url3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_list_import_url3@@GNUTLS_3_4'>
-      <parameter type-id='type-id-922' name='p_list'/>
-      <parameter type-id='type-id-419' name='n_list'/>
+      <parameter type-id='type-id-925' name='p_list'/>
+      <parameter type-id='type-id-422' name='n_list'/>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_obj_get_type' mangled-name='gnutls_pkcs11_obj_get_type' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_get_type@@GNUTLS_3_4'>
-      <parameter type-id='type-id-775' name='obj'/>
-      <return type-id='type-id-770'/>
+      <parameter type-id='type-id-778' name='obj'/>
+      <return type-id='type-id-773'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-924'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-927'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PKCS11_URL_GENERIC' value='0'/>
       <enumerator name='GNUTLS_PKCS11_URL_LIB' value='1'/>
       <enumerator name='GNUTLS_PKCS11_URL_LIB_VERSION' value='2'/>
     </enum-decl>
-    <typedef-decl name='gnutls_pkcs11_url_type_t' type-id='type-id-924' id='type-id-925'/>
+    <typedef-decl name='gnutls_pkcs11_url_type_t' type-id='type-id-927' id='type-id-928'/>
     <function-decl name='gnutls_pkcs11_obj_export_url' mangled-name='gnutls_pkcs11_obj_export_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_export_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-775' name='obj'/>
-      <parameter type-id='type-id-925' name='detailed'/>
-      <parameter type-id='type-id-852' name='url'/>
+      <parameter type-id='type-id-778' name='obj'/>
+      <parameter type-id='type-id-928' name='detailed'/>
+      <parameter type-id='type-id-855' name='url'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_token_get_ptr' mangled-name='gnutls_pkcs11_token_get_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_token_get_ptr@@GNUTLS_3_6_3'>
       <parameter type-id='type-id-27' name='url'/>
-      <parameter type-id='type-id-430' name='ptr'/>
-      <parameter type-id='type-id-626' name='slot_id'/>
+      <parameter type-id='type-id-433' name='ptr'/>
+      <parameter type-id='type-id-629' name='slot_id'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-926'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-929'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PKCS11_TOKEN_LABEL' value='0'/>
       <enumerator name='GNUTLS_PKCS11_TOKEN_SERIAL' value='1'/>
@@ -12027,56 +12090,56 @@
       <enumerator name='GNUTLS_PKCS11_TOKEN_MODEL' value='3'/>
       <enumerator name='GNUTLS_PKCS11_TOKEN_MODNAME' value='4'/>
     </enum-decl>
-    <typedef-decl name='gnutls_pkcs11_token_info_t' type-id='type-id-926' id='type-id-927'/>
+    <typedef-decl name='gnutls_pkcs11_token_info_t' type-id='type-id-929' id='type-id-930'/>
     <function-decl name='gnutls_pkcs11_token_get_info' mangled-name='gnutls_pkcs11_token_get_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_token_get_info@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='url'/>
-      <parameter type-id='type-id-927' name='ttype'/>
+      <parameter type-id='type-id-930' name='ttype'/>
       <parameter type-id='type-id-101' name='output'/>
-      <parameter type-id='type-id-422' name='output_size'/>
+      <parameter type-id='type-id-425' name='output_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_token_get_url' mangled-name='gnutls_pkcs11_token_get_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_token_get_url@@GNUTLS_3_4'>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-925' name='detailed'/>
-      <parameter type-id='type-id-852' name='url'/>
+      <parameter type-id='type-id-928' name='detailed'/>
+      <parameter type-id='type-id-855' name='url'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs11_token_get_url' mangled-name='_gnutls_pkcs11_token_get_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_pkcs11_token_get_url@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-925' name='detailed'/>
-      <parameter type-id='type-id-852' name='url'/>
+      <parameter type-id='type-id-928' name='detailed'/>
+      <parameter type-id='type-id-855' name='url'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_obj_export3' mangled-name='gnutls_pkcs11_obj_export3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_export3@@GNUTLS_3_4'>
-      <parameter type-id='type-id-775' name='obj'/>
-      <parameter type-id='type-id-421' name='fmt'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-778' name='obj'/>
+      <parameter type-id='type-id-424' name='fmt'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_obj_export2' mangled-name='gnutls_pkcs11_obj_export2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_export2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-775' name='obj'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-778' name='obj'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_obj_export' mangled-name='gnutls_pkcs11_obj_export' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_export@@GNUTLS_3_4'>
-      <parameter type-id='type-id-775' name='obj'/>
+      <parameter type-id='type-id-778' name='obj'/>
       <parameter type-id='type-id-101' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_obj_deinit' mangled-name='gnutls_pkcs11_obj_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-775' name='obj'/>
+      <parameter type-id='type-id-778' name='obj'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_obj_set_pin_function' mangled-name='gnutls_pkcs11_obj_set_pin_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_set_pin_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-775' name='obj'/>
-      <parameter type-id='type-id-375' name='fn'/>
+      <parameter type-id='type-id-778' name='obj'/>
+      <parameter type-id='type-id-378' name='fn'/>
       <parameter type-id='type-id-101' name='userdata'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_set_token_function' mangled-name='gnutls_pkcs11_set_token_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_set_token_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-921' name='fn'/>
+      <parameter type-id='type-id-924' name='fn'/>
       <parameter type-id='type-id-101' name='userdata'/>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -12084,15 +12147,15 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_obj_get_ptr' mangled-name='gnutls_pkcs11_obj_get_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_get_ptr@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-775' name='obj'/>
-      <parameter type-id='type-id-430' name='ptr'/>
-      <parameter type-id='type-id-430' name='session'/>
-      <parameter type-id='type-id-430' name='ohandle'/>
-      <parameter type-id='type-id-626' name='slot_id'/>
+      <parameter type-id='type-id-778' name='obj'/>
+      <parameter type-id='type-id-433' name='ptr'/>
+      <parameter type-id='type-id-433' name='session'/>
+      <parameter type-id='type-id-433' name='ohandle'/>
+      <parameter type-id='type-id-629' name='slot_id'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-928'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-931'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_ID_HEX' value='1'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_LABEL' value='2'/>
@@ -12105,17 +12168,17 @@
       <enumerator name='GNUTLS_PKCS11_OBJ_LIBRARY_DESCRIPTION' value='9'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_LIBRARY_MANUFACTURER' value='10'/>
     </enum-decl>
-    <typedef-decl name='gnutls_pkcs11_obj_info_t' type-id='type-id-928' id='type-id-929'/>
+    <typedef-decl name='gnutls_pkcs11_obj_info_t' type-id='type-id-931' id='type-id-932'/>
     <function-decl name='gnutls_pkcs11_obj_get_info' mangled-name='gnutls_pkcs11_obj_get_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_get_info@@GNUTLS_3_4'>
-      <parameter type-id='type-id-775' name='obj'/>
-      <parameter type-id='type-id-929' name='itype'/>
+      <parameter type-id='type-id-778' name='obj'/>
+      <parameter type-id='type-id-932' name='itype'/>
       <parameter type-id='type-id-101' name='output'/>
-      <parameter type-id='type-id-422' name='output_size'/>
+      <parameter type-id='type-id-425' name='output_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_obj_set_info' mangled-name='gnutls_pkcs11_obj_set_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_set_info@@GNUTLS_3_4'>
-      <parameter type-id='type-id-775' name='obj'/>
-      <parameter type-id='type-id-929' name='itype'/>
+      <parameter type-id='type-id-778' name='obj'/>
+      <parameter type-id='type-id-932' name='itype'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-99' name='data_size'/>
       <parameter type-id='type-id-10' name='flags'/>
@@ -12132,19 +12195,19 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_obj_init' mangled-name='gnutls_pkcs11_obj_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-922' name='obj'/>
+      <parameter type-id='type-id-925' name='obj'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_obj_import_url' mangled-name='gnutls_pkcs11_obj_import_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_import_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-775' name='obj'/>
+      <parameter type-id='type-id-778' name='obj'/>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-930'/>
+    <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-933'/>
     <function-decl name='gnutls_pkcs11_obj_list_import_url4' mangled-name='gnutls_pkcs11_obj_list_import_url4' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_list_import_url4@@GNUTLS_3_4'>
-      <parameter type-id='type-id-930' name='p_list'/>
-      <parameter type-id='type-id-419' name='n_list'/>
+      <parameter type-id='type-id-933' name='p_list'/>
+      <parameter type-id='type-id-422' name='n_list'/>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
@@ -12284,7 +12347,7 @@
     <function-decl name='p11_kit_message' mangled-name='p11_kit_message' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='fgets' mangled-name='fgets' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__fgets_alias' mangled-name='fgets' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hex2bin' mangled-name='_gnutls_hex2bin' visibility='default' binding='global' size-in-bits='64'>
@@ -12317,17 +12380,17 @@
     <function-decl name='p11_kit_pin_unref' mangled-name='p11_kit_pin_unref' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-919'>
-      <parameter type-id='type-id-917'/>
-      <parameter type-id='type-id-918'/>
+    <function-type size-in-bits='64' id='type-id-922'>
+      <parameter type-id='type-id-920'/>
+      <parameter type-id='type-id-921'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pkcs11x.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_x509_ext_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-931'>
+  <abi-instr version='1.0' address-size='64' path='pkcs11x.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_x509_ext_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-934'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='oid' type-id='type-id-376' visibility='default'/>
+        <var-decl name='oid' type-id='type-id-379' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='critical' type-id='type-id-10' visibility='default'/>
@@ -12336,13 +12399,13 @@
         <var-decl name='data' type-id='type-id-62' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_x509_ext_st' type-id='type-id-931' id='type-id-932'/>
-    <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-933'/>
-    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-934'/>
+    <typedef-decl name='gnutls_x509_ext_st' type-id='type-id-934' id='type-id-935'/>
+    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-936'/>
+    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-937'/>
     <function-decl name='gnutls_pkcs11_obj_get_exts' mangled-name='gnutls_pkcs11_obj_get_exts' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_obj_get_exts@@GNUTLS_3_4'>
-      <parameter type-id='type-id-775' name='obj'/>
-      <parameter type-id='type-id-934' name='exts'/>
-      <parameter type-id='type-id-419' name='exts_size'/>
+      <parameter type-id='type-id-778' name='obj'/>
+      <parameter type-id='type-id-937' name='exts'/>
+      <parameter type-id='type-id-422' name='exts_size'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -12368,17 +12431,17 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pkcs11_privkey.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs11_privkey.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_pkcs11_privkey_set_pin_function' mangled-name='gnutls_pkcs11_privkey_set_pin_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_set_pin_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-384' name='key'/>
-      <parameter type-id='type-id-375' name='fn'/>
+      <parameter type-id='type-id-387' name='key'/>
+      <parameter type-id='type-id-378' name='fn'/>
       <parameter type-id='type-id-101' name='userdata'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_export_pubkey' mangled-name='gnutls_pkcs11_privkey_export_pubkey' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_export_pubkey@@GNUTLS_3_4'>
-      <parameter type-id='type-id-384' name='pkey'/>
-      <parameter type-id='type-id-421' name='fmt'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-387' name='pkey'/>
+      <parameter type-id='type-id-424' name='fmt'/>
+      <parameter type-id='type-id-278' name='data'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -12388,51 +12451,51 @@
       <parameter type-id='type-id-10' name='bits'/>
       <parameter type-id='type-id-27' name='label'/>
       <parameter type-id='type-id-57' name='cid'/>
-      <parameter type-id='type-id-421' name='fmt'/>
-      <parameter type-id='type-id-275' name='pubkey'/>
+      <parameter type-id='type-id-424' name='fmt'/>
+      <parameter type-id='type-id-278' name='pubkey'/>
       <parameter type-id='type-id-10' name='key_usage'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_export_url' mangled-name='gnutls_pkcs11_privkey_export_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_export_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-384' name='key'/>
-      <parameter type-id='type-id-925' name='detailed'/>
-      <parameter type-id='type-id-852' name='url'/>
+      <parameter type-id='type-id-387' name='key'/>
+      <parameter type-id='type-id-928' name='detailed'/>
+      <parameter type-id='type-id-855' name='url'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_import_url' mangled-name='gnutls_pkcs11_privkey_import_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_import_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-384' name='pkey'/>
+      <parameter type-id='type-id-387' name='pkey'/>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_status' mangled-name='gnutls_pkcs11_privkey_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-387' name='key'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_get_info' mangled-name='gnutls_pkcs11_privkey_get_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_get_info@@GNUTLS_3_4'>
-      <parameter type-id='type-id-384' name='pkey'/>
-      <parameter type-id='type-id-929' name='itype'/>
+      <parameter type-id='type-id-387' name='pkey'/>
+      <parameter type-id='type-id-932' name='itype'/>
       <parameter type-id='type-id-101' name='output'/>
-      <parameter type-id='type-id-422' name='output_size'/>
+      <parameter type-id='type-id-425' name='output_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_get_pk_algorithm' mangled-name='gnutls_pkcs11_privkey_get_pk_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_get_pk_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-384' name='key'/>
-      <parameter type-id='type-id-419' name='bits'/>
+      <parameter type-id='type-id-387' name='key'/>
+      <parameter type-id='type-id-422' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_deinit' mangled-name='gnutls_pkcs11_privkey_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-387' name='key'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_cpy' mangled-name='gnutls_pkcs11_privkey_cpy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_cpy@@GNUTLS_3_4'>
-      <parameter type-id='type-id-384' name='dst'/>
-      <parameter type-id='type-id-384' name='src'/>
+      <parameter type-id='type-id-387' name='dst'/>
+      <parameter type-id='type-id-387' name='src'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_init' mangled-name='gnutls_pkcs11_privkey_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_privkey_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-759' name='key'/>
+      <parameter type-id='type-id-762' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_set_pin_function' mangled-name='gnutls_pubkey_set_pin_function' visibility='default' binding='global' size-in-bits='64'>
@@ -12493,7 +12556,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pkcs11_write.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs11_write.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_pkcs11_token_get_random' mangled-name='gnutls_pkcs11_token_get_random' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_token_get_random@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='token_url'/>
       <parameter type-id='type-id-101' name='rnddata'/>
@@ -12520,7 +12583,7 @@
     </function-decl>
     <function-decl name='gnutls_pkcs11_copy_x509_privkey2' mangled-name='gnutls_pkcs11_copy_x509_privkey2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_copy_x509_privkey2@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='token_url'/>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-27' name='label'/>
       <parameter type-id='type-id-57' name='cid'/>
       <parameter type-id='type-id-10' name='key_usage'/>
@@ -12529,15 +12592,15 @@
     </function-decl>
     <function-decl name='gnutls_pkcs11_copy_attached_extension' mangled-name='gnutls_pkcs11_copy_attached_extension' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_copy_attached_extension@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='token_url'/>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-278' name='data'/>
       <parameter type-id='type-id-27' name='label'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_copy_pubkey' mangled-name='gnutls_pkcs11_copy_pubkey' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_copy_pubkey@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='token_url'/>
-      <parameter type-id='type-id-267' name='pubkey'/>
+      <parameter type-id='type-id-270' name='pubkey'/>
       <parameter type-id='type-id-27' name='label'/>
       <parameter type-id='type-id-57' name='cid'/>
       <parameter type-id='type-id-10' name='key_usage'/>
@@ -12546,7 +12609,7 @@
     </function-decl>
     <function-decl name='gnutls_pkcs11_copy_x509_crt2' mangled-name='gnutls_pkcs11_copy_x509_crt2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_copy_x509_crt2@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='token_url'/>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-27' name='label'/>
       <parameter type-id='type-id-57' name='cid'/>
       <parameter type-id='type-id-10' name='flags'/>
@@ -12604,29 +12667,29 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pkcs11_secret.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs11_secret.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
     <function-decl name='gnutls_pkcs11_copy_secret_key' mangled-name='gnutls_pkcs11_copy_secret_key' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_copy_secret_key@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='token_url'/>
-      <parameter type-id='type-id-275' name='key'/>
+      <parameter type-id='type-id-278' name='key'/>
       <parameter type-id='type-id-27' name='label'/>
       <parameter type-id='type-id-10' name='key_usage'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='srp.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_srp_server_credentials_st' size-in-bits='768' is-struct='yes' visibility='default' id='type-id-935'>
+  <abi-instr version='1.0' address-size='64' path='srp.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_srp_server_credentials_st' size-in-bits='768' is-struct='yes' visibility='default' id='type-id-938'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='password_file' type-id='type-id-376' visibility='default'/>
+        <var-decl name='password_file' type-id='type-id-379' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='password_conf_file' type-id='type-id-376' visibility='default'/>
+        <var-decl name='password_conf_file' type-id='type-id-379' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='pwd_callback' type-id='type-id-936' visibility='default'/>
+        <var-decl name='pwd_callback' type-id='type-id-939' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='fake_salt_seed' type-id='type-id-490' visibility='default'/>
+        <var-decl name='fake_salt_seed' type-id='type-id-493' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <var-decl name='fake_salt_seed_size' type-id='type-id-10' visibility='default'/>
@@ -12635,18 +12698,18 @@
         <var-decl name='fake_salt_length' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_srp_server_credentials_function' type-id='type-id-937' id='type-id-938'/>
-    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-936'/>
-    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-939'/>
-    <typedef-decl name='gnutls_srp_server_credentials_t' type-id='type-id-939' id='type-id-940'/>
+    <typedef-decl name='gnutls_srp_server_credentials_function' type-id='type-id-940' id='type-id-941'/>
+    <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-939'/>
+    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-942'/>
+    <typedef-decl name='gnutls_srp_server_credentials_t' type-id='type-id-942' id='type-id-943'/>
     <function-decl name='gnutls_srp_set_server_fake_salt_seed' mangled-name='gnutls_srp_set_server_fake_salt_seed' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_set_server_fake_salt_seed@@GNUTLS_3_4'>
-      <parameter type-id='type-id-940' name='cred'/>
+      <parameter type-id='type-id-943' name='cred'/>
       <parameter type-id='type-id-57' name='seed'/>
       <parameter type-id='type-id-10' name='salt_length'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_srp_set_prime_bits' mangled-name='gnutls_srp_set_prime_bits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_set_prime_bits@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='mtu'/>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -12656,66 +12719,66 @@
       <parameter type-id='type-id-57' name='salt'/>
       <parameter type-id='type-id-57' name='generator'/>
       <parameter type-id='type-id-57' name='prime'/>
-      <parameter type-id='type-id-275' name='res'/>
+      <parameter type-id='type-id-278' name='res'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srp_server_get_username' mangled-name='gnutls_srp_server_get_username' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_server_get_username@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-27'/>
     </function-decl>
-    <class-decl name='gnutls_srp_client_credentials_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-941'>
+    <class-decl name='gnutls_srp_client_credentials_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-944'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='username' type-id='type-id-376' visibility='default'/>
+        <var-decl name='username' type-id='type-id-379' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='password' type-id='type-id-376' visibility='default'/>
+        <var-decl name='password' type-id='type-id-379' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='get_function' type-id='type-id-942' visibility='default'/>
+        <var-decl name='get_function' type-id='type-id-945' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_srp_client_credentials_function' type-id='type-id-943' id='type-id-944'/>
-    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-942'/>
-    <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-945'/>
-    <typedef-decl name='gnutls_srp_client_credentials_t' type-id='type-id-945' id='type-id-946'/>
+    <typedef-decl name='gnutls_srp_client_credentials_function' type-id='type-id-946' id='type-id-947'/>
+    <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-945'/>
+    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-948'/>
+    <typedef-decl name='gnutls_srp_client_credentials_t' type-id='type-id-948' id='type-id-949'/>
     <function-decl name='gnutls_srp_set_client_credentials_function' mangled-name='gnutls_srp_set_client_credentials_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_set_client_credentials_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-946' name='cred'/>
-      <parameter type-id='type-id-942' name='func'/>
+      <parameter type-id='type-id-949' name='cred'/>
+      <parameter type-id='type-id-945' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_srp_set_server_credentials_function' mangled-name='gnutls_srp_set_server_credentials_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_set_server_credentials_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-940' name='cred'/>
-      <parameter type-id='type-id-936' name='func'/>
+      <parameter type-id='type-id-943' name='cred'/>
+      <parameter type-id='type-id-939' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_srp_set_server_credentials_file' mangled-name='gnutls_srp_set_server_credentials_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_set_server_credentials_file@@GNUTLS_3_4'>
-      <parameter type-id='type-id-940' name='res'/>
+      <parameter type-id='type-id-943' name='res'/>
       <parameter type-id='type-id-27' name='password_file'/>
       <parameter type-id='type-id-27' name='password_conf_file'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-940' size-in-bits='64' id='type-id-947'/>
+    <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-950'/>
     <function-decl name='gnutls_srp_allocate_server_credentials' mangled-name='gnutls_srp_allocate_server_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_allocate_server_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-947' name='sc'/>
+      <parameter type-id='type-id-950' name='sc'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srp_free_server_credentials' mangled-name='gnutls_srp_free_server_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_free_server_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-940' name='sc'/>
+      <parameter type-id='type-id-943' name='sc'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_srp_set_client_credentials' mangled-name='gnutls_srp_set_client_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_set_client_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-946' name='res'/>
+      <parameter type-id='type-id-949' name='res'/>
       <parameter type-id='type-id-27' name='username'/>
       <parameter type-id='type-id-27' name='password'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-948'/>
+    <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-951'/>
     <function-decl name='gnutls_srp_allocate_client_credentials' mangled-name='gnutls_srp_allocate_client_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_allocate_client_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-948' name='sc'/>
+      <parameter type-id='type-id-951' name='sc'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srp_free_client_credentials' mangled-name='gnutls_srp_free_client_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_free_client_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-946' name='sc'/>
+      <parameter type-id='type-id-949' name='sc'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_file_exists' mangled-name='_gnutls_file_exists' visibility='default' binding='global' size-in-bits='64'>
@@ -12724,72 +12787,82 @@
     <function-decl name='_gnutls_mpi_random_modp' mangled-name='_gnutls_mpi_random_modp' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-943'>
-      <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-852'/>
-      <parameter type-id='type-id-852'/>
+    <function-type size-in-bits='64' id='type-id-946'>
+      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-855'/>
+      <parameter type-id='type-id-855'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-937'>
-      <parameter type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-940'>
+      <parameter type-id='type-id-237'/>
       <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-275'/>
-      <parameter type-id='type-id-275'/>
-      <parameter type-id='type-id-275'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-278'/>
+      <parameter type-id='type-id-278'/>
+      <parameter type-id='type-id-278'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='psk.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_psk_server_credentials_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-949'>
+  <abi-instr version='1.0' address-size='64' path='psk.c' comp-dir-path='/root/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_psk_server_credentials_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-952'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='password_file' type-id='type-id-376' visibility='default'/>
+        <var-decl name='password_file' type-id='type-id-379' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='pwd_callback' type-id='type-id-950' visibility='default'/>
+        <var-decl name='pwd_callback' type-id='type-id-953' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='dh_params' type-id='type-id-418' visibility='default'/>
+        <var-decl name='pwd_callback_legacy' type-id='type-id-954' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='deinit_dh_params' type-id='type-id-10' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-421' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='params_func' type-id='type-id-433' visibility='default'/>
+        <var-decl name='deinit_dh_params' type-id='type-id-10' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='288'>
+        <var-decl name='dh_sec_param' type-id='type-id-203' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='hint' type-id='type-id-376' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-436' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='hint' type-id='type-id-379' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='binder_algo' type-id='type-id-13' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_psk_server_credentials_function' type-id='type-id-951' id='type-id-952'/>
-    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-950'/>
-    <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-953'/>
-    <typedef-decl name='gnutls_psk_server_credentials_t' type-id='type-id-953' id='type-id-954'/>
+    <typedef-decl name='gnutls_psk_server_credentials_function2' type-id='type-id-955' id='type-id-956'/>
+    <pointer-type-def type-id='type-id-956' size-in-bits='64' id='type-id-953'/>
+    <typedef-decl name='gnutls_psk_server_credentials_function' type-id='type-id-957' id='type-id-958'/>
+    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-954'/>
+    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-959'/>
+    <typedef-decl name='gnutls_psk_server_credentials_t' type-id='type-id-959' id='type-id-960'/>
     <function-decl name='gnutls_psk_set_server_known_dh_params' mangled-name='gnutls_psk_set_server_known_dh_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_set_server_known_dh_params@@GNUTLS_3_4'>
-      <parameter type-id='type-id-954' name='res'/>
-      <parameter type-id='type-id-202' name='sec_param'/>
+      <parameter type-id='type-id-960' name='res'/>
+      <parameter type-id='type-id-203' name='sec_param'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_psk_set_server_dh_params' mangled-name='gnutls_psk_set_server_dh_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_set_server_dh_params@@GNUTLS_3_4'>
-      <parameter type-id='type-id-954' name='res'/>
-      <parameter type-id='type-id-418' name='dh_params'/>
+      <parameter type-id='type-id-960' name='res'/>
+      <parameter type-id='type-id-421' name='dh_params'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_psk_client_get_hint' mangled-name='gnutls_psk_client_get_hint' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_client_get_hint@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-27'/>
     </function-decl>
+    <function-decl name='gnutls_psk_server_get_username2' mangled-name='gnutls_psk_server_get_username2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_server_get_username2@@GNUTLS_3_6_13'>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-278' name='username'/>
+      <return type-id='type-id-22'/>
+    </function-decl>
     <function-decl name='gnutls_psk_server_get_username' mangled-name='gnutls_psk_server_get_username' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_server_get_username@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-27'/>
     </function-decl>
-    <class-decl name='gnutls_psk_client_credentials_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-955'>
+    <class-decl name='gnutls_psk_client_credentials_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-961'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='username' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -12797,86 +12870,120 @@
         <var-decl name='key' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='get_function' type-id='type-id-956' visibility='default'/>
+        <var-decl name='get_function' type-id='type-id-962' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='get_function_legacy' type-id='type-id-963' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='binder_algo' type-id='type-id-13' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_psk_client_credentials_function' type-id='type-id-957' id='type-id-958'/>
-    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-956'/>
-    <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-959'/>
-    <typedef-decl name='gnutls_psk_client_credentials_t' type-id='type-id-959' id='type-id-960'/>
+    <typedef-decl name='gnutls_psk_client_credentials_function2' type-id='type-id-964' id='type-id-965'/>
+    <pointer-type-def type-id='type-id-965' size-in-bits='64' id='type-id-962'/>
+    <typedef-decl name='gnutls_psk_client_credentials_function' type-id='type-id-966' id='type-id-967'/>
+    <pointer-type-def type-id='type-id-967' size-in-bits='64' id='type-id-963'/>
+    <pointer-type-def type-id='type-id-961' size-in-bits='64' id='type-id-968'/>
+    <typedef-decl name='gnutls_psk_client_credentials_t' type-id='type-id-968' id='type-id-969'/>
+    <function-decl name='gnutls_psk_set_client_credentials_function2' mangled-name='gnutls_psk_set_client_credentials_function2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_set_client_credentials_function2@@GNUTLS_3_6_13'>
+      <parameter type-id='type-id-969' name='cred'/>
+      <parameter type-id='type-id-962' name='func'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='gnutls_psk_set_client_credentials_function' mangled-name='gnutls_psk_set_client_credentials_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_set_client_credentials_function@@GNUTLS_3_4'>
+      <parameter type-id='type-id-969' name='cred'/>
+      <parameter type-id='type-id-963' name='func'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='gnutls_psk_set_server_credentials_function2' mangled-name='gnutls_psk_set_server_credentials_function2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_set_server_credentials_function2@@GNUTLS_3_6_13'>
       <parameter type-id='type-id-960' name='cred'/>
-      <parameter type-id='type-id-956' name='func'/>
+      <parameter type-id='type-id-953' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_psk_set_server_credentials_function' mangled-name='gnutls_psk_set_server_credentials_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_set_server_credentials_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-954' name='cred'/>
-      <parameter type-id='type-id-950' name='func'/>
+      <parameter type-id='type-id-960' name='cred'/>
+      <parameter type-id='type-id-954' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_psk_set_server_credentials_hint' mangled-name='gnutls_psk_set_server_credentials_hint' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_set_server_credentials_hint@@GNUTLS_3_4'>
-      <parameter type-id='type-id-954' name='res'/>
+      <parameter type-id='type-id-960' name='res'/>
       <parameter type-id='type-id-27' name='hint'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_psk_set_server_credentials_file' mangled-name='gnutls_psk_set_server_credentials_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_set_server_credentials_file@@GNUTLS_3_4'>
-      <parameter type-id='type-id-954' name='res'/>
+      <parameter type-id='type-id-960' name='res'/>
       <parameter type-id='type-id-27' name='password_file'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-954' size-in-bits='64' id='type-id-961'/>
+    <pointer-type-def type-id='type-id-960' size-in-bits='64' id='type-id-970'/>
     <function-decl name='gnutls_psk_allocate_server_credentials' mangled-name='gnutls_psk_allocate_server_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_allocate_server_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-961' name='sc'/>
+      <parameter type-id='type-id-970' name='sc'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_psk_free_server_credentials' mangled-name='gnutls_psk_free_server_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_free_server_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-954' name='sc'/>
+      <parameter type-id='type-id-960' name='sc'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <enum-decl name='gnutls_psk_key_flags' id='type-id-962'>
+    <enum-decl name='gnutls_psk_key_flags' id='type-id-971'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PSK_KEY_RAW' value='0'/>
       <enumerator name='GNUTLS_PSK_KEY_HEX' value='1'/>
     </enum-decl>
-    <typedef-decl name='gnutls_psk_key_flags' type-id='type-id-962' id='type-id-963'/>
+    <typedef-decl name='gnutls_psk_key_flags' type-id='type-id-971' id='type-id-972'/>
+    <function-decl name='gnutls_psk_set_client_credentials2' mangled-name='gnutls_psk_set_client_credentials2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_set_client_credentials2@@GNUTLS_3_6_13'>
+      <parameter type-id='type-id-969' name='res'/>
+      <parameter type-id='type-id-57' name='username'/>
+      <parameter type-id='type-id-57' name='key'/>
+      <parameter type-id='type-id-972' name='flags'/>
+      <return type-id='type-id-22'/>
+    </function-decl>
     <function-decl name='gnutls_psk_set_client_credentials' mangled-name='gnutls_psk_set_client_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_set_client_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-960' name='res'/>
+      <parameter type-id='type-id-969' name='res'/>
       <parameter type-id='type-id-27' name='username'/>
       <parameter type-id='type-id-57' name='key'/>
-      <parameter type-id='type-id-963' name='flags'/>
+      <parameter type-id='type-id-972' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-960' size-in-bits='64' id='type-id-964'/>
+    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-973'/>
     <function-decl name='gnutls_psk_allocate_client_credentials' mangled-name='gnutls_psk_allocate_client_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_allocate_client_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-964' name='sc'/>
+      <parameter type-id='type-id-973' name='sc'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_psk_free_client_credentials' mangled-name='gnutls_psk_free_client_credentials' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_free_client_credentials@@GNUTLS_3_4'>
-      <parameter type-id='type-id-960' name='sc'/>
+      <parameter type-id='type-id-969' name='sc'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_psk_set_server_params_function' mangled-name='gnutls_psk_set_server_params_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_psk_set_server_params_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-954' name='res'/>
-      <parameter type-id='type-id-433' name='func'/>
+      <parameter type-id='type-id-960' name='res'/>
+      <parameter type-id='type-id-436' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-957'>
-      <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-852'/>
-      <parameter type-id='type-id-275'/>
+    <function-type size-in-bits='64' id='type-id-966'>
+      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-855'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-951'>
-      <parameter type-id='type-id-236'/>
+    <function-type size-in-bits='64' id='type-id-957'>
+      <parameter type-id='type-id-237'/>
       <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-278'/>
+      <return type-id='type-id-22'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-955'>
+      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-57'/>
+      <parameter type-id='type-id-278'/>
+      <return type-id='type-id-22'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-964'>
+      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-278'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='read-file.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='read-file.c' comp-dir-path='/root/gnutls/gl' language='LANG_C99'>
     <function-decl name='ftello' mangled-name='ftello' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -12889,19 +12996,19 @@
     <function-decl name='realloc' mangled-name='realloc' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='fread' mangled-name='fread' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__fread_alias' mangled-name='fread' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='ferror' mangled-name='ferror' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='asnprintf.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='asnprintf.c' comp-dir-path='/root/gnutls/gl' language='LANG_C99'>
     <function-decl name='vasnprintf' mangled-name='vasnprintf' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='vasnprintf.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='vasnprintf.c' comp-dir-path='/root/gnutls/gl' language='LANG_C99'>
     <function-decl name='printf_parse' mangled-name='printf_parse' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -12909,17 +13016,17 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='common.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='common.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_oid_to_gost_paramset' mangled-name='gnutls_oid_to_gost_paramset' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_oid_to_gost_paramset@@GNUTLS_3_6_3'>
       <parameter type-id='type-id-27' name='oid'/>
-      <return type-id='type-id-315'/>
+      <return type-id='type-id-318'/>
     </function-decl>
     <function-decl name='gnutls_gost_paramset_get_oid' mangled-name='gnutls_gost_paramset_get_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_gost_paramset_get_oid@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-315' name='param'/>
+      <parameter type-id='type-id-318' name='param'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_gost_paramset_get_name' mangled-name='gnutls_gost_paramset_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_gost_paramset_get_name@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-315' name='param'/>
+      <parameter type-id='type-id-318' name='param'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_x509_dn_oid_name' mangled-name='gnutls_x509_dn_oid_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_dn_oid_name@@GNUTLS_3_4'>
@@ -12971,7 +13078,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='key_encode.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='key_encode.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='asn1_delete_structure2' mangled-name='asn1_delete_structure2' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -12997,7 +13104,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='key_decode.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='key_decode.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='asn1_get_length_der' mangled-name='asn1_get_length_der' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -13008,7 +13115,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='time.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='time.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='_gnutls_x509_generalTime2gtime' mangled-name='_gnutls_x509_generalTime2gtime' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_x509_generalTime2gtime@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-27' name='ttime'/>
       <return type-id='type-id-17'/>
@@ -13024,197 +13131,197 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='crl.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crl.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_crl_list_import' mangled-name='gnutls_x509_crl_list_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_list_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-731' name='crls'/>
-      <parameter type-id='type-id-419' name='crl_max'/>
+      <parameter type-id='type-id-734' name='crls'/>
+      <parameter type-id='type-id-422' name='crl_max'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-731' size-in-bits='64' id='type-id-965'/>
+    <pointer-type-def type-id='type-id-734' size-in-bits='64' id='type-id-974'/>
     <function-decl name='gnutls_x509_crl_list_import2' mangled-name='gnutls_x509_crl_list_import2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_list_import2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-965' name='crls'/>
-      <parameter type-id='type-id-419' name='size'/>
+      <parameter type-id='type-id-974' name='crls'/>
+      <parameter type-id='type-id-422' name='size'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_extension_data' mangled-name='gnutls_x509_crl_get_extension_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_extension_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='data'/>
-      <parameter type-id='type-id-422' name='sizeof_data'/>
+      <parameter type-id='type-id-425' name='sizeof_data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_extension_info' mangled-name='gnutls_x509_crl_get_extension_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_extension_info@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='oid'/>
-      <parameter type-id='type-id-422' name='sizeof_oid'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='sizeof_oid'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_extension_oid' mangled-name='gnutls_x509_crl_get_extension_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_extension_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='oid'/>
-      <parameter type-id='type-id-422' name='sizeof_oid'/>
+      <parameter type-id='type-id-425' name='sizeof_oid'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_number' mangled-name='gnutls_x509_crl_get_number' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_number@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-101' name='ret'/>
-      <parameter type-id='type-id-422' name='ret_size'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='ret_size'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_authority_key_id' mangled-name='gnutls_x509_crl_get_authority_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_authority_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-101' name='id'/>
-      <parameter type-id='type-id-422' name='id_size'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='id_size'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_authority_key_gn_serial' mangled-name='gnutls_x509_crl_get_authority_key_gn_serial' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_authority_key_gn_serial@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-10' name='seq'/>
       <parameter type-id='type-id-101' name='alt'/>
-      <parameter type-id='type-id-422' name='alt_size'/>
-      <parameter type-id='type-id-419' name='alt_type'/>
+      <parameter type-id='type-id-425' name='alt_size'/>
+      <parameter type-id='type-id-422' name='alt_type'/>
       <parameter type-id='type-id-101' name='serial'/>
-      <parameter type-id='type-id-422' name='serial_size'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='serial_size'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_export' mangled-name='gnutls_x509_crl_export' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_export@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-101' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_raw_issuer_dn' mangled-name='gnutls_x509_crl_get_raw_issuer_dn' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_raw_issuer_dn@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-275' name='dn'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-278' name='dn'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_x509_crl_iter' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-966'>
+    <class-decl name='gnutls_x509_crl_iter' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-975'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='rcache' type-id='type-id-387' visibility='default'/>
+        <var-decl name='rcache' type-id='type-id-390' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='rcache_idx' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-966' size-in-bits='64' id='type-id-967'/>
-    <typedef-decl name='gnutls_x509_crl_iter_t' type-id='type-id-967' id='type-id-968'/>
-    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-969'/>
+    <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-976'/>
+    <typedef-decl name='gnutls_x509_crl_iter_t' type-id='type-id-976' id='type-id-977'/>
+    <pointer-type-def type-id='type-id-977' size-in-bits='64' id='type-id-978'/>
     <function-decl name='gnutls_x509_crl_iter_crt_serial' mangled-name='gnutls_x509_crl_iter_crt_serial' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_iter_crt_serial@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-969' name='iter'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-978' name='iter'/>
       <parameter type-id='type-id-64' name='serial'/>
-      <parameter type-id='type-id-422' name='serial_size'/>
-      <parameter type-id='type-id-514' name='t'/>
+      <parameter type-id='type-id-425' name='serial_size'/>
+      <parameter type-id='type-id-517' name='t'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_iter_deinit' mangled-name='gnutls_x509_crl_iter_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_iter_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-968' name='iter'/>
+      <parameter type-id='type-id-977' name='iter'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_crt_serial' mangled-name='gnutls_x509_crl_get_crt_serial' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_crt_serial@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-64' name='serial'/>
-      <parameter type-id='type-id-422' name='serial_size'/>
-      <parameter type-id='type-id-514' name='t'/>
+      <parameter type-id='type-id-425' name='serial_size'/>
+      <parameter type-id='type-id-517' name='t'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_crt_count' mangled-name='gnutls_x509_crl_get_crt_count' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_crt_count@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_next_update' mangled-name='gnutls_x509_crl_get_next_update' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_next_update@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_this_update' mangled-name='gnutls_x509_crl_get_this_update' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_this_update@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_version' mangled-name='gnutls_x509_crl_get_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_version@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_signature' mangled-name='gnutls_x509_crl_get_signature' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_signature@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-376' name='sig'/>
-      <parameter type-id='type-id-422' name='sizeof_sig'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-379' name='sig'/>
+      <parameter type-id='type-id-425' name='sizeof_sig'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_signature_oid' mangled-name='gnutls_x509_crl_get_signature_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_signature_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-376' name='oid'/>
-      <parameter type-id='type-id-422' name='oid_size'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-379' name='oid'/>
+      <parameter type-id='type-id-425' name='oid_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_signature_algorithm' mangled-name='gnutls_x509_crl_get_signature_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_signature_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_issuer_dn3' mangled-name='gnutls_x509_crl_get_issuer_dn3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_issuer_dn3@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-275' name='dn'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-278' name='dn'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_issuer_dn2' mangled-name='gnutls_x509_crl_get_issuer_dn2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_issuer_dn2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-275' name='dn'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-278' name='dn'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_dn_oid' mangled-name='gnutls_x509_crl_get_dn_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_dn_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='oid'/>
-      <parameter type-id='type-id-422' name='sizeof_oid'/>
+      <parameter type-id='type-id-425' name='sizeof_oid'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_issuer_dn_by_oid' mangled-name='gnutls_x509_crl_get_issuer_dn_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_issuer_dn_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
       <parameter type-id='type-id-101' name='buf'/>
-      <parameter type-id='type-id-422' name='sizeof_buf'/>
+      <parameter type-id='type-id-425' name='sizeof_buf'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_get_issuer_dn' mangled-name='gnutls_x509_crl_get_issuer_dn' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_issuer_dn@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-422' name='sizeof_buf'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-379' name='buf'/>
+      <parameter type-id='type-id-425' name='sizeof_buf'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_import' mangled-name='gnutls_x509_crl_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_deinit' mangled-name='gnutls_x509_crl_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_init' mangled-name='gnutls_x509_crl_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-731' name='crl'/>
+      <parameter type-id='type-id-734' name='crl'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_export2' mangled-name='gnutls_x509_crl_export2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_export2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-421' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-424' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crl_get_extension_oid' mangled-name='_gnutls_x509_crl_get_extension_oid' visibility='default' binding='global' size-in-bits='64'>
@@ -13263,66 +13370,66 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='crl_write.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crl_write.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_crl_privkey_sign' mangled-name='gnutls_x509_crl_privkey_sign' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_privkey_sign@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-467' name='issuer'/>
-      <parameter type-id='type-id-401' name='issuer_key'/>
-      <parameter type-id='type-id-211' name='dig'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-470' name='issuer'/>
+      <parameter type-id='type-id-404' name='issuer_key'/>
+      <parameter type-id='type-id-212' name='dig'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_set_number' mangled-name='gnutls_x509_crl_set_number' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_set_number@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-101' name='nr'/>
       <parameter type-id='type-id-99' name='nr_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_set_authority_key_id' mangled-name='gnutls_x509_crl_set_authority_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_set_authority_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-101' name='nr'/>
       <parameter type-id='type-id-99' name='nr_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_set_crt' mangled-name='gnutls_x509_crl_set_crt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_set_crt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-17' name='revocation_time'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_set_crt_serial' mangled-name='gnutls_x509_crl_set_crt_serial' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_set_crt_serial@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-101' name='serial'/>
       <parameter type-id='type-id-99' name='serial_size'/>
       <parameter type-id='type-id-17' name='revocation_time'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_set_next_update' mangled-name='gnutls_x509_crl_set_next_update' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_set_next_update@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-17' name='exp_time'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_set_this_update' mangled-name='gnutls_x509_crl_set_this_update' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_set_this_update@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-17' name='exp_time'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_sign' mangled-name='gnutls_x509_crl_sign' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_sign@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-467' name='issuer'/>
-      <parameter type-id='type-id-383' name='issuer_key'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-470' name='issuer'/>
+      <parameter type-id='type-id-386' name='issuer_key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_sign2' mangled-name='gnutls_x509_crl_sign2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_sign2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-467' name='issuer'/>
-      <parameter type-id='type-id-383' name='issuer_key'/>
-      <parameter type-id='type-id-211' name='dig'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-470' name='issuer'/>
+      <parameter type-id='type-id-386' name='issuer_key'/>
+      <parameter type-id='type-id-212' name='dig'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_set_version' mangled-name='gnutls_x509_crl_set_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_set_version@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-10' name='version'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -13342,107 +13449,107 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='crq.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crq.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_crq_set_spki' mangled-name='gnutls_x509_crq_set_spki' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_spki@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-758' name='spki'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-761' name='spki'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_set_extension_by_oid' mangled-name='gnutls_x509_crq_set_extension_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_extension_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-101' name='buf'/>
       <parameter type-id='type-id-99' name='sizeof_buf'/>
       <parameter type-id='type-id-10' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_x509_tlsfeatures_st' size-in-bits='544' is-struct='yes' visibility='default' id='type-id-970'>
+    <class-decl name='gnutls_x509_tlsfeatures_st' size-in-bits='544' is-struct='yes' visibility='default' id='type-id-979'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='feature' type-id='type-id-971' visibility='default'/>
+        <var-decl name='feature' type-id='type-id-980' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='512' id='type-id-971'>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='512' id='type-id-980'>
       <subrange length='32' type-id='type-id-38' id='type-id-51'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-972'/>
-    <typedef-decl name='gnutls_x509_tlsfeatures_t' type-id='type-id-972' id='type-id-973'/>
+    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-981'/>
+    <typedef-decl name='gnutls_x509_tlsfeatures_t' type-id='type-id-981' id='type-id-982'/>
     <function-decl name='gnutls_x509_crq_set_tlsfeatures' mangled-name='gnutls_x509_crq_set_tlsfeatures' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_tlsfeatures@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-973' name='features'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-982' name='features'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_tlsfeatures' mangled-name='gnutls_x509_crq_get_tlsfeatures' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_tlsfeatures@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-973' name='features'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-982' name='features'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_set_private_key_usage_period' mangled-name='gnutls_x509_crq_set_private_key_usage_period' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_private_key_usage_period@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-17' name='activation'/>
       <parameter type-id='type-id-17' name='expiration'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_verify' mangled-name='gnutls_x509_crq_verify' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_verify@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_privkey_sign' mangled-name='gnutls_x509_crq_privkey_sign' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_privkey_sign@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-401' name='key'/>
-      <parameter type-id='type-id-211' name='dig'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-404' name='key'/>
+      <parameter type-id='type-id-212' name='dig'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_key_id' mangled-name='gnutls_x509_crq_get_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_set_key_purpose_oid' mangled-name='gnutls_x509_crq_set_key_purpose_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_key_purpose_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-101' name='oid'/>
       <parameter type-id='type-id-10' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_key_purpose_oid' mangled-name='gnutls_x509_crq_get_key_purpose_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_key_purpose_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='oid'/>
-      <parameter type-id='type-id-422' name='sizeof_oid'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='sizeof_oid'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_set_key_usage' mangled-name='gnutls_x509_crq_set_key_usage' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_key_usage@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='usage'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_set_basic_constraints' mangled-name='gnutls_x509_crq_set_basic_constraints' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_basic_constraints@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='ca'/>
       <parameter type-id='type-id-22' name='pathLenConstraint'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_set_subject_alt_othername' mangled-name='gnutls_x509_crq_set_subject_alt_othername' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_subject_alt_othername@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-10' name='data_size'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='gnutls_x509_subject_alt_name_t' id='type-id-974'>
+    <enum-decl name='gnutls_x509_subject_alt_name_t' id='type-id-983'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_SAN_DNSNAME' value='1'/>
       <enumerator name='GNUTLS_SAN_RFC822NAME' value='2'/>
@@ -13455,163 +13562,163 @@
       <enumerator name='GNUTLS_SAN_OTHERNAME_XMPP' value='1000'/>
       <enumerator name='GNUTLS_SAN_OTHERNAME_KRB5PRINCIPAL' value='1001'/>
     </enum-decl>
-    <typedef-decl name='gnutls_x509_subject_alt_name_t' type-id='type-id-974' id='type-id-975'/>
+    <typedef-decl name='gnutls_x509_subject_alt_name_t' type-id='type-id-983' id='type-id-984'/>
     <function-decl name='gnutls_x509_crq_set_subject_alt_name' mangled-name='gnutls_x509_crq_set_subject_alt_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_subject_alt_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-975' name='nt'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-984' name='nt'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-10' name='data_size'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_extension_by_oid2' mangled-name='gnutls_x509_crq_get_extension_by_oid2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_extension_by_oid2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='output'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-278' name='output'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_extension_by_oid' mangled-name='gnutls_x509_crq_get_extension_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_extension_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_subject_alt_othername_oid' mangled-name='gnutls_x509_crq_get_subject_alt_othername_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_subject_alt_othername_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='seq'/>
       <parameter type-id='type-id-101' name='ret'/>
-      <parameter type-id='type-id-422' name='ret_size'/>
+      <parameter type-id='type-id-425' name='ret_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_subject_alt_name' mangled-name='gnutls_x509_crq_get_subject_alt_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_subject_alt_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='seq'/>
       <parameter type-id='type-id-101' name='ret'/>
-      <parameter type-id='type-id-422' name='ret_size'/>
-      <parameter type-id='type-id-419' name='ret_type'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='ret_size'/>
+      <parameter type-id='type-id-422' name='ret_type'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_basic_constraints' mangled-name='gnutls_x509_crq_get_basic_constraints' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_basic_constraints@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-419' name='critical'/>
-      <parameter type-id='type-id-419' name='ca'/>
-      <parameter type-id='type-id-364' name='pathlen'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-422' name='critical'/>
+      <parameter type-id='type-id-422' name='ca'/>
+      <parameter type-id='type-id-367' name='pathlen'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_key_usage' mangled-name='gnutls_x509_crq_get_key_usage' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_key_usage@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-419' name='key_usage'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-422' name='key_usage'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_extension_data2' mangled-name='gnutls_x509_crq_get_extension_data2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_extension_data2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-278' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_extension_data' mangled-name='gnutls_x509_crq_get_extension_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_extension_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='data'/>
-      <parameter type-id='type-id-422' name='sizeof_data'/>
+      <parameter type-id='type-id-425' name='sizeof_data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_extension_info' mangled-name='gnutls_x509_crq_get_extension_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_extension_info@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='oid'/>
-      <parameter type-id='type-id-422' name='sizeof_oid'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='sizeof_oid'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_attribute_data' mangled-name='gnutls_x509_crq_get_attribute_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_attribute_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='data'/>
-      <parameter type-id='type-id-422' name='sizeof_data'/>
+      <parameter type-id='type-id-425' name='sizeof_data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_attribute_info' mangled-name='gnutls_x509_crq_get_attribute_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_attribute_info@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='data'/>
-      <parameter type-id='type-id-422' name='sizeof_data'/>
+      <parameter type-id='type-id-425' name='sizeof_data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_pk_oid' mangled-name='gnutls_x509_crq_get_pk_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_pk_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-376' name='oid'/>
-      <parameter type-id='type-id-422' name='oid_size'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-379' name='oid'/>
+      <parameter type-id='type-id-425' name='oid_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_signature_oid' mangled-name='gnutls_x509_crq_get_signature_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_signature_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-376' name='oid'/>
-      <parameter type-id='type-id-422' name='oid_size'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-379' name='oid'/>
+      <parameter type-id='type-id-425' name='oid_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_spki' mangled-name='gnutls_x509_crq_get_spki' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_spki@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-757' name='spki'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-760' name='spki'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_export2' mangled-name='gnutls_x509_crq_export2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_export2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-421' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-424' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_export' mangled-name='gnutls_x509_crq_export' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_export@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-101' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_sign' mangled-name='gnutls_x509_crq_sign' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_sign@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-386' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_sign2' mangled-name='gnutls_x509_crq_sign2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_sign2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-211' name='dig'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-212' name='dig'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_set_challenge_password' mangled-name='gnutls_x509_crq_set_challenge_password' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_challenge_password@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-27' name='pass'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_set_key_rsa_raw' mangled-name='gnutls_x509_crq_set_key_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_key_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-57' name='m'/>
       <parameter type-id='type-id-57' name='e'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_key_rsa_raw' mangled-name='gnutls_x509_crq_get_key_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_key_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-278' name='m'/>
+      <parameter type-id='type-id-278' name='e'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_set_key' mangled-name='gnutls_x509_crq_set_key' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_key@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-386' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_set_dn_by_oid' mangled-name='gnutls_x509_crq_set_dn_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_dn_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
       <parameter type-id='type-id-101' name='data'/>
@@ -13619,97 +13726,97 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_set_attribute_by_oid' mangled-name='gnutls_x509_crq_set_attribute_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_attribute_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-101' name='buf'/>
       <parameter type-id='type-id-99' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_challenge_password' mangled-name='gnutls_x509_crq_get_challenge_password' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_challenge_password@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-376' name='pass'/>
-      <parameter type-id='type-id-422' name='pass_size'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-379' name='pass'/>
+      <parameter type-id='type-id-425' name='pass_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_dn_oid' mangled-name='gnutls_x509_crq_get_dn_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_dn_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='oid'/>
-      <parameter type-id='type-id-422' name='sizeof_oid'/>
+      <parameter type-id='type-id-425' name='sizeof_oid'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_dn_by_oid' mangled-name='gnutls_x509_crq_get_dn_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_dn_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
       <parameter type-id='type-id-101' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_dn3' mangled-name='gnutls_x509_crq_get_dn3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_dn3@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-275' name='dn'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-278' name='dn'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_dn2' mangled-name='gnutls_x509_crq_get_dn2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_dn2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-275' name='dn'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-278' name='dn'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_dn' mangled-name='gnutls_x509_crq_get_dn' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_dn@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-379' name='buf'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_private_key_usage_period' mangled-name='gnutls_x509_crq_get_private_key_usage_period' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_private_key_usage_period@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-514' name='activation'/>
-      <parameter type-id='type-id-514' name='expiration'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-517' name='activation'/>
+      <parameter type-id='type-id-517' name='expiration'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_signature_algorithm' mangled-name='gnutls_x509_crq_get_signature_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_signature_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_import' mangled-name='gnutls_x509_crq_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_deinit' mangled-name='gnutls_x509_crq_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-768' size-in-bits='64' id='type-id-976'/>
+    <pointer-type-def type-id='type-id-771' size-in-bits='64' id='type-id-985'/>
     <function-decl name='gnutls_x509_crq_init' mangled-name='gnutls_x509_crq_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-976' name='crq'/>
+      <parameter type-id='type-id-985' name='crq'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_attribute_by_oid' mangled-name='gnutls_x509_crq_get_attribute_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_attribute_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_set_version' mangled-name='gnutls_x509_crq_set_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_version@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-10' name='version'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_version' mangled-name='gnutls_x509_crq_get_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_version@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_pk_algorithm' mangled-name='gnutls_x509_crq_get_pk_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_get_pk_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-419' name='bits'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-422' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_x509_read_pkalgo_params' mangled-name='_gnutls_x509_read_pkalgo_params' visibility='default' binding='global' size-in-bits='64'>
@@ -13794,12 +13901,12 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dn.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dn.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_rdn_get_oid' mangled-name='gnutls_x509_rdn_get_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_rdn_get_oid@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='idn'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_rdn_get_by_oid' mangled-name='gnutls_x509_rdn_get_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_rdn_get_by_oid@@GNUTLS_3_4'>
@@ -13808,19 +13915,19 @@
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
       <parameter type-id='type-id-101' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_rdn_get2' mangled-name='gnutls_x509_rdn_get2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_rdn_get2@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='idn'/>
-      <parameter type-id='type-id-275' name='str'/>
+      <parameter type-id='type-id-278' name='str'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_rdn_get' mangled-name='gnutls_x509_rdn_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_rdn_get@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='idn'/>
-      <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
+      <parameter type-id='type-id-379' name='buf'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_dn_init' mangled-name='gnutls_x509_dn_init' visibility='default' binding='global' size-in-bits='64'>
@@ -13845,17 +13952,17 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='extensions.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='extensions.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_crl_get_extension_data2' mangled-name='gnutls_x509_crl_get_extension_data2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_get_extension_data2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-278' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_extension_data2' mangled-name='gnutls_x509_crt_get_extension_data2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_extension_data2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-278' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_aki_init' mangled-name='gnutls_x509_aki_init' visibility='default' binding='global' size-in-bits='64'>
@@ -13892,22 +13999,22 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='mpi.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='mpi.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='_gnutls_x509_write_rsa_pss_params' mangled-name='_gnutls_x509_write_rsa_pss_params' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_asnstr_append_name' mangled-name='_asnstr_append_name' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_x509_read_pubkey' mangled-name='_gnutls_x509_read_pubkey' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_x509_read_pubkey_params' mangled-name='_gnutls_x509_read_pubkey_params' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_x509_read_pubkey_params' mangled-name='_gnutls_x509_read_pubkey_params' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_x509_read_pubkey' mangled-name='_gnutls_x509_read_pubkey' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='output.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
-    <enum-decl name='gnutls_certificate_print_formats' id='type-id-977'>
+  <abi-instr version='1.0' address-size='64' path='output.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
+    <enum-decl name='gnutls_certificate_print_formats' id='type-id-986'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_CRT_PRINT_FULL' value='0'/>
       <enumerator name='GNUTLS_CRT_PRINT_ONELINE' value='1'/>
@@ -13915,36 +14022,36 @@
       <enumerator name='GNUTLS_CRT_PRINT_COMPACT' value='3'/>
       <enumerator name='GNUTLS_CRT_PRINT_FULL_NUMBERS' value='4'/>
     </enum-decl>
-    <typedef-decl name='gnutls_certificate_print_formats_t' type-id='type-id-977' id='type-id-978'/>
+    <typedef-decl name='gnutls_certificate_print_formats_t' type-id='type-id-986' id='type-id-987'/>
     <function-decl name='gnutls_x509_ext_print' mangled-name='gnutls_x509_ext_print' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_print@@GNUTLS_3_4'>
-      <parameter type-id='type-id-933' name='exts'/>
+      <parameter type-id='type-id-936' name='exts'/>
       <parameter type-id='type-id-10' name='exts_size'/>
-      <parameter type-id='type-id-978' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-987' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_print' mangled-name='gnutls_pubkey_print' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pubkey_print@@GNUTLS_3_4'>
-      <parameter type-id='type-id-267' name='pubkey'/>
-      <parameter type-id='type-id-978' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-270' name='pubkey'/>
+      <parameter type-id='type-id-987' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_print' mangled-name='gnutls_x509_crq_print' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_print@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
-      <parameter type-id='type-id-978' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-771' name='crq'/>
+      <parameter type-id='type-id-987' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_print' mangled-name='gnutls_x509_crl_print' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_print@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-978' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-987' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_print' mangled-name='gnutls_x509_crt_print' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_print@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-978' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-987' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_get_version' mangled-name='gnutls_x509_crq_get_version' visibility='default' binding='global' size-in-bits='64'>
@@ -14206,77 +14313,77 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pkcs12.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
-    <class-decl name='gnutls_pkcs12_int' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-979'>
+  <abi-instr version='1.0' address-size='64' path='pkcs12.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
+    <class-decl name='gnutls_pkcs12_int' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-988'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pkcs12' type-id='type-id-387' visibility='default'/>
+        <var-decl name='pkcs12' type-id='type-id-390' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='expanded' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-980'/>
-    <typedef-decl name='gnutls_pkcs12_t' type-id='type-id-980' id='type-id-981'/>
+    <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-989'/>
+    <typedef-decl name='gnutls_pkcs12_t' type-id='type-id-989' id='type-id-990'/>
     <function-decl name='gnutls_pkcs12_mac_info' mangled-name='gnutls_pkcs12_mac_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_mac_info@@GNUTLS_3_4'>
-      <parameter type-id='type-id-981' name='pkcs12'/>
-      <parameter type-id='type-id-419' name='mac'/>
+      <parameter type-id='type-id-990' name='pkcs12'/>
+      <parameter type-id='type-id-422' name='mac'/>
       <parameter type-id='type-id-101' name='salt'/>
-      <parameter type-id='type-id-419' name='salt_size'/>
-      <parameter type-id='type-id-419' name='iter_count'/>
-      <parameter type-id='type-id-852' name='oid'/>
+      <parameter type-id='type-id-422' name='salt_size'/>
+      <parameter type-id='type-id-422' name='iter_count'/>
+      <parameter type-id='type-id-855' name='oid'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_simple_parse' mangled-name='gnutls_pkcs12_simple_parse' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_simple_parse@@GNUTLS_3_4'>
-      <parameter type-id='type-id-981' name='p12'/>
+      <parameter type-id='type-id-990' name='p12'/>
       <parameter type-id='type-id-27' name='password'/>
-      <parameter type-id='type-id-734' name='key'/>
-      <parameter type-id='type-id-733' name='chain'/>
-      <parameter type-id='type-id-419' name='chain_len'/>
-      <parameter type-id='type-id-733' name='extra_certs'/>
-      <parameter type-id='type-id-419' name='extra_certs_len'/>
-      <parameter type-id='type-id-731' name='crl'/>
+      <parameter type-id='type-id-737' name='key'/>
+      <parameter type-id='type-id-736' name='chain'/>
+      <parameter type-id='type-id-422' name='chain_len'/>
+      <parameter type-id='type-id-736' name='extra_certs'/>
+      <parameter type-id='type-id-422' name='extra_certs_len'/>
+      <parameter type-id='type-id-734' name='crl'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_verify_mac' mangled-name='gnutls_pkcs12_verify_mac' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_verify_mac@@GNUTLS_3_4'>
-      <parameter type-id='type-id-981' name='pkcs12'/>
+      <parameter type-id='type-id-990' name='pkcs12'/>
       <parameter type-id='type-id-27' name='pass'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_generate_mac' mangled-name='gnutls_pkcs12_generate_mac' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_generate_mac@@GNUTLS_3_4'>
-      <parameter type-id='type-id-981' name='pkcs12'/>
+      <parameter type-id='type-id-990' name='pkcs12'/>
       <parameter type-id='type-id-27' name='pass'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_generate_mac2' mangled-name='gnutls_pkcs12_generate_mac2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_generate_mac2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-981' name='pkcs12'/>
+      <parameter type-id='type-id-990' name='pkcs12'/>
       <parameter type-id='type-id-31' name='mac'/>
       <parameter type-id='type-id-27' name='pass'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_pkcs12_bag_int' size-in-bits='12352' is-struct='yes' visibility='default' id='type-id-982'>
+    <class-decl name='gnutls_pkcs12_bag_int' size-in-bits='12352' is-struct='yes' visibility='default' id='type-id-991'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='element' type-id='type-id-983' visibility='default'/>
+        <var-decl name='element' type-id='type-id-992' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12288'>
         <var-decl name='bag_elements' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='bag_element' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-984'>
+    <class-decl name='bag_element' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-993'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='data' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='type' type-id='type-id-985' visibility='default'/>
+        <var-decl name='type' type-id='type-id-994' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='local_key_id' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='friendly_name' type-id='type-id-376' visibility='default'/>
+        <var-decl name='friendly_name' type-id='type-id-379' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='gnutls_pkcs12_bag_type_t' id='type-id-986'>
+    <enum-decl name='gnutls_pkcs12_bag_type_t' id='type-id-995'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_BAG_EMPTY' value='0'/>
       <enumerator name='GNUTLS_BAG_PKCS8_ENCRYPTED_KEY' value='1'/>
@@ -14287,52 +14394,52 @@
       <enumerator name='GNUTLS_BAG_ENCRYPTED' value='10'/>
       <enumerator name='GNUTLS_BAG_UNKNOWN' value='20'/>
     </enum-decl>
-    <typedef-decl name='gnutls_pkcs12_bag_type_t' type-id='type-id-986' id='type-id-985'/>
+    <typedef-decl name='gnutls_pkcs12_bag_type_t' type-id='type-id-995' id='type-id-994'/>
 
-    <array-type-def dimensions='1' type-id='type-id-984' size-in-bits='12288' id='type-id-983'>
+    <array-type-def dimensions='1' type-id='type-id-993' size-in-bits='12288' id='type-id-992'>
       <subrange length='32' type-id='type-id-38' id='type-id-51'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-987'/>
-    <typedef-decl name='gnutls_pkcs12_bag_t' type-id='type-id-987' id='type-id-988'/>
+    <pointer-type-def type-id='type-id-991' size-in-bits='64' id='type-id-996'/>
+    <typedef-decl name='gnutls_pkcs12_bag_t' type-id='type-id-996' id='type-id-997'/>
     <function-decl name='gnutls_pkcs12_set_bag' mangled-name='gnutls_pkcs12_set_bag' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_set_bag@@GNUTLS_3_4'>
-      <parameter type-id='type-id-981' name='pkcs12'/>
-      <parameter type-id='type-id-988' name='bag'/>
+      <parameter type-id='type-id-990' name='pkcs12'/>
+      <parameter type-id='type-id-997' name='bag'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_get_bag' mangled-name='gnutls_pkcs12_get_bag' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_get_bag@@GNUTLS_3_4'>
-      <parameter type-id='type-id-981' name='pkcs12'/>
+      <parameter type-id='type-id-990' name='pkcs12'/>
       <parameter type-id='type-id-22' name='indx'/>
-      <parameter type-id='type-id-988' name='bag'/>
+      <parameter type-id='type-id-997' name='bag'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_export2' mangled-name='gnutls_pkcs12_export2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_export2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-981' name='pkcs12'/>
-      <parameter type-id='type-id-421' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-990' name='pkcs12'/>
+      <parameter type-id='type-id-424' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_export' mangled-name='gnutls_pkcs12_export' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_export@@GNUTLS_3_4'>
-      <parameter type-id='type-id-981' name='pkcs12'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-990' name='pkcs12'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-101' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_import' mangled-name='gnutls_pkcs12_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-981' name='pkcs12'/>
+      <parameter type-id='type-id-990' name='pkcs12'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_deinit' mangled-name='gnutls_pkcs12_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-981' name='pkcs12'/>
+      <parameter type-id='type-id-990' name='pkcs12'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-989'/>
+    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-998'/>
     <function-decl name='gnutls_pkcs12_init' mangled-name='gnutls_pkcs12_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-989' name='pkcs12'/>
+      <parameter type-id='type-id-998' name='pkcs12'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_x509_read_null_value' mangled-name='_gnutls_x509_read_null_value' visibility='default' binding='global' size-in-bits='64'>
@@ -14368,15 +14475,6 @@
     <function-decl name='_gnutls_pkcs12_string_to_key' mangled-name='_gnutls_pkcs12_string_to_key' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_pbkdf2_hmac_streebog512' mangled-name='_gnutls_pbkdf2_hmac_streebog512' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='_gnutls_pbkdf2_hmac_gosthash94cp' mangled-name='_gnutls_pbkdf2_hmac_gosthash94cp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='_gnutls_pbkdf2_hmac_streebog256' mangled-name='_gnutls_pbkdf2_hmac_streebog256' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
     <function-decl name='_gnutls_x509_der_encode_and_copy' mangled-name='_gnutls_x509_der_encode_and_copy' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -14386,98 +14484,101 @@
     <function-decl name='_gnutls_x509_decode_and_read_attribute' mangled-name='_gnutls_x509_decode_and_read_attribute' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='gnutls_pbkdf2' mangled-name='gnutls_pbkdf2' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pkcs12_bag.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs12_bag.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_pkcs12_bag_set_privkey' mangled-name='gnutls_pkcs12_bag_set_privkey' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_set_privkey@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
-      <parameter type-id='type-id-383' name='privkey'/>
+      <parameter type-id='type-id-997' name='bag'/>
+      <parameter type-id='type-id-386' name='privkey'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_enc_info' mangled-name='gnutls_pkcs12_bag_enc_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_enc_info@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
-      <parameter type-id='type-id-419' name='schema'/>
-      <parameter type-id='type-id-419' name='cipher'/>
+      <parameter type-id='type-id-997' name='bag'/>
+      <parameter type-id='type-id-422' name='schema'/>
+      <parameter type-id='type-id-422' name='cipher'/>
       <parameter type-id='type-id-101' name='salt'/>
-      <parameter type-id='type-id-419' name='salt_size'/>
-      <parameter type-id='type-id-419' name='iter_count'/>
-      <parameter type-id='type-id-852' name='oid'/>
+      <parameter type-id='type-id-422' name='salt_size'/>
+      <parameter type-id='type-id-422' name='iter_count'/>
+      <parameter type-id='type-id-855' name='oid'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_encrypt' mangled-name='gnutls_pkcs12_bag_encrypt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_encrypt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
+      <parameter type-id='type-id-997' name='bag'/>
       <parameter type-id='type-id-27' name='pass'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_decrypt' mangled-name='gnutls_pkcs12_bag_decrypt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_decrypt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
+      <parameter type-id='type-id-997' name='bag'/>
       <parameter type-id='type-id-27' name='pass'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_set_friendly_name' mangled-name='gnutls_pkcs12_bag_set_friendly_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_set_friendly_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
+      <parameter type-id='type-id-997' name='bag'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-27' name='name'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_get_friendly_name' mangled-name='gnutls_pkcs12_bag_get_friendly_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_get_friendly_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
+      <parameter type-id='type-id-997' name='bag'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-852' name='name'/>
+      <parameter type-id='type-id-855' name='name'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_get_key_id' mangled-name='gnutls_pkcs12_bag_get_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_get_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
+      <parameter type-id='type-id-997' name='bag'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='id'/>
+      <parameter type-id='type-id-278' name='id'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_set_key_id' mangled-name='gnutls_pkcs12_bag_set_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_set_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
+      <parameter type-id='type-id-997' name='bag'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-57' name='id'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_set_crl' mangled-name='gnutls_pkcs12_bag_set_crl' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_set_crl@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-997' name='bag'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_set_crt' mangled-name='gnutls_pkcs12_bag_set_crt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_set_crt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-997' name='bag'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_set_data' mangled-name='gnutls_pkcs12_bag_set_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_set_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
-      <parameter type-id='type-id-985' name='type'/>
+      <parameter type-id='type-id-997' name='bag'/>
+      <parameter type-id='type-id-994' name='type'/>
       <parameter type-id='type-id-57' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_get_data' mangled-name='gnutls_pkcs12_bag_get_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_get_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
+      <parameter type-id='type-id-997' name='bag'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='id'/>
+      <parameter type-id='type-id-278' name='id'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_get_count' mangled-name='gnutls_pkcs12_bag_get_count' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_get_count@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
+      <parameter type-id='type-id-997' name='bag'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_get_type' mangled-name='gnutls_pkcs12_bag_get_type' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_get_type@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
+      <parameter type-id='type-id-997' name='bag'/>
       <parameter type-id='type-id-10' name='indx'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_deinit' mangled-name='gnutls_pkcs12_bag_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-988' name='bag'/>
+      <parameter type-id='type-id-997' name='bag'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-990'/>
+    <pointer-type-def type-id='type-id-997' size-in-bits='64' id='type-id-999'/>
     <function-decl name='gnutls_pkcs12_bag_init' mangled-name='gnutls_pkcs12_bag_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs12_bag_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-990' name='bag'/>
+      <parameter type-id='type-id-999' name='bag'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export2_pkcs8' mangled-name='gnutls_x509_privkey_export2_pkcs8' visibility='default' binding='global' size-in-bits='64'>
@@ -14505,135 +14606,135 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pkcs12_encr.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs12_encr.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='_gnutls_pkcs12_string_to_key' mangled-name='_gnutls_pkcs12_string_to_key' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_pkcs12_string_to_key@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-13' name='me'/>
       <parameter type-id='type-id-10' name='id'/>
-      <parameter type-id='type-id-900' name='salt'/>
+      <parameter type-id='type-id-903' name='salt'/>
       <parameter type-id='type-id-10' name='salt_size'/>
       <parameter type-id='type-id-10' name='iter'/>
       <parameter type-id='type-id-27' name='pw'/>
       <parameter type-id='type-id-10' name='req_keylen'/>
-      <parameter type-id='type-id-191' name='keybuf'/>
+      <parameter type-id='type-id-192' name='keybuf'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_utf8_to_ucs2' mangled-name='_gnutls_utf8_to_ucs2' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pkcs7.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
-    <class-decl name='gnutls_pkcs7_int' size-in-bits='1344' is-struct='yes' visibility='default' id='type-id-991'>
+  <abi-instr version='1.0' address-size='64' path='pkcs7.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
+    <class-decl name='gnutls_pkcs7_int' size-in-bits='1344' is-struct='yes' visibility='default' id='type-id-1000'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pkcs7' type-id='type-id-387' visibility='default'/>
+        <var-decl name='pkcs7' type-id='type-id-390' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='encap_data_oid' type-id='type-id-992' visibility='default'/>
+        <var-decl name='encap_data_oid' type-id='type-id-1001' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <var-decl name='der_signed_data' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='signed_data' type-id='type-id-387' visibility='default'/>
+        <var-decl name='signed_data' type-id='type-id-390' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <var-decl name='expanded' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='1024' id='type-id-992'>
-      <subrange length='128' type-id='type-id-38' id='type-id-993'/>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='1024' id='type-id-1001'>
+      <subrange length='128' type-id='type-id-38' id='type-id-1002'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-991' size-in-bits='64' id='type-id-994'/>
-    <typedef-decl name='gnutls_pkcs7_t' type-id='type-id-994' id='type-id-995'/>
-    <class-decl name='gnutls_pkcs7_attrs_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-996'>
+    <pointer-type-def type-id='type-id-1000' size-in-bits='64' id='type-id-1003'/>
+    <typedef-decl name='gnutls_pkcs7_t' type-id='type-id-1003' id='type-id-1004'/>
+    <class-decl name='gnutls_pkcs7_attrs_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-1005'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='oid' type-id='type-id-376' visibility='default'/>
+        <var-decl name='oid' type-id='type-id-379' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='next' type-id='type-id-997' visibility='default'/>
+        <var-decl name='next' type-id='type-id-1006' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-997'/>
-    <typedef-decl name='gnutls_pkcs7_attrs_t' type-id='type-id-997' id='type-id-998'/>
+    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1006'/>
+    <typedef-decl name='gnutls_pkcs7_attrs_t' type-id='type-id-1006' id='type-id-1007'/>
     <function-decl name='gnutls_pkcs7_sign' mangled-name='gnutls_pkcs7_sign' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_sign@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
-      <parameter type-id='type-id-467' name='signer'/>
-      <parameter type-id='type-id-401' name='signer_key'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
+      <parameter type-id='type-id-470' name='signer'/>
+      <parameter type-id='type-id-404' name='signer_key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-998' name='signed_attrs'/>
-      <parameter type-id='type-id-998' name='unsigned_attrs'/>
-      <parameter type-id='type-id-211' name='dig'/>
+      <parameter type-id='type-id-1007' name='signed_attrs'/>
+      <parameter type-id='type-id-1007' name='unsigned_attrs'/>
+      <parameter type-id='type-id-212' name='dig'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_delete_crl' mangled-name='gnutls_pkcs7_delete_crl' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_delete_crl@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <parameter type-id='type-id-22' name='indx'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_set_crl' mangled-name='gnutls_pkcs7_set_crl' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_set_crl@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
-      <parameter type-id='type-id-730' name='crl'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
+      <parameter type-id='type-id-733' name='crl'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_set_crl_raw' mangled-name='gnutls_pkcs7_set_crl_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_set_crl_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <parameter type-id='type-id-57' name='crl'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_get_crl_count' mangled-name='gnutls_pkcs7_get_crl_count' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_get_crl_count@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_get_crl_raw' mangled-name='gnutls_pkcs7_get_crl_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_get_crl_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='crl'/>
-      <parameter type-id='type-id-422' name='crl_size'/>
+      <parameter type-id='type-id-425' name='crl_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_get_crl_raw2' mangled-name='gnutls_pkcs7_get_crl_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_get_crl_raw2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='crl'/>
+      <parameter type-id='type-id-278' name='crl'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_delete_crt' mangled-name='gnutls_pkcs7_delete_crt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_delete_crt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <parameter type-id='type-id-22' name='indx'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_set_crt' mangled-name='gnutls_pkcs7_set_crt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_set_crt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_set_crt_raw' mangled-name='gnutls_pkcs7_set_crt_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_set_crt_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <parameter type-id='type-id-57' name='crl'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_export2' mangled-name='gnutls_pkcs7_export2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_export2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
-      <parameter type-id='type-id-421' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
+      <parameter type-id='type-id-424' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_export' mangled-name='gnutls_pkcs7_export' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_export@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-101' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_verify' mangled-name='gnutls_pkcs7_verify' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_verify@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
-      <parameter type-id='type-id-715' name='tl'/>
-      <parameter type-id='type-id-172' name='vdata'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
+      <parameter type-id='type-id-718' name='tl'/>
+      <parameter type-id='type-id-173' name='vdata'/>
       <parameter type-id='type-id-10' name='vdata_size'/>
       <parameter type-id='type-id-10' name='idx'/>
       <parameter type-id='type-id-57' name='data'/>
@@ -14641,24 +14742,24 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_verify_direct' mangled-name='gnutls_pkcs7_verify_direct' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_verify_direct@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
-      <parameter type-id='type-id-467' name='signer'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
+      <parameter type-id='type-id-470' name='signer'/>
       <parameter type-id='type-id-10' name='idx'/>
       <parameter type-id='type-id-57' name='data'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_get_embedded_data_oid' mangled-name='gnutls_pkcs7_get_embedded_data_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_get_embedded_data_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_get_embedded_data' mangled-name='gnutls_pkcs7_get_embedded_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_get_embedded_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-278' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_pkcs7_signature_info_st' size-in-bits='1280' is-struct='yes' visibility='default' id='type-id-999'>
+    <class-decl name='gnutls_pkcs7_signature_info_st' size-in-bits='1280' is-struct='yes' visibility='default' id='type-id-1008'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='algo' type-id='type-id-21' visibility='default'/>
       </data-member>
@@ -14678,66 +14779,66 @@
         <var-decl name='signing_time' type-id='type-id-17' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='signed_attrs' type-id='type-id-998' visibility='default'/>
+        <var-decl name='signed_attrs' type-id='type-id-1007' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='unsigned_attrs' type-id='type-id-998' visibility='default'/>
+        <var-decl name='unsigned_attrs' type-id='type-id-1007' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='pad' type-id='type-id-1000' visibility='default'/>
+        <var-decl name='pad' type-id='type-id-1009' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='512' id='type-id-1000'>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='512' id='type-id-1009'>
       <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
-    <typedef-decl name='gnutls_pkcs7_signature_info_st' type-id='type-id-999' id='type-id-1001'/>
-    <pointer-type-def type-id='type-id-1001' size-in-bits='64' id='type-id-1002'/>
+    <typedef-decl name='gnutls_pkcs7_signature_info_st' type-id='type-id-1008' id='type-id-1010'/>
+    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-1011'/>
     <function-decl name='gnutls_pkcs7_get_signature_info' mangled-name='gnutls_pkcs7_get_signature_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_get_signature_info@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-1002' name='info'/>
+      <parameter type-id='type-id-1011' name='info'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_get_signature_count' mangled-name='gnutls_pkcs7_get_signature_count' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_get_signature_count@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_signature_info_deinit' mangled-name='gnutls_pkcs7_signature_info_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_signature_info_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1002' name='info'/>
+      <parameter type-id='type-id-1011' name='info'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_get_crt_raw' mangled-name='gnutls_pkcs7_get_crt_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_get_crt_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='certificate'/>
-      <parameter type-id='type-id-422' name='certificate_size'/>
+      <parameter type-id='type-id-425' name='certificate_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_get_crt_raw2' mangled-name='gnutls_pkcs7_get_crt_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_get_crt_raw2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='cert'/>
+      <parameter type-id='type-id-278' name='cert'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_import' mangled-name='gnutls_pkcs7_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_deinit' mangled-name='gnutls_pkcs7_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-995' size-in-bits='64' id='type-id-1003'/>
+    <pointer-type-def type-id='type-id-1004' size-in-bits='64' id='type-id-1012'/>
     <function-decl name='gnutls_pkcs7_init' mangled-name='gnutls_pkcs7_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1003' name='pkcs7'/>
+      <parameter type-id='type-id-1012' name='pkcs7'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_get_crt_count' mangled-name='gnutls_pkcs7_get_crt_count' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_get_crt_count@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='asn1_copy_node' mangled-name='asn1_copy_node' visibility='default' binding='global' size-in-bits='64'>
@@ -14789,29 +14890,29 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pkcs7-attrs.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs7-attrs.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_pkcs7_attrs_deinit' mangled-name='gnutls_pkcs7_attrs_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_attrs_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-998' name='list'/>
+      <parameter type-id='type-id-1007' name='list'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_get_attr' mangled-name='gnutls_pkcs7_get_attr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_get_attr@@GNUTLS_3_4'>
-      <parameter type-id='type-id-998' name='list'/>
+      <parameter type-id='type-id-1007' name='list'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-852' name='oid'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-855' name='oid'/>
+      <parameter type-id='type-id-278' name='data'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-1004'/>
+    <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-1013'/>
     <function-decl name='gnutls_pkcs7_add_attr' mangled-name='gnutls_pkcs7_add_attr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_add_attr@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1004' name='list'/>
+      <parameter type-id='type-id-1013' name='list'/>
       <parameter type-id='type-id-27' name='oid'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-278' name='data'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pkcs7-crypt.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs7-crypt.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_pkcs_schema_get_oid' mangled-name='gnutls_pkcs_schema_get_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs_schema_get_oid@@GNUTLS_3_4'>
       <parameter type-id='type-id-10' name='schema'/>
       <return type-id='type-id-27'/>
@@ -14826,12 +14927,6 @@
     <function-decl name='_gnutls_decrypt_pbes1_des_md5_data' mangled-name='_gnutls_decrypt_pbes1_des_md5_data' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='nettle_pbkdf2_hmac_sha1' mangled-name='nettle_pbkdf2_hmac_sha1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='nettle_pbkdf2_hmac_sha256' mangled-name='nettle_pbkdf2_hmac_sha256' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
     <function-decl name='gnutls_oid_to_mac' mangled-name='gnutls_oid_to_mac' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -14839,61 +14934,61 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='privkey.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='privkey.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_privkey_set_flags' mangled-name='gnutls_x509_privkey_set_flags' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_set_flags@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_set_pin_function' mangled-name='gnutls_x509_privkey_set_pin_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_set_pin_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='privkey'/>
-      <parameter type-id='type-id-375' name='fn'/>
+      <parameter type-id='type-id-386' name='privkey'/>
+      <parameter type-id='type-id-378' name='fn'/>
       <parameter type-id='type-id-101' name='userdata'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_sign_data' mangled-name='gnutls_x509_privkey_sign_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_sign_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-211' name='digest'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-212' name='digest'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='data'/>
       <parameter type-id='type-id-101' name='signature'/>
-      <parameter type-id='type-id-422' name='signature_size'/>
+      <parameter type-id='type-id-425' name='signature_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_sign_hash' mangled-name='gnutls_x509_privkey_sign_hash' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_sign_hash@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-57' name='hash'/>
-      <parameter type-id='type-id-275' name='signature'/>
+      <parameter type-id='type-id-278' name='signature'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_get_key_id' mangled-name='gnutls_x509_privkey_get_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_get_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_verify_params' mangled-name='gnutls_x509_privkey_verify_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_verify_params@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_verify_seed' mangled-name='gnutls_x509_privkey_verify_seed' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_verify_seed@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-211' name='digest'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-212' name='digest'/>
       <parameter type-id='type-id-101' name='seed'/>
       <parameter type-id='type-id-99' name='seed_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_get_seed' mangled-name='gnutls_x509_privkey_get_seed' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_get_seed@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-431' name='digest'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-434' name='digest'/>
       <parameter type-id='type-id-101' name='seed'/>
-      <parameter type-id='type-id-422' name='seed_size'/>
+      <parameter type-id='type-id-425' name='seed_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-1005'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-1014'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-762' visibility='default'/>
+        <var-decl name='type' type-id='type-id-765' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data' type-id='type-id-64' visibility='default'/>
@@ -14903,115 +14998,115 @@
       </data-member>
     </class-decl>
     <function-decl name='gnutls_x509_privkey_generate2' mangled-name='gnutls_x509_privkey_generate2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_generate2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-60' name='algo'/>
       <parameter type-id='type-id-10' name='bits'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-765' name='data'/>
+      <parameter type-id='type-id-768' name='data'/>
       <parameter type-id='type-id-10' name='data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_generate' mangled-name='gnutls_x509_privkey_generate' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_generate@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-60' name='algo'/>
       <parameter type-id='type-id-10' name='bits'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export_dsa_raw' mangled-name='gnutls_x509_privkey_export_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='g'/>
+      <parameter type-id='type-id-278' name='y'/>
+      <parameter type-id='type-id-278' name='x'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export_rsa_raw2' mangled-name='gnutls_x509_privkey_export_rsa_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export_rsa_raw2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
-      <parameter type-id='type-id-275' name='d'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='u'/>
-      <parameter type-id='type-id-275' name='e1'/>
-      <parameter type-id='type-id-275' name='e2'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-278' name='m'/>
+      <parameter type-id='type-id-278' name='e'/>
+      <parameter type-id='type-id-278' name='d'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='u'/>
+      <parameter type-id='type-id-278' name='e1'/>
+      <parameter type-id='type-id-278' name='e2'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export_rsa_raw' mangled-name='gnutls_x509_privkey_export_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
-      <parameter type-id='type-id-275' name='d'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='u'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-278' name='m'/>
+      <parameter type-id='type-id-278' name='e'/>
+      <parameter type-id='type-id-278' name='d'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='u'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export_gost_raw' mangled-name='gnutls_x509_privkey_export_gost_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export_gost_raw@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-431' name='digest'/>
-      <parameter type-id='type-id-712' name='paramset'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='k'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-714' name='curve'/>
+      <parameter type-id='type-id-434' name='digest'/>
+      <parameter type-id='type-id-715' name='paramset'/>
+      <parameter type-id='type-id-278' name='x'/>
+      <parameter type-id='type-id-278' name='y'/>
+      <parameter type-id='type-id-278' name='k'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export_ecc_raw' mangled-name='gnutls_x509_privkey_export_ecc_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export_ecc_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
-      <parameter type-id='type-id-275' name='k'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-714' name='curve'/>
+      <parameter type-id='type-id-278' name='x'/>
+      <parameter type-id='type-id-278' name='y'/>
+      <parameter type-id='type-id-278' name='k'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_sec_param' mangled-name='gnutls_x509_privkey_sec_param' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_sec_param@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <return type-id='type-id-202'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <return type-id='type-id-203'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export2' mangled-name='gnutls_x509_privkey_export2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-421' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-424' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export' mangled-name='gnutls_x509_privkey_export' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-101' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_set_spki' mangled-name='gnutls_x509_privkey_set_spki' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_set_spki@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-758' name='spki'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-761' name='spki'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_get_spki' mangled-name='gnutls_x509_privkey_get_spki' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_get_spki@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-757' name='spki'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-760' name='spki'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_get_pk_algorithm' mangled-name='gnutls_x509_privkey_get_pk_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_get_pk_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import_gost_raw' mangled-name='gnutls_x509_privkey_import_gost_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import_gost_raw@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-59' name='curve'/>
-      <parameter type-id='type-id-211' name='digest'/>
-      <parameter type-id='type-id-315' name='paramset'/>
+      <parameter type-id='type-id-212' name='digest'/>
+      <parameter type-id='type-id-318' name='paramset'/>
       <parameter type-id='type-id-57' name='x'/>
       <parameter type-id='type-id-57' name='y'/>
       <parameter type-id='type-id-57' name='k'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import_ecc_raw' mangled-name='gnutls_x509_privkey_import_ecc_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import_ecc_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-59' name='curve'/>
       <parameter type-id='type-id-57' name='x'/>
       <parameter type-id='type-id-57' name='y'/>
@@ -15019,7 +15114,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import_dsa_raw' mangled-name='gnutls_x509_privkey_import_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-57' name='p'/>
       <parameter type-id='type-id-57' name='q'/>
       <parameter type-id='type-id-57' name='g'/>
@@ -15028,7 +15123,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import_rsa_raw2' mangled-name='gnutls_x509_privkey_import_rsa_raw2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import_rsa_raw2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-57' name='m'/>
       <parameter type-id='type-id-57' name='e'/>
       <parameter type-id='type-id-57' name='d'/>
@@ -15040,7 +15135,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import_rsa_raw' mangled-name='gnutls_x509_privkey_import_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-57' name='m'/>
       <parameter type-id='type-id-57' name='e'/>
       <parameter type-id='type-id-57' name='d'/>
@@ -15050,45 +15145,45 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import2' mangled-name='gnutls_x509_privkey_import2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import' mangled-name='gnutls_x509_privkey_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_cpy' mangled-name='gnutls_x509_privkey_cpy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_cpy@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='dst'/>
-      <parameter type-id='type-id-383' name='src'/>
+      <parameter type-id='type-id-386' name='dst'/>
+      <parameter type-id='type-id-386' name='src'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_init' mangled-name='gnutls_x509_privkey_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-734' name='key'/>
+      <parameter type-id='type-id-737' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_deinit' mangled-name='gnutls_x509_privkey_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_get_pk_algorithm2' mangled-name='gnutls_x509_privkey_get_pk_algorithm2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_get_pk_algorithm2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-419' name='bits'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-422' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_fix' mangled-name='gnutls_x509_privkey_fix' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_fix@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='_gnutls_asn1_encode_privkey' mangled-name='_gnutls_asn1_encode_privkey' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='gnutls_ecc_curve_get_pk' mangled-name='gnutls_ecc_curve_get_pk' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='gnutls_ecc_curve_get_pk' mangled-name='gnutls_ecc_curve_get_pk' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_asn1_encode_privkey' mangled-name='_gnutls_asn1_encode_privkey' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import_openssl' mangled-name='gnutls_x509_privkey_import_openssl' visibility='default' binding='global' size-in-bits='64'>
@@ -15098,41 +15193,41 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='privkey_pkcs8.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='privkey_pkcs8.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_privkey_import_pkcs8' mangled-name='gnutls_x509_privkey_import_pkcs8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import_pkcs8@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export2_pkcs8' mangled-name='gnutls_x509_privkey_export2_pkcs8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export2_pkcs8@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs8_info' mangled-name='gnutls_pkcs8_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs8_info@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
-      <parameter type-id='type-id-419' name='schema'/>
-      <parameter type-id='type-id-419' name='cipher'/>
+      <parameter type-id='type-id-424' name='format'/>
+      <parameter type-id='type-id-422' name='schema'/>
+      <parameter type-id='type-id-422' name='cipher'/>
       <parameter type-id='type-id-101' name='salt'/>
-      <parameter type-id='type-id-419' name='salt_size'/>
-      <parameter type-id='type-id-419' name='iter_count'/>
-      <parameter type-id='type-id-852' name='oid'/>
+      <parameter type-id='type-id-422' name='salt_size'/>
+      <parameter type-id='type-id-422' name='iter_count'/>
+      <parameter type-id='type-id-855' name='oid'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_export_pkcs8' mangled-name='gnutls_x509_privkey_export_pkcs8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_export_pkcs8@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-386' name='key'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-101' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_x509_privkey_reinit' mangled-name='_gnutls_x509_privkey_reinit' visibility='default' binding='global' size-in-bits='64'>
@@ -15178,7 +15273,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='privkey_pkcs8_pbes1.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='privkey_pkcs8_pbes1.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='nettle_md5_init' mangled-name='nettle_md5_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -15189,9 +15284,9 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='privkey_openssl.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='privkey_openssl.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_privkey_import_openssl' mangled-name='gnutls_x509_privkey_import_openssl' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_privkey_import_openssl@@GNUTLS_3_4'>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-386' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
       <parameter type-id='type-id-27' name='password'/>
       <return type-id='type-id-22'/>
@@ -15206,22 +15301,22 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hostname-verify.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='hostname-verify.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_crt_check_hostname2' mangled-name='gnutls_x509_crt_check_hostname2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_check_hostname2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-27' name='hostname'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_check_ip' mangled-name='gnutls_x509_crt_check_ip' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_check_ip@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-346' name='ip'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-349' name='ip'/>
       <parameter type-id='type-id-10' name='ip_size'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_check_hostname' mangled-name='gnutls_x509_crt_check_hostname' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_check_hostname@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-27' name='hostname'/>
       <return type-id='type-id-10'/>
     </function-decl>
@@ -15232,51 +15327,51 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='sign.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='sign.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='privkey_sign_raw_data' mangled-name='privkey_sign_raw_data' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='verify.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-467' const='yes' id='type-id-1006'/>
-    <pointer-type-def type-id='type-id-1006' size-in-bits='64' id='type-id-1007'/>
+  <abi-instr version='1.0' address-size='64' path='verify.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-470' const='yes' id='type-id-1015'/>
+    <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-1016'/>
     <function-decl name='gnutls_x509_crl_verify' mangled-name='gnutls_x509_crl_verify' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_verify@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-1007' name='trusted_cas'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-1016' name='trusted_cas'/>
       <parameter type-id='type-id-10' name='tcas_size'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-419' name='verify'/>
+      <parameter type-id='type-id-422' name='verify'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_check_issuer' mangled-name='gnutls_x509_crl_check_issuer' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_check_issuer@@GNUTLS_3_4'>
-      <parameter type-id='type-id-730' name='crl'/>
-      <parameter type-id='type-id-467' name='issuer'/>
+      <parameter type-id='type-id-733' name='crl'/>
+      <parameter type-id='type-id-470' name='issuer'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_verify' mangled-name='gnutls_x509_crt_verify' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_verify@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-1007' name='CA_list'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-1016' name='CA_list'/>
       <parameter type-id='type-id-10' name='CA_list_length'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-419' name='verify'/>
+      <parameter type-id='type-id-422' name='verify'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-730' const='yes' id='type-id-1008'/>
-    <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-1009'/>
+    <qualified-type-def type-id='type-id-733' const='yes' id='type-id-1017'/>
+    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1018'/>
     <function-decl name='gnutls_x509_crt_list_verify' mangled-name='gnutls_x509_crt_list_verify' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_list_verify@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1007' name='cert_list'/>
+      <parameter type-id='type-id-1016' name='cert_list'/>
       <parameter type-id='type-id-10' name='cert_list_length'/>
-      <parameter type-id='type-id-1007' name='CA_list'/>
+      <parameter type-id='type-id-1016' name='CA_list'/>
       <parameter type-id='type-id-10' name='CA_list_length'/>
-      <parameter type-id='type-id-1009' name='CRL_list'/>
+      <parameter type-id='type-id-1018' name='CRL_list'/>
       <parameter type-id='type-id-10' name='CRL_list_length'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-419' name='verify'/>
+      <parameter type-id='type-id-422' name='verify'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_check_issuer' mangled-name='gnutls_x509_crt_check_issuer' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_check_issuer@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-467' name='issuer'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-470' name='issuer'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='_gnutls_x509_compare_raw_dn' mangled-name='_gnutls_x509_compare_raw_dn' visibility='default' binding='global' size-in-bits='64'>
@@ -15313,14 +15408,14 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='x509.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_crt_set_flags' mangled-name='gnutls_x509_crt_set_flags' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_flags@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_verify_data2' mangled-name='gnutls_x509_crt_verify_data2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_verify_data2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-21' name='algo'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='data'/>
@@ -15328,513 +15423,513 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_list_import_url' mangled-name='gnutls_x509_crt_list_import_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_list_import_url@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-733' name='certs'/>
-      <parameter type-id='type-id-419' name='size'/>
+      <parameter type-id='type-id-736' name='certs'/>
+      <parameter type-id='type-id-422' name='size'/>
       <parameter type-id='type-id-27' name='url'/>
-      <parameter type-id='type-id-375' name='pin_fn'/>
+      <parameter type-id='type-id-378' name='pin_fn'/>
       <parameter type-id='type-id-101' name='pin_fn_userdata'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_import_url' mangled-name='gnutls_x509_crt_import_url' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_import_url@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_pin_function' mangled-name='gnutls_x509_crt_set_pin_function' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_pin_function@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-375' name='fn'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-378' name='fn'/>
       <parameter type-id='type-id-101' name='userdata'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_authority_info_access' mangled-name='gnutls_x509_crt_get_authority_info_access' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_authority_info_access@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-10' name='seq'/>
       <parameter type-id='type-id-22' name='what'/>
-      <parameter type-id='type-id-275' name='data'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-278' name='data'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_issuer_unique_id' mangled-name='gnutls_x509_crt_get_issuer_unique_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_issuer_unique_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-379' name='buf'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_subject_unique_id' mangled-name='gnutls_x509_crt_get_subject_unique_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_subject_unique_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-379' name='buf'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_list_import' mangled-name='gnutls_x509_crt_list_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_list_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-458' name='certs'/>
-      <parameter type-id='type-id-419' name='cert_max'/>
+      <parameter type-id='type-id-461' name='certs'/>
+      <parameter type-id='type-id-422' name='cert_max'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_list_import2' mangled-name='gnutls_x509_crt_list_import2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_list_import2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-733' name='certs'/>
-      <parameter type-id='type-id-419' name='size'/>
+      <parameter type-id='type-id-736' name='certs'/>
+      <parameter type-id='type-id-422' name='size'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_pk_dsa_raw' mangled-name='gnutls_x509_crt_get_pk_dsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_pk_dsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-275' name='p'/>
-      <parameter type-id='type-id-275' name='q'/>
-      <parameter type-id='type-id-275' name='g'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-278' name='p'/>
+      <parameter type-id='type-id-278' name='q'/>
+      <parameter type-id='type-id-278' name='g'/>
+      <parameter type-id='type-id-278' name='y'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_pk_gost_raw' mangled-name='gnutls_x509_crt_get_pk_gost_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_pk_gost_raw@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-431' name='digest'/>
-      <parameter type-id='type-id-712' name='paramset'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-714' name='curve'/>
+      <parameter type-id='type-id-434' name='digest'/>
+      <parameter type-id='type-id-715' name='paramset'/>
+      <parameter type-id='type-id-278' name='x'/>
+      <parameter type-id='type-id-278' name='y'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_pk_ecc_raw' mangled-name='gnutls_x509_crt_get_pk_ecc_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_pk_ecc_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-275' name='x'/>
-      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-714' name='curve'/>
+      <parameter type-id='type-id-278' name='x'/>
+      <parameter type-id='type-id-278' name='y'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_pk_rsa_raw' mangled-name='gnutls_x509_crt_get_pk_rsa_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_pk_rsa_raw@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-275' name='m'/>
-      <parameter type-id='type-id-275' name='e'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-278' name='m'/>
+      <parameter type-id='type-id-278' name='e'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_key_purpose_oid' mangled-name='gnutls_x509_crt_get_key_purpose_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_key_purpose_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='oid'/>
-      <parameter type-id='type-id-422' name='oid_size'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='oid_size'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_crl_dist_points' mangled-name='gnutls_x509_crt_get_crl_dist_points' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_crl_dist_points@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
       <parameter type-id='type-id-101' name='san'/>
-      <parameter type-id='type-id-422' name='san_size'/>
-      <parameter type-id='type-id-419' name='reason_flags'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='san_size'/>
+      <parameter type-id='type-id-422' name='reason_flags'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_preferred_hash_algorithm' mangled-name='gnutls_x509_crt_get_preferred_hash_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_preferred_hash_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-431' name='hash'/>
-      <parameter type-id='type-id-419' name='mand'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-434' name='hash'/>
+      <parameter type-id='type-id-422' name='mand'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_check_key_purpose' mangled-name='gnutls_x509_crt_check_key_purpose' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_check_key_purpose@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-27' name='purpose'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_check_revocation' mangled-name='gnutls_x509_crt_check_revocation' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_check_revocation@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-1009' name='crl_list'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-1018' name='crl_list'/>
       <parameter type-id='type-id-10' name='crl_list_length'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_key_id' mangled-name='gnutls_x509_crt_get_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_export' mangled-name='gnutls_x509_crt_export' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_export@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-101' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_fingerprint' mangled-name='gnutls_x509_crt_get_fingerprint' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_fingerprint@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-211' name='algo'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-212' name='algo'/>
       <parameter type-id='type-id-101' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-465' size-in-bits='64' id='type-id-1010'/>
-    <typedef-decl name='gnutls_x509_dn_t' type-id='type-id-1010' id='type-id-1011'/>
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-1012'/>
+    <pointer-type-def type-id='type-id-468' size-in-bits='64' id='type-id-1019'/>
+    <typedef-decl name='gnutls_x509_dn_t' type-id='type-id-1019' id='type-id-1020'/>
+    <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-1021'/>
     <function-decl name='gnutls_x509_crt_get_issuer' mangled-name='gnutls_x509_crt_get_issuer' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_issuer@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-1012' name='dn'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-1021' name='dn'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_subject' mangled-name='gnutls_x509_crt_get_subject' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_subject@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-1012' name='dn'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-1021' name='dn'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_raw_dn' mangled-name='gnutls_x509_crt_get_raw_dn' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_raw_dn@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-275' name='dn'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-278' name='dn'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_raw_issuer_dn' mangled-name='gnutls_x509_crt_get_raw_issuer_dn' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_raw_issuer_dn@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-275' name='dn'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-278' name='dn'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_extension_data' mangled-name='gnutls_x509_crt_get_extension_data' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_extension_data@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='data'/>
-      <parameter type-id='type-id-422' name='sizeof_data'/>
+      <parameter type-id='type-id-425' name='sizeof_data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_extension_info' mangled-name='gnutls_x509_crt_get_extension_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_extension_info@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='oid'/>
-      <parameter type-id='type-id-422' name='oid_size'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='oid_size'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_extension_oid' mangled-name='gnutls_x509_crt_get_extension_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_extension_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='oid'/>
-      <parameter type-id='type-id-422' name='oid_size'/>
+      <parameter type-id='type-id-425' name='oid_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_extension_by_oid2' mangled-name='gnutls_x509_crt_get_extension_by_oid2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_extension_by_oid2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='output'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-278' name='output'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_extension_by_oid' mangled-name='gnutls_x509_crt_get_extension_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_extension_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_x509_policy_st' size-in-bits='1664' is-struct='yes' visibility='default' id='type-id-1013'>
+    <class-decl name='gnutls_x509_policy_st' size-in-bits='1664' is-struct='yes' visibility='default' id='type-id-1022'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='oid' type-id='type-id-376' visibility='default'/>
+        <var-decl name='oid' type-id='type-id-379' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='qualifiers' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='qualifier' type-id='type-id-1014' visibility='default'/>
+        <var-decl name='qualifier' type-id='type-id-1023' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-1015'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-1024'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-1016' visibility='default'/>
+        <var-decl name='type' type-id='type-id-1025' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='data' type-id='type-id-376' visibility='default'/>
+        <var-decl name='data' type-id='type-id-379' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='gnutls_x509_qualifier_t' id='type-id-1017'>
+    <enum-decl name='gnutls_x509_qualifier_t' id='type-id-1026'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_X509_QUALIFIER_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_X509_QUALIFIER_URI' value='1'/>
       <enumerator name='GNUTLS_X509_QUALIFIER_NOTICE' value='2'/>
     </enum-decl>
-    <typedef-decl name='gnutls_x509_qualifier_t' type-id='type-id-1017' id='type-id-1016'/>
+    <typedef-decl name='gnutls_x509_qualifier_t' type-id='type-id-1026' id='type-id-1025'/>
 
-    <array-type-def dimensions='1' type-id='type-id-1015' size-in-bits='1536' id='type-id-1014'>
-      <subrange length='8' type-id='type-id-38' id='type-id-455'/>
+    <array-type-def dimensions='1' type-id='type-id-1024' size-in-bits='1536' id='type-id-1023'>
+      <subrange length='8' type-id='type-id-38' id='type-id-458'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-1018'/>
+    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-1027'/>
     <function-decl name='gnutls_x509_crt_get_policy' mangled-name='gnutls_x509_crt_get_policy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_policy@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-1018' name='policy'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-1027' name='policy'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_policy_release' mangled-name='gnutls_x509_policy_release' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_policy_release@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1018' name='policy'/>
+      <parameter type-id='type-id-1027' name='policy'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_proxy' mangled-name='gnutls_x509_crt_get_proxy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_proxy@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-419' name='critical'/>
-      <parameter type-id='type-id-364' name='pathlen'/>
-      <parameter type-id='type-id-852' name='policyLanguage'/>
-      <parameter type-id='type-id-852' name='policy'/>
-      <parameter type-id='type-id-422' name='sizeof_policy'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-422' name='critical'/>
+      <parameter type-id='type-id-367' name='pathlen'/>
+      <parameter type-id='type-id-855' name='policyLanguage'/>
+      <parameter type-id='type-id-855' name='policy'/>
+      <parameter type-id='type-id-425' name='sizeof_policy'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_inhibit_anypolicy' mangled-name='gnutls_x509_crt_get_inhibit_anypolicy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_inhibit_anypolicy@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-419' name='skipcerts'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-422' name='skipcerts'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_key_usage' mangled-name='gnutls_x509_crt_get_key_usage' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_key_usage@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-419' name='skipcerts'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-422' name='skipcerts'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_ca_status' mangled-name='gnutls_x509_crt_get_ca_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_ca_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_basic_constraints' mangled-name='gnutls_x509_crt_get_basic_constraints' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_basic_constraints@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-419' name='critical'/>
-      <parameter type-id='type-id-419' name='ca'/>
-      <parameter type-id='type-id-364' name='pathlen'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-422' name='critical'/>
+      <parameter type-id='type-id-422' name='ca'/>
+      <parameter type-id='type-id-367' name='pathlen'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_issuer_alt_othername_oid' mangled-name='gnutls_x509_crt_get_issuer_alt_othername_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_issuer_alt_othername_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
       <parameter type-id='type-id-101' name='ret'/>
-      <parameter type-id='type-id-422' name='ret_size'/>
+      <parameter type-id='type-id-425' name='ret_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_subject_alt_othername_oid' mangled-name='gnutls_x509_crt_get_subject_alt_othername_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_subject_alt_othername_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
       <parameter type-id='type-id-101' name='ret'/>
-      <parameter type-id='type-id-422' name='ret_size'/>
+      <parameter type-id='type-id-425' name='ret_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_issuer_alt_name2' mangled-name='gnutls_x509_crt_get_issuer_alt_name2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_issuer_alt_name2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
       <parameter type-id='type-id-101' name='ian'/>
-      <parameter type-id='type-id-422' name='ian_size'/>
-      <parameter type-id='type-id-419' name='ian_type'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='ian_size'/>
+      <parameter type-id='type-id-422' name='ian_type'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_subject_alt_name2' mangled-name='gnutls_x509_crt_get_subject_alt_name2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_subject_alt_name2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
       <parameter type-id='type-id-101' name='ian'/>
-      <parameter type-id='type-id-422' name='ian_size'/>
-      <parameter type-id='type-id-419' name='ian_type'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='ian_size'/>
+      <parameter type-id='type-id-422' name='ian_type'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_issuer_alt_name' mangled-name='gnutls_x509_crt_get_issuer_alt_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_issuer_alt_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
       <parameter type-id='type-id-101' name='ian'/>
-      <parameter type-id='type-id-422' name='ian_size'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='ian_size'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_subject_alt_name' mangled-name='gnutls_x509_crt_get_subject_alt_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_subject_alt_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
       <parameter type-id='type-id-101' name='ian'/>
-      <parameter type-id='type-id-422' name='ian_size'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='ian_size'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_spki' mangled-name='gnutls_x509_crt_get_spki' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_spki@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-757' name='spki'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-760' name='spki'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_authority_key_id' mangled-name='gnutls_x509_crt_get_authority_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_authority_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-101' name='id'/>
-      <parameter type-id='type-id-422' name='id_size'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='id_size'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_authority_key_gn_serial' mangled-name='gnutls_x509_crt_get_authority_key_gn_serial' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_authority_key_gn_serial@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
       <parameter type-id='type-id-101' name='alt'/>
-      <parameter type-id='type-id-422' name='alt_size'/>
-      <parameter type-id='type-id-419' name='alt_type'/>
+      <parameter type-id='type-id-425' name='alt_size'/>
+      <parameter type-id='type-id-422' name='alt_type'/>
       <parameter type-id='type-id-101' name='serial'/>
-      <parameter type-id='type-id-422' name='serial_size'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='serial_size'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_subject_key_id' mangled-name='gnutls_x509_crt_get_subject_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_subject_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-101' name='ret'/>
-      <parameter type-id='type-id-422' name='ret_size'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-425' name='ret_size'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_private_key_usage_period' mangled-name='gnutls_x509_crt_get_private_key_usage_period' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_private_key_usage_period@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-514' name='activation'/>
-      <parameter type-id='type-id-514' name='expiration'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-517' name='activation'/>
+      <parameter type-id='type-id-517' name='expiration'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_version' mangled-name='gnutls_x509_crt_get_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_version@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_signature' mangled-name='gnutls_x509_crt_get_signature' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_signature@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-376' name='sig'/>
-      <parameter type-id='type-id-422' name='sig_size'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-379' name='sig'/>
+      <parameter type-id='type-id-425' name='sig_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_pk_oid' mangled-name='gnutls_x509_crt_get_pk_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_pk_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-376' name='oid'/>
-      <parameter type-id='type-id-422' name='oid_size'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-379' name='oid'/>
+      <parameter type-id='type-id-425' name='oid_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_signature_oid' mangled-name='gnutls_x509_crt_get_signature_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_signature_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-376' name='oid'/>
-      <parameter type-id='type-id-422' name='oid_size'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-379' name='oid'/>
+      <parameter type-id='type-id-425' name='oid_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_signature_algorithm' mangled-name='gnutls_x509_crt_get_signature_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_signature_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_dn_oid' mangled-name='gnutls_x509_crt_get_dn_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_dn_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='oid'/>
-      <parameter type-id='type-id-422' name='oid_size'/>
+      <parameter type-id='type-id-425' name='oid_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_dn_by_oid' mangled-name='gnutls_x509_crt_get_dn_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_dn_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
       <parameter type-id='type-id-101' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_dn3' mangled-name='gnutls_x509_crt_get_dn3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_dn3@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-275' name='dn'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-278' name='dn'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_dn2' mangled-name='gnutls_x509_crt_get_dn2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_dn2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-275' name='dn'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-278' name='dn'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_dn' mangled-name='gnutls_x509_crt_get_dn' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_dn@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-379' name='buf'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_issuer_dn_oid' mangled-name='gnutls_x509_crt_get_issuer_dn_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_issuer_dn_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-101' name='oid'/>
-      <parameter type-id='type-id-422' name='oid_size'/>
+      <parameter type-id='type-id-425' name='oid_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_issuer_dn_by_oid' mangled-name='gnutls_x509_crt_get_issuer_dn_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_issuer_dn_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
       <parameter type-id='type-id-101' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_issuer_dn3' mangled-name='gnutls_x509_crt_get_issuer_dn3' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_issuer_dn3@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-275' name='dn'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-278' name='dn'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_issuer_dn2' mangled-name='gnutls_x509_crt_get_issuer_dn2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_issuer_dn2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-275' name='dn'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-278' name='dn'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_issuer_dn' mangled-name='gnutls_x509_crt_get_issuer_dn' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_issuer_dn@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-422' name='buf_size'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-379' name='buf'/>
+      <parameter type-id='type-id-425' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_import' mangled-name='gnutls_x509_crt_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_deinit' mangled-name='gnutls_x509_crt_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_init' mangled-name='gnutls_x509_crt_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-458' name='cert'/>
+      <parameter type-id='type-id-461' name='cert'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_equals' mangled-name='gnutls_x509_crt_equals' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_equals@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert1'/>
-      <parameter type-id='type-id-467' name='cert2'/>
+      <parameter type-id='type-id-470' name='cert1'/>
+      <parameter type-id='type-id-470' name='cert2'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_activation_time' mangled-name='gnutls_x509_crt_get_activation_time' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_activation_time@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_expiration_time' mangled-name='gnutls_x509_crt_get_expiration_time' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_expiration_time@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_serial' mangled-name='gnutls_x509_crt_get_serial' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_serial@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-101' name='result'/>
-      <parameter type-id='type-id-422' name='result_size'/>
+      <parameter type-id='type-id-425' name='result_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_pk_algorithm' mangled-name='gnutls_x509_crt_get_pk_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_pk_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-419' name='bits'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-422' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_export2' mangled-name='gnutls_x509_crt_export2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_export2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-421' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-424' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_equals2' mangled-name='gnutls_x509_crt_equals2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_equals2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert1'/>
+      <parameter type-id='type-id-470' name='cert1'/>
       <parameter type-id='type-id-57' name='der'/>
       <return type-id='type-id-10'/>
     </function-decl>
@@ -15865,20 +15960,32 @@
     <function-decl name='_gnutls_is_same_dn' mangled-name='_gnutls_is_same_dn' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='hash_pjw_bare' mangled-name='hash_pjw_bare' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='hash_initialize' mangled-name='hash_initialize' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='hash_insert_if_absent' mangled-name='hash_insert_if_absent' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='hash_free' mangled-name='hash_free' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='x509_dn.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509_dn.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_dn_get_str2' mangled-name='gnutls_x509_dn_get_str2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_dn_get_str2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1011' name='dn'/>
-      <parameter type-id='type-id-275' name='str'/>
+      <parameter type-id='type-id-1020' name='dn'/>
+      <parameter type-id='type-id-278' name='str'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_dn_get_str' mangled-name='gnutls_x509_dn_get_str' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_dn_get_str@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1011' name='dn'/>
-      <parameter type-id='type-id-275' name='str'/>
+      <parameter type-id='type-id-1020' name='dn'/>
+      <parameter type-id='type-id-278' name='str'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_x509_ava_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-1019'>
+    <class-decl name='gnutls_x509_ava_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-1028'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='oid' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -15889,63 +15996,63 @@
         <var-decl name='value_tag' type-id='type-id-38' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_x509_ava_st' type-id='type-id-1019' id='type-id-1020'/>
-    <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-1021'/>
+    <typedef-decl name='gnutls_x509_ava_st' type-id='type-id-1028' id='type-id-1029'/>
+    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1030'/>
     <function-decl name='gnutls_x509_dn_get_rdn_ava' mangled-name='gnutls_x509_dn_get_rdn_ava' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_dn_get_rdn_ava@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1011' name='dn'/>
+      <parameter type-id='type-id-1020' name='dn'/>
       <parameter type-id='type-id-22' name='irdn'/>
       <parameter type-id='type-id-22' name='iava'/>
-      <parameter type-id='type-id-1021' name='ava'/>
+      <parameter type-id='type-id-1030' name='ava'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_dn_export2' mangled-name='gnutls_x509_dn_export2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_dn_export2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1011' name='dn'/>
-      <parameter type-id='type-id-421' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-1020' name='dn'/>
+      <parameter type-id='type-id-424' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_dn_export' mangled-name='gnutls_x509_dn_export' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_dn_export@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1011' name='dn'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-1020' name='dn'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-101' name='output_data'/>
-      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-425' name='output_data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_dn_deinit' mangled-name='gnutls_x509_dn_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_dn_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1011' name='dn'/>
+      <parameter type-id='type-id-1020' name='dn'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_dn_import' mangled-name='gnutls_x509_dn_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_dn_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1011' name='dn'/>
+      <parameter type-id='type-id-1020' name='dn'/>
       <parameter type-id='type-id-57' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_dn_init' mangled-name='gnutls_x509_dn_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_dn_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1012' name='dn'/>
+      <parameter type-id='type-id-1021' name='dn'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_dn_set_str' mangled-name='gnutls_x509_dn_set_str' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_dn_set_str@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1011' name='dn'/>
+      <parameter type-id='type-id-1020' name='dn'/>
       <parameter type-id='type-id-27' name='str'/>
-      <parameter type-id='type-id-426' name='err'/>
+      <parameter type-id='type-id-429' name='err'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_set_dn' mangled-name='gnutls_x509_crq_set_dn' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crq_set_dn@@GNUTLS_3_4'>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-27' name='dn'/>
-      <parameter type-id='type-id-426' name='err'/>
+      <parameter type-id='type-id-429' name='err'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_issuer_dn' mangled-name='gnutls_x509_crt_set_issuer_dn' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_issuer_dn@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-27' name='dn'/>
-      <parameter type-id='type-id-426' name='err'/>
+      <parameter type-id='type-id-429' name='err'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_dn' mangled-name='gnutls_x509_crt_set_dn' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_dn@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-27' name='dn'/>
-      <parameter type-id='type-id-426' name='err'/>
+      <parameter type-id='type-id-429' name='err'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='asn1_read_node_value' mangled-name='asn1_read_node_value' visibility='default' binding='global' size-in-bits='64'>
@@ -15961,123 +16068,123 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='x509_write.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509_write.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_crt_set_spki' mangled-name='gnutls_x509_crt_set_spki' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_spki@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-758' name='spki'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-761' name='spki'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-1013' const='yes' id='type-id-1022'/>
-    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-1023'/>
+    <qualified-type-def type-id='type-id-1022' const='yes' id='type-id-1031'/>
+    <pointer-type-def type-id='type-id-1031' size-in-bits='64' id='type-id-1032'/>
     <function-decl name='gnutls_x509_crt_set_policy' mangled-name='gnutls_x509_crt_set_policy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_policy@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-1023' name='policy'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-1032' name='policy'/>
       <parameter type-id='type-id-10' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_authority_info_access' mangled-name='gnutls_x509_crt_set_authority_info_access' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_authority_info_access@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-22' name='what'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-278' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_privkey_sign' mangled-name='gnutls_x509_crt_privkey_sign' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_privkey_sign@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-467' name='issuer'/>
-      <parameter type-id='type-id-401' name='issuer_key'/>
-      <parameter type-id='type-id-211' name='dig'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-470' name='issuer'/>
+      <parameter type-id='type-id-404' name='issuer_key'/>
+      <parameter type-id='type-id-212' name='dig'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_key_purpose_oid' mangled-name='gnutls_x509_crt_set_key_purpose_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_key_purpose_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-101' name='oid'/>
       <parameter type-id='type-id-10' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_authority_key_id' mangled-name='gnutls_x509_crt_set_authority_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_authority_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-101' name='id'/>
       <parameter type-id='type-id-99' name='id_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_subject_key_id' mangled-name='gnutls_x509_crt_set_subject_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_subject_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-101' name='id'/>
       <parameter type-id='type-id-99' name='id_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_cpy_crl_dist_points' mangled-name='gnutls_x509_crt_cpy_crl_dist_points' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_cpy_crl_dist_points@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='dst'/>
-      <parameter type-id='type-id-467' name='src'/>
+      <parameter type-id='type-id-470' name='dst'/>
+      <parameter type-id='type-id-470' name='src'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_crl_dist_points2' mangled-name='gnutls_x509_crt_set_crl_dist_points2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_crl_dist_points2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-975' name='type'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-984' name='type'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-10' name='data_size'/>
       <parameter type-id='type-id-10' name='reason_flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_crl_dist_points' mangled-name='gnutls_x509_crt_set_crl_dist_points' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_crl_dist_points@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-975' name='type'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-984' name='type'/>
       <parameter type-id='type-id-101' name='data_string'/>
       <parameter type-id='type-id-10' name='reason_flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_subject_unique_id' mangled-name='gnutls_x509_crt_set_subject_unique_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_subject_unique_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-101' name='id'/>
       <parameter type-id='type-id-99' name='id_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_issuer_unique_id' mangled-name='gnutls_x509_crt_set_issuer_unique_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_issuer_unique_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-101' name='id'/>
       <parameter type-id='type-id-99' name='id_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_serial' mangled-name='gnutls_x509_crt_set_serial' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_serial@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-101' name='serial'/>
       <parameter type-id='type-id-99' name='serial_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_expiration_time' mangled-name='gnutls_x509_crt_set_expiration_time' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_expiration_time@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-17' name='exp_time'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_activation_time' mangled-name='gnutls_x509_crt_set_activation_time' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_activation_time@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-17' name='exp_time'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_sign' mangled-name='gnutls_x509_crt_sign' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_sign@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-467' name='issuer'/>
-      <parameter type-id='type-id-383' name='issuer_key'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-470' name='issuer'/>
+      <parameter type-id='type-id-386' name='issuer_key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_sign2' mangled-name='gnutls_x509_crt_sign2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_sign2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-467' name='issuer'/>
-      <parameter type-id='type-id-383' name='issuer_key'/>
-      <parameter type-id='type-id-211' name='dig'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-470' name='issuer'/>
+      <parameter type-id='type-id-386' name='issuer_key'/>
+      <parameter type-id='type-id-212' name='dig'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_private_key_usage_period' mangled-name='gnutls_x509_crt_set_private_key_usage_period' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_private_key_usage_period@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-17' name='activation'/>
       <parameter type-id='type-id-17' name='expiration'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_proxy' mangled-name='gnutls_x509_crt_set_proxy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_proxy@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-22' name='pathLenConstraint'/>
       <parameter type-id='type-id-27' name='policyLanguage'/>
       <parameter type-id='type-id-27' name='policy'/>
@@ -16085,7 +16192,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_issuer_alt_othername' mangled-name='gnutls_x509_crt_set_issuer_alt_othername' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_issuer_alt_othername@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-10' name='data_size'/>
@@ -16093,7 +16200,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_subject_alt_othername' mangled-name='gnutls_x509_crt_set_subject_alt_othername' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_subject_alt_othername@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-10' name='data_size'/>
@@ -16101,50 +16208,50 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_issuer_alt_name' mangled-name='gnutls_x509_crt_set_issuer_alt_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_issuer_alt_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-975' name='type'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-984' name='type'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-10' name='data_size'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_subject_alt_name' mangled-name='gnutls_x509_crt_set_subject_alt_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_subject_alt_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-975' name='type'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-984' name='type'/>
       <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-10' name='data_size'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_subject_alternative_name' mangled-name='gnutls_x509_crt_set_subject_alternative_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_subject_alternative_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-975' name='type'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-984' name='type'/>
       <parameter type-id='type-id-27' name='data_string'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_inhibit_anypolicy' mangled-name='gnutls_x509_crt_set_inhibit_anypolicy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_inhibit_anypolicy@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-10' name='skipcerts'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_key_usage' mangled-name='gnutls_x509_crt_set_key_usage' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_key_usage@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-10' name='skipcerts'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_ca_status' mangled-name='gnutls_x509_crt_set_ca_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_ca_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-10' name='ca'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_basic_constraints' mangled-name='gnutls_x509_crt_set_basic_constraints' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_basic_constraints@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-10' name='ca'/>
       <parameter type-id='type-id-22' name='pathLenConstraint'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_extension_by_oid' mangled-name='gnutls_x509_crt_set_extension_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_extension_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-101' name='buf'/>
       <parameter type-id='type-id-99' name='sizeof_buf'/>
@@ -16152,35 +16259,35 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_crq_extensions' mangled-name='gnutls_x509_crt_set_crq_extensions' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_crq_extensions@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_crq' mangled-name='gnutls_x509_crt_set_crq' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_crq@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_key' mangled-name='gnutls_x509_crt_set_key' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_key@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-386' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_version' mangled-name='gnutls_x509_crt_set_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_version@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-10' name='version'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_proxy_dn' mangled-name='gnutls_x509_crt_set_proxy_dn' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_proxy_dn@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-467' name='eecrt'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-470' name='eecrt'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
       <parameter type-id='type-id-101' name='name'/>
       <parameter type-id='type-id-10' name='sizeof_name'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_issuer_dn_by_oid' mangled-name='gnutls_x509_crt_set_issuer_dn_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_issuer_dn_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
       <parameter type-id='type-id-101' name='name'/>
@@ -16188,7 +16295,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_dn_by_oid' mangled-name='gnutls_x509_crt_set_dn_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_dn_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
       <parameter type-id='type-id-101' name='name'/>
@@ -16196,8 +16303,8 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_crq_extension_by_oid' mangled-name='gnutls_x509_crt_set_crq_extension_by_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_crq_extension_by_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-768' name='crq'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-771' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
@@ -16248,16 +16355,16 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='name_constraints.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
-    <class-decl name='gnutls_name_constraints_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1024'>
+  <abi-instr version='1.0' address-size='64' path='name_constraints.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
+    <class-decl name='gnutls_name_constraints_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1033'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='permitted' type-id='type-id-1025' visibility='default'/>
+        <var-decl name='permitted' type-id='type-id-1034' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='excluded' type-id='type-id-1025' visibility='default'/>
+        <var-decl name='excluded' type-id='type-id-1034' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='name_constraints_node_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-1026'>
+    <class-decl name='name_constraints_node_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-1035'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -16265,75 +16372,75 @@
         <var-decl name='name' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='next' type-id='type-id-1025' visibility='default'/>
+        <var-decl name='next' type-id='type-id-1034' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1026' size-in-bits='64' id='type-id-1025'/>
-    <pointer-type-def type-id='type-id-1024' size-in-bits='64' id='type-id-1027'/>
-    <typedef-decl name='gnutls_x509_name_constraints_t' type-id='type-id-1027' id='type-id-1028'/>
+    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1034'/>
+    <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1036'/>
+    <typedef-decl name='gnutls_x509_name_constraints_t' type-id='type-id-1036' id='type-id-1037'/>
     <function-decl name='gnutls_x509_name_constraints_check_crt' mangled-name='gnutls_x509_name_constraints_check_crt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_name_constraints_check_crt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1028' name='nc'/>
-      <parameter type-id='type-id-975' name='type'/>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-1037' name='nc'/>
+      <parameter type-id='type-id-984' name='type'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_x509_name_constraints_check' mangled-name='gnutls_x509_name_constraints_check' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_name_constraints_check@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1028' name='nc'/>
-      <parameter type-id='type-id-975' name='type'/>
+      <parameter type-id='type-id-1037' name='nc'/>
+      <parameter type-id='type-id-984' name='type'/>
       <parameter type-id='type-id-57' name='name'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_name_constraints' mangled-name='gnutls_x509_crt_set_name_constraints' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_name_constraints@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-1028' name='nc'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-1037' name='nc'/>
       <parameter type-id='type-id-10' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_name_constraints_add_excluded' mangled-name='gnutls_x509_name_constraints_add_excluded' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_name_constraints_add_excluded@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1028' name='nc'/>
-      <parameter type-id='type-id-975' name='type'/>
+      <parameter type-id='type-id-1037' name='nc'/>
+      <parameter type-id='type-id-984' name='type'/>
       <parameter type-id='type-id-57' name='name'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_name_constraints_add_permitted' mangled-name='gnutls_x509_name_constraints_add_permitted' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_name_constraints_add_permitted@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1028' name='nc'/>
-      <parameter type-id='type-id-975' name='type'/>
+      <parameter type-id='type-id-1037' name='nc'/>
+      <parameter type-id='type-id-984' name='type'/>
       <parameter type-id='type-id-57' name='name'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_x509_name_constraints_merge' mangled-name='_gnutls_x509_name_constraints_merge' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_x509_name_constraints_merge@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-1028' name='nc'/>
-      <parameter type-id='type-id-1028' name='nc2'/>
+      <parameter type-id='type-id-1037' name='nc'/>
+      <parameter type-id='type-id-1037' name='nc2'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-1029'/>
+    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1038'/>
     <function-decl name='gnutls_x509_name_constraints_init' mangled-name='gnutls_x509_name_constraints_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_name_constraints_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1029' name='nc'/>
+      <parameter type-id='type-id-1038' name='nc'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_name_constraints_deinit' mangled-name='gnutls_x509_name_constraints_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_name_constraints_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1028' name='nc'/>
+      <parameter type-id='type-id-1037' name='nc'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_name_constraints' mangled-name='gnutls_x509_crt_get_name_constraints' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_name_constraints@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-1028' name='nc'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-1037' name='nc'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_name_constraints_get_permitted' mangled-name='gnutls_x509_name_constraints_get_permitted' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_name_constraints_get_permitted@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1028' name='nc'/>
+      <parameter type-id='type-id-1037' name='nc'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-419' name='type'/>
-      <parameter type-id='type-id-275' name='name'/>
+      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-278' name='name'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_name_constraints_get_excluded' mangled-name='gnutls_x509_name_constraints_get_excluded' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_name_constraints_get_excluded@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1028' name='nc'/>
+      <parameter type-id='type-id-1037' name='nc'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-419' name='type'/>
-      <parameter type-id='type-id-275' name='name'/>
+      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-278' name='name'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_subject_alt_name2' mangled-name='gnutls_x509_crt_get_subject_alt_name2' visibility='default' binding='global' size-in-bits='64'>
@@ -16352,116 +16459,116 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='verify-high.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
-    <class-decl name='node_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-459'>
+  <abi-instr version='1.0' address-size='64' path='verify-high.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
+    <class-decl name='node_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-462'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='trusted_cas' type-id='type-id-458' visibility='default'/>
+        <var-decl name='trusted_cas' type-id='type-id-461' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='trusted_ca_size' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='named_certs' type-id='type-id-1030' visibility='default'/>
+        <var-decl name='named_certs' type-id='type-id-1039' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='named_cert_size' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='crls' type-id='type-id-731' visibility='default'/>
+        <var-decl name='crls' type-id='type-id-734' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='crl_size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='named_cert_st' size-in-bits='2176' is-struct='yes' visibility='default' id='type-id-1031'>
+    <class-decl name='named_cert_st' size-in-bits='2176' is-struct='yes' visibility='default' id='type-id-1040'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cert' type-id='type-id-467' visibility='default'/>
+        <var-decl name='cert' type-id='type-id-470' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='name' type-id='type-id-316' visibility='default'/>
+        <var-decl name='name' type-id='type-id-319' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
         <var-decl name='name_size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1031' size-in-bits='64' id='type-id-1030'/>
-    <typedef-decl name='gnutls_verify_output_function' type-id='type-id-1032' id='type-id-1033'/>
-    <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1034'/>
+    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1039'/>
+    <typedef-decl name='gnutls_verify_output_function' type-id='type-id-1041' id='type-id-1042'/>
+    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-1043'/>
     <function-decl name='gnutls_x509_trust_list_verify_named_crt' mangled-name='gnutls_x509_trust_list_verify_named_crt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_verify_named_crt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-438' name='list'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-101' name='name'/>
       <parameter type-id='type-id-99' name='name_size'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-419' name='voutput'/>
-      <parameter type-id='type-id-1034' name='func'/>
+      <parameter type-id='type-id-422' name='voutput'/>
+      <parameter type-id='type-id-1043' name='func'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_verify_crt2' mangled-name='gnutls_x509_trust_list_verify_crt2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_verify_crt2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
-      <parameter type-id='type-id-458' name='cert_list'/>
+      <parameter type-id='type-id-438' name='list'/>
+      <parameter type-id='type-id-461' name='cert_list'/>
       <parameter type-id='type-id-10' name='cert_list_size'/>
-      <parameter type-id='type-id-172' name='data'/>
+      <parameter type-id='type-id-173' name='data'/>
       <parameter type-id='type-id-10' name='elements'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-419' name='voutput'/>
-      <parameter type-id='type-id-1034' name='func'/>
+      <parameter type-id='type-id-422' name='voutput'/>
+      <parameter type-id='type-id-1043' name='func'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_verify_crt' mangled-name='gnutls_x509_trust_list_verify_crt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_verify_crt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
-      <parameter type-id='type-id-458' name='cert_list'/>
+      <parameter type-id='type-id-438' name='list'/>
+      <parameter type-id='type-id-461' name='cert_list'/>
       <parameter type-id='type-id-10' name='cert_list_size'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-419' name='voutput'/>
-      <parameter type-id='type-id-1034' name='func'/>
+      <parameter type-id='type-id-422' name='voutput'/>
+      <parameter type-id='type-id-1043' name='func'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_get_issuer_by_subject_key_id' mangled-name='gnutls_x509_trust_list_get_issuer_by_subject_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_get_issuer_by_subject_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-438' name='list'/>
       <parameter type-id='type-id-57' name='dn'/>
       <parameter type-id='type-id-57' name='spki'/>
-      <parameter type-id='type-id-458' name='issuer'/>
+      <parameter type-id='type-id-461' name='issuer'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_get_issuer_by_dn' mangled-name='gnutls_x509_trust_list_get_issuer_by_dn' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_get_issuer_by_dn@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-438' name='list'/>
       <parameter type-id='type-id-57' name='dn'/>
-      <parameter type-id='type-id-458' name='issuer'/>
+      <parameter type-id='type-id-461' name='issuer'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_get_issuer' mangled-name='gnutls_x509_trust_list_get_issuer' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_get_issuer@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
-      <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-458' name='issuer'/>
+      <parameter type-id='type-id-438' name='list'/>
+      <parameter type-id='type-id-470' name='cert'/>
+      <parameter type-id='type-id-461' name='issuer'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_add_crls' mangled-name='gnutls_x509_trust_list_add_crls' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_add_crls@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
-      <parameter type-id='type-id-1009' name='crl_list'/>
+      <parameter type-id='type-id-438' name='list'/>
+      <parameter type-id='type-id-1018' name='crl_list'/>
       <parameter type-id='type-id-10' name='crl_size'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-10' name='verification_flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_add_named_crt' mangled-name='gnutls_x509_trust_list_add_named_crt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_add_named_crt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-438' name='list'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-101' name='name'/>
       <parameter type-id='type-id-99' name='name_size'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_remove_cas' mangled-name='gnutls_x509_trust_list_remove_cas' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_remove_cas@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
-      <parameter type-id='type-id-1007' name='clist'/>
+      <parameter type-id='type-id-438' name='list'/>
+      <parameter type-id='type-id-1016' name='clist'/>
       <parameter type-id='type-id-10' name='clist_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_x509_trust_list_iter' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-1035'>
+    <class-decl name='gnutls_x509_trust_list_iter' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-1044'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='node_index' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -16469,7 +16576,7 @@
         <var-decl name='ca_index' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='pkcs11_list' type-id='type-id-922' visibility='default'/>
+        <var-decl name='pkcs11_list' type-id='type-id-925' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='pkcs11_index' type-id='type-id-10' visibility='default'/>
@@ -16478,40 +16585,37 @@
         <var-decl name='pkcs11_size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1036'/>
-    <typedef-decl name='gnutls_x509_trust_list_iter_t' type-id='type-id-1036' id='type-id-1037'/>
+    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-1045'/>
+    <typedef-decl name='gnutls_x509_trust_list_iter_t' type-id='type-id-1045' id='type-id-1046'/>
     <function-decl name='gnutls_x509_trust_list_iter_deinit' mangled-name='gnutls_x509_trust_list_iter_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_iter_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1037' name='iter'/>
+      <parameter type-id='type-id-1046' name='iter'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1038'/>
+    <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1047'/>
     <function-decl name='gnutls_x509_trust_list_iter_get_ca' mangled-name='gnutls_x509_trust_list_iter_get_ca' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_iter_get_ca@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
-      <parameter type-id='type-id-1038' name='iter'/>
-      <parameter type-id='type-id-458' name='crt'/>
+      <parameter type-id='type-id-438' name='list'/>
+      <parameter type-id='type-id-1047' name='iter'/>
+      <parameter type-id='type-id-461' name='crt'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_add_cas' mangled-name='gnutls_x509_trust_list_add_cas' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_add_cas@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
-      <parameter type-id='type-id-1007' name='clist'/>
+      <parameter type-id='type-id-438' name='list'/>
+      <parameter type-id='type-id-1016' name='clist'/>
       <parameter type-id='type-id-10' name='clist_size'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_deinit' mangled-name='gnutls_x509_trust_list_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-438' name='list'/>
       <parameter type-id='type-id-10' name='all'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-1039'/>
+    <pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-1048'/>
     <function-decl name='gnutls_x509_trust_list_init' mangled-name='gnutls_x509_trust_list_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1039' name='list'/>
+      <parameter type-id='type-id-1048' name='list'/>
       <parameter type-id='type-id-10' name='size'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='hash_pjw_bare' mangled-name='hash_pjw_bare' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
     <function-decl name='_gnutls_x509_crt_check_revocation' mangled-name='_gnutls_x509_crt_check_revocation' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -16545,50 +16649,50 @@
     <function-decl name='gnutls_x509_crt_get_dn2' mangled-name='gnutls_x509_crt_get_dn2' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1032'>
-      <parameter type-id='type-id-467'/>
-      <parameter type-id='type-id-467'/>
-      <parameter type-id='type-id-730'/>
+    <function-type size-in-bits='64' id='type-id-1041'>
+      <parameter type-id='type-id-470'/>
+      <parameter type-id='type-id-470'/>
+      <parameter type-id='type-id-733'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='verify-high2.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='verify-high2.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_trust_list_remove_trust_file' mangled-name='gnutls_x509_trust_list_remove_trust_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_remove_trust_file@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-438' name='list'/>
       <parameter type-id='type-id-27' name='ca_file'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_add_trust_dir' mangled-name='gnutls_x509_trust_list_add_trust_dir' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_add_trust_dir@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-438' name='list'/>
       <parameter type-id='type-id-27' name='ca_dir'/>
       <parameter type-id='type-id-27' name='crl_dir'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <parameter type-id='type-id-10' name='tl_flags'/>
       <parameter type-id='type-id-10' name='tl_vflags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_add_trust_file' mangled-name='gnutls_x509_trust_list_add_trust_file' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_add_trust_file@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-438' name='list'/>
       <parameter type-id='type-id-27' name='ca_file'/>
       <parameter type-id='type-id-27' name='crl_file'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <parameter type-id='type-id-10' name='tl_flags'/>
       <parameter type-id='type-id-10' name='tl_vflags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_remove_trust_mem' mangled-name='gnutls_x509_trust_list_remove_trust_mem' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_remove_trust_mem@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-438' name='list'/>
       <parameter type-id='type-id-57' name='cas'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_add_trust_mem' mangled-name='gnutls_x509_trust_list_add_trust_mem' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_trust_list_add_trust_mem@@GNUTLS_3_4'>
-      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-438' name='list'/>
       <parameter type-id='type-id-57' name='cas'/>
       <parameter type-id='type-id-57' name='crls'/>
-      <parameter type-id='type-id-421' name='type'/>
+      <parameter type-id='type-id-424' name='type'/>
       <parameter type-id='type-id-10' name='tl_flags'/>
       <parameter type-id='type-id-10' name='tl_vflags'/>
       <return type-id='type-id-22'/>
@@ -16615,82 +16719,82 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='x509_ext.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509_ext.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_tlsfeatures_add' mangled-name='gnutls_x509_tlsfeatures_add' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_tlsfeatures_add@@GNUTLS_3_4'>
-      <parameter type-id='type-id-973' name='f'/>
+      <parameter type-id='type-id-982' name='f'/>
       <parameter type-id='type-id-10' name='feature'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_tlsfeatures' mangled-name='gnutls_x509_ext_export_tlsfeatures' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_tlsfeatures@@GNUTLS_3_4'>
-      <parameter type-id='type-id-973' name='f'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-982' name='f'/>
+      <parameter type-id='type-id-278' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_tlsfeatures' mangled-name='gnutls_x509_ext_import_tlsfeatures' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_tlsfeatures@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-973' name='f'/>
+      <parameter type-id='type-id-982' name='f'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_deinit' mangled-name='gnutls_x509_ext_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-933' name='ext'/>
+      <parameter type-id='type-id-936' name='ext'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <class-decl name='gnutls_x509_key_purposes_st' size-in-bits='8256' is-struct='yes' visibility='default' id='type-id-1040'>
+    <class-decl name='gnutls_x509_key_purposes_st' size-in-bits='8256' is-struct='yes' visibility='default' id='type-id-1049'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='oid' type-id='type-id-1041' visibility='default'/>
+        <var-decl name='oid' type-id='type-id-1050' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8192'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-62' size-in-bits='8192' id='type-id-1041'>
+    <array-type-def dimensions='1' type-id='type-id-62' size-in-bits='8192' id='type-id-1050'>
       <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1042'/>
-    <typedef-decl name='gnutls_x509_key_purposes_t' type-id='type-id-1042' id='type-id-1043'/>
+    <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1051'/>
+    <typedef-decl name='gnutls_x509_key_purposes_t' type-id='type-id-1051' id='type-id-1052'/>
     <function-decl name='gnutls_x509_ext_export_key_purposes' mangled-name='gnutls_x509_ext_export_key_purposes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_key_purposes@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1043' name='p'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-1052' name='p'/>
+      <parameter type-id='type-id-278' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_key_purposes' mangled-name='gnutls_x509_ext_import_key_purposes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_key_purposes@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-1043' name='p'/>
+      <parameter type-id='type-id-1052' name='p'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_key_purpose_get' mangled-name='gnutls_x509_key_purpose_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_key_purpose_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1043' name='p'/>
+      <parameter type-id='type-id-1052' name='p'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-275' name='oid'/>
+      <parameter type-id='type-id-278' name='oid'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_key_purpose_set' mangled-name='gnutls_x509_key_purpose_set' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_key_purpose_set@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1043' name='p'/>
+      <parameter type-id='type-id-1052' name='p'/>
       <parameter type-id='type-id-27' name='oid'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_key_purpose_deinit' mangled-name='gnutls_x509_key_purpose_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_key_purpose_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1043' name='p'/>
+      <parameter type-id='type-id-1052' name='p'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1044'/>
+    <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-1053'/>
     <function-decl name='gnutls_x509_key_purpose_init' mangled-name='gnutls_x509_key_purpose_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_key_purpose_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1044' name='p'/>
+      <parameter type-id='type-id-1053' name='p'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_x509_aia_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1045'>
+    <class-decl name='gnutls_x509_aia_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1054'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='aia' type-id='type-id-1046' visibility='default'/>
+        <var-decl name='aia' type-id='type-id-1055' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-1047'>
+    <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-1056'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='oid' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -16701,53 +16805,53 @@
         <var-decl name='san' type-id='type-id-62' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1046'/>
-    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1048'/>
-    <typedef-decl name='gnutls_x509_aia_t' type-id='type-id-1048' id='type-id-1049'/>
+    <pointer-type-def type-id='type-id-1056' size-in-bits='64' id='type-id-1055'/>
+    <pointer-type-def type-id='type-id-1054' size-in-bits='64' id='type-id-1057'/>
+    <typedef-decl name='gnutls_x509_aia_t' type-id='type-id-1057' id='type-id-1058'/>
     <function-decl name='gnutls_x509_ext_export_aia' mangled-name='gnutls_x509_ext_export_aia' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_aia@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1049' name='aia'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-1058' name='aia'/>
+      <parameter type-id='type-id-278' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_aia' mangled-name='gnutls_x509_ext_import_aia' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_aia@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-1049' name='aia'/>
+      <parameter type-id='type-id-1058' name='aia'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_aia_set' mangled-name='gnutls_x509_aia_set' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_aia_set@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1049' name='aia'/>
+      <parameter type-id='type-id-1058' name='aia'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='san_type'/>
       <parameter type-id='type-id-57' name='san'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_aia_get' mangled-name='gnutls_x509_aia_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_aia_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1049' name='aia'/>
+      <parameter type-id='type-id-1058' name='aia'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-275' name='oid'/>
-      <parameter type-id='type-id-419' name='san_type'/>
-      <parameter type-id='type-id-275' name='san'/>
+      <parameter type-id='type-id-278' name='oid'/>
+      <parameter type-id='type-id-422' name='san_type'/>
+      <parameter type-id='type-id-278' name='san'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_aia_deinit' mangled-name='gnutls_x509_aia_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_aia_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1049' name='aia'/>
+      <parameter type-id='type-id-1058' name='aia'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1050'/>
+    <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-1059'/>
     <function-decl name='gnutls_x509_aia_init' mangled-name='gnutls_x509_aia_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_aia_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1050' name='aia'/>
+      <parameter type-id='type-id-1059' name='aia'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_x509_crl_dist_points_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1051'>
+    <class-decl name='gnutls_x509_crl_dist_points_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1060'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='points' type-id='type-id-1052' visibility='default'/>
+        <var-decl name='points' type-id='type-id-1061' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='crl_dist_point_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-1053'>
+    <class-decl name='crl_dist_point_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-1062'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -16758,88 +16862,88 @@
         <var-decl name='reasons' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1053' size-in-bits='64' id='type-id-1052'/>
-    <pointer-type-def type-id='type-id-1051' size-in-bits='64' id='type-id-1054'/>
-    <typedef-decl name='gnutls_x509_crl_dist_points_t' type-id='type-id-1054' id='type-id-1055'/>
+    <pointer-type-def type-id='type-id-1062' size-in-bits='64' id='type-id-1061'/>
+    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-1063'/>
+    <typedef-decl name='gnutls_x509_crl_dist_points_t' type-id='type-id-1063' id='type-id-1064'/>
     <function-decl name='gnutls_x509_ext_export_crl_dist_points' mangled-name='gnutls_x509_ext_export_crl_dist_points' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_crl_dist_points@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1055' name='cdp'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-1064' name='cdp'/>
+      <parameter type-id='type-id-278' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_crl_dist_points' mangled-name='gnutls_x509_ext_import_crl_dist_points' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_crl_dist_points@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-1055' name='cdp'/>
+      <parameter type-id='type-id-1064' name='cdp'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_dist_points_set' mangled-name='gnutls_x509_crl_dist_points_set' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_dist_points_set@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1055' name='cdp'/>
-      <parameter type-id='type-id-975' name='type'/>
+      <parameter type-id='type-id-1064' name='cdp'/>
+      <parameter type-id='type-id-984' name='type'/>
       <parameter type-id='type-id-57' name='san'/>
       <parameter type-id='type-id-10' name='reasons'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_dist_points_get' mangled-name='gnutls_x509_crl_dist_points_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_dist_points_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1055' name='cdp'/>
+      <parameter type-id='type-id-1064' name='cdp'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-419' name='type'/>
-      <parameter type-id='type-id-275' name='san'/>
-      <parameter type-id='type-id-419' name='reasons'/>
+      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-278' name='san'/>
+      <parameter type-id='type-id-422' name='reasons'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_dist_points_deinit' mangled-name='gnutls_x509_crl_dist_points_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_dist_points_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1055' name='cdp'/>
+      <parameter type-id='type-id-1064' name='cdp'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-1056'/>
+    <pointer-type-def type-id='type-id-1064' size-in-bits='64' id='type-id-1065'/>
     <function-decl name='gnutls_x509_crl_dist_points_init' mangled-name='gnutls_x509_crl_dist_points_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crl_dist_points_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1056' name='cdp'/>
+      <parameter type-id='type-id-1065' name='cdp'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_x509_policies_st' size-in-bits='106560' is-struct='yes' visibility='default' id='type-id-1057'>
+    <class-decl name='gnutls_x509_policies_st' size-in-bits='106560' is-struct='yes' visibility='default' id='type-id-1066'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='policy' type-id='type-id-1058' visibility='default'/>
+        <var-decl name='policy' type-id='type-id-1067' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='106496'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-1013' size-in-bits='106496' id='type-id-1058'>
+    <array-type-def dimensions='1' type-id='type-id-1022' size-in-bits='106496' id='type-id-1067'>
       <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-1057' size-in-bits='64' id='type-id-1059'/>
-    <typedef-decl name='gnutls_x509_policies_t' type-id='type-id-1059' id='type-id-1060'/>
+    <pointer-type-def type-id='type-id-1066' size-in-bits='64' id='type-id-1068'/>
+    <typedef-decl name='gnutls_x509_policies_t' type-id='type-id-1068' id='type-id-1069'/>
     <function-decl name='gnutls_x509_ext_export_policies' mangled-name='gnutls_x509_ext_export_policies' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_policies@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1060' name='policies'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-1069' name='policies'/>
+      <parameter type-id='type-id-278' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_policies' mangled-name='gnutls_x509_ext_import_policies' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_policies@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-1060' name='policies'/>
+      <parameter type-id='type-id-1069' name='policies'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_policies_set' mangled-name='gnutls_x509_policies_set' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_policies_set@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1060' name='policies'/>
-      <parameter type-id='type-id-1023' name='policy'/>
+      <parameter type-id='type-id-1069' name='policies'/>
+      <parameter type-id='type-id-1032' name='policy'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_policies_get' mangled-name='gnutls_x509_policies_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_policies_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1060' name='policies'/>
+      <parameter type-id='type-id-1069' name='policies'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-1018' name='policy'/>
+      <parameter type-id='type-id-1027' name='policy'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_policies_deinit' mangled-name='gnutls_x509_policies_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_policies_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1060' name='policies'/>
+      <parameter type-id='type-id-1069' name='policies'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-1061'/>
+    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-1070'/>
     <function-decl name='gnutls_x509_policies_init' mangled-name='gnutls_x509_policies_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_policies_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1061' name='policies'/>
+      <parameter type-id='type-id-1070' name='policies'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_proxy' mangled-name='gnutls_x509_ext_export_proxy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_proxy@@GNUTLS_3_4'>
@@ -16847,81 +16951,81 @@
       <parameter type-id='type-id-27' name='policyLanguage'/>
       <parameter type-id='type-id-27' name='policy'/>
       <parameter type-id='type-id-99' name='sizeof_policy'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-278' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_proxy' mangled-name='gnutls_x509_ext_import_proxy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_proxy@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-364' name='pathlen'/>
-      <parameter type-id='type-id-852' name='policyLanguage'/>
-      <parameter type-id='type-id-852' name='policy'/>
-      <parameter type-id='type-id-422' name='sizeof_policy'/>
+      <parameter type-id='type-id-367' name='pathlen'/>
+      <parameter type-id='type-id-855' name='policyLanguage'/>
+      <parameter type-id='type-id-855' name='policy'/>
+      <parameter type-id='type-id-425' name='sizeof_policy'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_basic_constraints' mangled-name='gnutls_x509_ext_export_basic_constraints' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_basic_constraints@@GNUTLS_3_4'>
       <parameter type-id='type-id-10' name='ca'/>
       <parameter type-id='type-id-22' name='pathlen'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-278' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_basic_constraints' mangled-name='gnutls_x509_ext_import_basic_constraints' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_basic_constraints@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-419' name='ca'/>
-      <parameter type-id='type-id-364' name='pathlen'/>
+      <parameter type-id='type-id-422' name='ca'/>
+      <parameter type-id='type-id-367' name='pathlen'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_private_key_usage_period' mangled-name='gnutls_x509_ext_export_private_key_usage_period' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_private_key_usage_period@@GNUTLS_3_4'>
       <parameter type-id='type-id-17' name='activation'/>
       <parameter type-id='type-id-17' name='expiration'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-278' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_private_key_usage_period' mangled-name='gnutls_x509_ext_import_private_key_usage_period' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_private_key_usage_period@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-514' name='activation'/>
-      <parameter type-id='type-id-514' name='expiration'/>
+      <parameter type-id='type-id-517' name='activation'/>
+      <parameter type-id='type-id-517' name='expiration'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_inhibit_anypolicy' mangled-name='gnutls_x509_ext_export_inhibit_anypolicy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_inhibit_anypolicy@@GNUTLS_3_6_0'>
       <parameter type-id='type-id-10' name='skipcerts'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-278' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_inhibit_anypolicy' mangled-name='gnutls_x509_ext_import_inhibit_anypolicy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_inhibit_anypolicy@@GNUTLS_3_6_0'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-419' name='skipcerts'/>
+      <parameter type-id='type-id-422' name='skipcerts'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_key_usage' mangled-name='gnutls_x509_ext_export_key_usage' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_key_usage@@GNUTLS_3_4'>
       <parameter type-id='type-id-10' name='usage'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-278' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_key_usage' mangled-name='gnutls_x509_ext_import_key_usage' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_key_usage@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-419' name='key_usage'/>
+      <parameter type-id='type-id-422' name='key_usage'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_x509_aki_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1062'>
+    <class-decl name='gnutls_x509_aki_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1071'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='id' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='cert_issuer' type-id='type-id-463' visibility='default'/>
+        <var-decl name='cert_issuer' type-id='type-id-466' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='serial' type-id='type-id-62' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='gnutls_subject_alt_names_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-463'>
+    <class-decl name='gnutls_subject_alt_names_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-466'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='names' type-id='type-id-1063' visibility='default'/>
+        <var-decl name='names' type-id='type-id-1072' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='name_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-1064'>
+    <class-decl name='name_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-1073'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -16932,31 +17036,31 @@
         <var-decl name='othername_oid' type-id='type-id-62' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1064' size-in-bits='64' id='type-id-1063'/>
-    <pointer-type-def type-id='type-id-1062' size-in-bits='64' id='type-id-1065'/>
-    <typedef-decl name='gnutls_x509_aki_t' type-id='type-id-1065' id='type-id-1066'/>
+    <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-1072'/>
+    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-1074'/>
+    <typedef-decl name='gnutls_x509_aki_t' type-id='type-id-1074' id='type-id-1075'/>
     <function-decl name='gnutls_x509_ext_export_authority_key_id' mangled-name='gnutls_x509_ext_export_authority_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_authority_key_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1066' name='aki'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-1075' name='aki'/>
+      <parameter type-id='type-id-278' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_authority_key_id' mangled-name='gnutls_x509_ext_import_authority_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_authority_key_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-1066' name='aki'/>
+      <parameter type-id='type-id-1075' name='aki'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_aki_get_cert_issuer' mangled-name='gnutls_x509_aki_get_cert_issuer' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_aki_get_cert_issuer@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1066' name='aki'/>
+      <parameter type-id='type-id-1075' name='aki'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-419' name='san_type'/>
-      <parameter type-id='type-id-275' name='san'/>
-      <parameter type-id='type-id-275' name='othername_oid'/>
-      <parameter type-id='type-id-275' name='serial'/>
+      <parameter type-id='type-id-422' name='san_type'/>
+      <parameter type-id='type-id-278' name='san'/>
+      <parameter type-id='type-id-278' name='othername_oid'/>
+      <parameter type-id='type-id-278' name='serial'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_aki_set_cert_issuer' mangled-name='gnutls_x509_aki_set_cert_issuer' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_aki_set_cert_issuer@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1066' name='aki'/>
+      <parameter type-id='type-id-1075' name='aki'/>
       <parameter type-id='type-id-10' name='san_type'/>
       <parameter type-id='type-id-57' name='san'/>
       <parameter type-id='type-id-27' name='othername_oid'/>
@@ -16964,78 +17068,78 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_aki_set_id' mangled-name='gnutls_x509_aki_set_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_aki_set_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1066' name='aki'/>
+      <parameter type-id='type-id-1075' name='aki'/>
       <parameter type-id='type-id-57' name='id'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_aki_get_id' mangled-name='gnutls_x509_aki_get_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_aki_get_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1066' name='aki'/>
-      <parameter type-id='type-id-275' name='id'/>
+      <parameter type-id='type-id-1075' name='aki'/>
+      <parameter type-id='type-id-278' name='id'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_aki_deinit' mangled-name='gnutls_x509_aki_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_aki_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1066' name='aki'/>
+      <parameter type-id='type-id-1075' name='aki'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1066' size-in-bits='64' id='type-id-1067'/>
+    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-1076'/>
     <function-decl name='gnutls_x509_aki_init' mangled-name='gnutls_x509_aki_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_aki_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1067' name='aki'/>
+      <parameter type-id='type-id-1076' name='aki'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_subject_key_id' mangled-name='gnutls_x509_ext_export_subject_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_subject_key_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='id'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-278' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_subject_key_id' mangled-name='gnutls_x509_ext_import_subject_key_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_subject_key_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-275' name='id'/>
+      <parameter type-id='type-id-278' name='id'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_name_constraints' mangled-name='gnutls_x509_ext_export_name_constraints' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_name_constraints@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1028' name='nc'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-1037' name='nc'/>
+      <parameter type-id='type-id-278' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_name_constraints' mangled-name='gnutls_x509_ext_import_name_constraints' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_name_constraints@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-1028' name='nc'/>
+      <parameter type-id='type-id-1037' name='nc'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_subject_alt_names' mangled-name='gnutls_x509_ext_export_subject_alt_names' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_export_subject_alt_names@@GNUTLS_3_4'>
-      <parameter type-id='type-id-461' name='sans'/>
-      <parameter type-id='type-id-275' name='ext'/>
+      <parameter type-id='type-id-464' name='sans'/>
+      <parameter type-id='type-id-278' name='ext'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_import_subject_alt_names' mangled-name='gnutls_x509_ext_import_subject_alt_names' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_ext_import_subject_alt_names@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='ext'/>
-      <parameter type-id='type-id-461' name='sans'/>
+      <parameter type-id='type-id-464' name='sans'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_subject_alt_names_set' mangled-name='gnutls_subject_alt_names_set' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_subject_alt_names_set@@GNUTLS_3_4'>
-      <parameter type-id='type-id-461' name='sans'/>
+      <parameter type-id='type-id-464' name='sans'/>
       <parameter type-id='type-id-10' name='san_type'/>
       <parameter type-id='type-id-57' name='san'/>
       <parameter type-id='type-id-27' name='othername_oid'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_subject_alt_names_get' mangled-name='gnutls_subject_alt_names_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_subject_alt_names_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-461' name='sans'/>
+      <parameter type-id='type-id-464' name='sans'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-419' name='san_type'/>
-      <parameter type-id='type-id-275' name='san'/>
-      <parameter type-id='type-id-275' name='othername_oid'/>
+      <parameter type-id='type-id-422' name='san_type'/>
+      <parameter type-id='type-id-278' name='san'/>
+      <parameter type-id='type-id-278' name='othername_oid'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_subject_alt_names_deinit' mangled-name='gnutls_subject_alt_names_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_subject_alt_names_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-461' name='sans'/>
+      <parameter type-id='type-id-464' name='sans'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-461' size-in-bits='64' id='type-id-1068'/>
+    <pointer-type-def type-id='type-id-464' size-in-bits='64' id='type-id-1077'/>
     <function-decl name='gnutls_subject_alt_names_init' mangled-name='gnutls_subject_alt_names_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_subject_alt_names_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1068' name='sans'/>
+      <parameter type-id='type-id-1077' name='sans'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_write_general_name' mangled-name='_gnutls_write_general_name' visibility='default' binding='global' size-in-bits='64'>
@@ -17069,19 +17173,19 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='email-verify.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='email-verify.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_crt_check_email' mangled-name='gnutls_x509_crt_check_email' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_check_email@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <parameter type-id='type-id-27' name='email'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pkcs7-output.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs7-output.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_pkcs7_print' mangled-name='gnutls_pkcs7_print' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs7_print@@GNUTLS_3_4'>
-      <parameter type-id='type-id-995' name='pkcs7'/>
-      <parameter type-id='type-id-978' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-1004' name='pkcs7'/>
+      <parameter type-id='type-id-987' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_get_crt_count' mangled-name='gnutls_pkcs7_get_crt_count' visibility='default' binding='global' size-in-bits='64'>
@@ -17112,12 +17216,12 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='virt-san.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='virt-san.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_othername_to_virtual' mangled-name='gnutls_x509_othername_to_virtual' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_othername_to_virtual@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-57' name='othername'/>
-      <parameter type-id='type-id-419' name='virt_type'/>
-      <parameter type-id='type-id-275' name='virt'/>
+      <parameter type-id='type-id-422' name='virt_type'/>
+      <parameter type-id='type-id-278' name='virt'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_krb5_der_to_principal' mangled-name='_gnutls_krb5_der_to_principal' visibility='default' binding='global' size-in-bits='64'>
@@ -17130,80 +17234,80 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='spki.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='spki.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_spki_get_rsa_pss_params' mangled-name='gnutls_x509_spki_get_rsa_pss_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_spki_get_rsa_pss_params@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-757' name='spki'/>
-      <parameter type-id='type-id-431' name='dig'/>
-      <parameter type-id='type-id-419' name='salt_size'/>
+      <parameter type-id='type-id-760' name='spki'/>
+      <parameter type-id='type-id-434' name='dig'/>
+      <parameter type-id='type-id-422' name='salt_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_spki_set_rsa_pss_params' mangled-name='gnutls_x509_spki_set_rsa_pss_params' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_spki_set_rsa_pss_params@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-757' name='spki'/>
-      <parameter type-id='type-id-211' name='dig'/>
+      <parameter type-id='type-id-760' name='spki'/>
+      <parameter type-id='type-id-212' name='dig'/>
       <parameter type-id='type-id-10' name='salt_size'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_spki_deinit' mangled-name='gnutls_x509_spki_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_spki_deinit@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-757' name='spki'/>
+      <parameter type-id='type-id-760' name='spki'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-757' size-in-bits='64' id='type-id-1069'/>
+    <pointer-type-def type-id='type-id-760' size-in-bits='64' id='type-id-1078'/>
     <function-decl name='gnutls_x509_spki_init' mangled-name='gnutls_x509_spki_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_spki_init@@GNUTLS_3_6_0'>
-      <parameter type-id='type-id-1069' name='spki'/>
+      <parameter type-id='type-id-1078' name='spki'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls_features.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls_features.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_tlsfeatures_check_crt' mangled-name='gnutls_x509_tlsfeatures_check_crt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_tlsfeatures_check_crt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-973' name='feat'/>
-      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-982' name='feat'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_set_tlsfeatures' mangled-name='gnutls_x509_crt_set_tlsfeatures' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_set_tlsfeatures@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-973' name='features'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-982' name='features'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_get_tlsfeatures' mangled-name='gnutls_x509_crt_get_tlsfeatures' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_crt_get_tlsfeatures@@GNUTLS_3_4'>
-      <parameter type-id='type-id-467' name='crt'/>
-      <parameter type-id='type-id-973' name='features'/>
+      <parameter type-id='type-id-470' name='crt'/>
+      <parameter type-id='type-id-982' name='features'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-422' name='critical'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_tlsfeatures_get' mangled-name='gnutls_x509_tlsfeatures_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_tlsfeatures_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-973' name='f'/>
+      <parameter type-id='type-id-982' name='f'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-419' name='feature'/>
+      <parameter type-id='type-id-422' name='feature'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_x509_tlsfeatures_deinit' mangled-name='gnutls_x509_tlsfeatures_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_tlsfeatures_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-973' name='f'/>
+      <parameter type-id='type-id-982' name='f'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-973' size-in-bits='64' id='type-id-1070'/>
+    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-1079'/>
     <function-decl name='gnutls_x509_tlsfeatures_init' mangled-name='gnutls_x509_tlsfeatures_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_tlsfeatures_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1070' name='f'/>
+      <parameter type-id='type-id-1079' name='f'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ip.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ip.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
     <function-decl name='gnutls_x509_cidr_to_rfc5280' mangled-name='gnutls_x509_cidr_to_rfc5280' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_x509_cidr_to_rfc5280@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='cidr'/>
-      <parameter type-id='type-id-275' name='cidr_rfc5280'/>
+      <parameter type-id='type-id-278' name='cidr_rfc5280'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_cidr_to_string' mangled-name='_gnutls_cidr_to_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_cidr_to_string@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-101' name='_ip'/>
       <parameter type-id='type-id-10' name='ip_size'/>
-      <parameter type-id='type-id-376' name='out'/>
+      <parameter type-id='type-id-379' name='out'/>
       <parameter type-id='type-id-10' name='out_size'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='_gnutls_ip_to_string' mangled-name='_gnutls_ip_to_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_ip_to_string@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-101' name='_ip'/>
       <parameter type-id='type-id-10' name='ip_size'/>
-      <parameter type-id='type-id-376' name='out'/>
+      <parameter type-id='type-id-379' name='out'/>
       <parameter type-id='type-id-10' name='out_size'/>
       <return type-id='type-id-27'/>
     </function-decl>
@@ -17211,16 +17315,16 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ocsp.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
-    <class-decl name='gnutls_ocsp_resp_int' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-1071'>
+  <abi-instr version='1.0' address-size='64' path='ocsp.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
+    <class-decl name='gnutls_ocsp_resp_int' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-1080'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='resp' type-id='type-id-387' visibility='default'/>
+        <var-decl name='resp' type-id='type-id-390' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='response_type_oid' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='basicresp' type-id='type-id-387' visibility='default'/>
+        <var-decl name='basicresp' type-id='type-id-390' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='der' type-id='type-id-62' visibility='default'/>
@@ -17229,268 +17333,238 @@
         <var-decl name='init' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-1072'/>
-    <typedef-decl name='gnutls_ocsp_resp_t' type-id='type-id-1072' id='type-id-1073'/>
-    <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-1074'/>
-    <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-1075'/>
+    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1081'/>
+    <typedef-decl name='gnutls_ocsp_resp_t' type-id='type-id-1081' id='type-id-1082'/>
+    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-1083'/>
+    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-1084'/>
     <function-decl name='gnutls_ocsp_resp_list_import2' mangled-name='gnutls_ocsp_resp_list_import2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_list_import2@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-1075' name='ocsps'/>
-      <parameter type-id='type-id-419' name='size'/>
+      <parameter type-id='type-id-1084' name='ocsps'/>
+      <parameter type-id='type-id-422' name='size'/>
       <parameter type-id='type-id-57' name='resp_data'/>
-      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-424' name='format'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-1071' const='yes' id='type-id-1076'/>
-    <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-1077'/>
-    <typedef-decl name='gnutls_ocsp_resp_const_t' type-id='type-id-1077' id='type-id-1078'/>
-    <class-decl name='gnutls_x509_trust_list_st' size-in-bits='576' is-struct='yes' visibility='default' id='type-id-1079'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='size' type-id='type-id-10' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='node' type-id='type-id-457' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='x509_rdn_sequence' type-id='type-id-62' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='blacklisted' type-id='type-id-1080' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='blacklisted_size' type-id='type-id-10' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='keep_certs' type-id='type-id-1080' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='keep_certs_size' type-id='type-id-10' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='pkcs11_token' type-id='type-id-376' visibility='default'/>
-      </data-member>
-    </class-decl>
-    <pointer-type-def type-id='type-id-869' size-in-bits='64' id='type-id-1080'/>
-    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-1081'/>
-    <typedef-decl name='gnutls_x509_trust_list_t' type-id='type-id-1081' id='type-id-1082'/>
+    <qualified-type-def type-id='type-id-1080' const='yes' id='type-id-1085'/>
+    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-1086'/>
+    <typedef-decl name='gnutls_ocsp_resp_const_t' type-id='type-id-1086' id='type-id-1087'/>
     <function-decl name='gnutls_ocsp_resp_verify' mangled-name='gnutls_ocsp_resp_verify' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_verify@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
-      <parameter type-id='type-id-1082' name='trustlist'/>
-      <parameter type-id='type-id-419' name='verify'/>
+      <parameter type-id='type-id-1087' name='resp'/>
+      <parameter type-id='type-id-438' name='trustlist'/>
+      <parameter type-id='type-id-422' name='verify'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_verify_direct' mangled-name='gnutls_ocsp_resp_verify_direct' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_verify_direct@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
-      <parameter type-id='type-id-869' name='issuer'/>
-      <parameter type-id='type-id-419' name='verify'/>
+      <parameter type-id='type-id-1087' name='resp'/>
+      <parameter type-id='type-id-470' name='issuer'/>
+      <parameter type-id='type-id-422' name='verify'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1083'/>
     <function-decl name='gnutls_ocsp_resp_get_certs' mangled-name='gnutls_ocsp_resp_get_certs' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_get_certs@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
-      <parameter type-id='type-id-1083' name='certs'/>
-      <parameter type-id='type-id-422' name='ncerts'/>
+      <parameter type-id='type-id-1087' name='resp'/>
+      <parameter type-id='type-id-736' name='certs'/>
+      <parameter type-id='type-id-425' name='ncerts'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_get_signature_algorithm' mangled-name='gnutls_ocsp_resp_get_signature_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_get_signature_algorithm@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
+      <parameter type-id='type-id-1087' name='resp'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_get_nonce' mangled-name='gnutls_ocsp_resp_get_nonce' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_get_nonce@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
-      <parameter type-id='type-id-419' name='critical'/>
-      <parameter type-id='type-id-275' name='nonce'/>
+      <parameter type-id='type-id-1087' name='resp'/>
+      <parameter type-id='type-id-422' name='critical'/>
+      <parameter type-id='type-id-278' name='nonce'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_get_extension' mangled-name='gnutls_ocsp_resp_get_extension' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_get_extension@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
+      <parameter type-id='type-id-1087' name='resp'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='oid'/>
-      <parameter type-id='type-id-419' name='critical'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-278' name='oid'/>
+      <parameter type-id='type-id-422' name='critical'/>
+      <parameter type-id='type-id-278' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_get_single' mangled-name='gnutls_ocsp_resp_get_single' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_get_single@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
+      <parameter type-id='type-id-1087' name='resp'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-431' name='digest'/>
-      <parameter type-id='type-id-275' name='issuer_name_hash'/>
-      <parameter type-id='type-id-275' name='issuer_key_hash'/>
-      <parameter type-id='type-id-275' name='serial_number'/>
-      <parameter type-id='type-id-419' name='cert_status'/>
-      <parameter type-id='type-id-514' name='this_update'/>
-      <parameter type-id='type-id-514' name='next_update'/>
-      <parameter type-id='type-id-514' name='revocation_time'/>
-      <parameter type-id='type-id-419' name='revocation_reason'/>
+      <parameter type-id='type-id-434' name='digest'/>
+      <parameter type-id='type-id-278' name='issuer_name_hash'/>
+      <parameter type-id='type-id-278' name='issuer_key_hash'/>
+      <parameter type-id='type-id-278' name='serial_number'/>
+      <parameter type-id='type-id-422' name='cert_status'/>
+      <parameter type-id='type-id-517' name='this_update'/>
+      <parameter type-id='type-id-517' name='next_update'/>
+      <parameter type-id='type-id-517' name='revocation_time'/>
+      <parameter type-id='type-id-422' name='revocation_reason'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_check_crt' mangled-name='gnutls_ocsp_resp_check_crt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_check_crt@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
+      <parameter type-id='type-id-1087' name='resp'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-869' name='crt'/>
+      <parameter type-id='type-id-470' name='crt'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_get_produced' mangled-name='gnutls_ocsp_resp_get_produced' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_get_produced@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
+      <parameter type-id='type-id-1087' name='resp'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_get_responder_raw_id' mangled-name='gnutls_ocsp_resp_get_responder_raw_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_get_responder_raw_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
+      <parameter type-id='type-id-1087' name='resp'/>
       <parameter type-id='type-id-10' name='type'/>
-      <parameter type-id='type-id-275' name='raw'/>
+      <parameter type-id='type-id-278' name='raw'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_get_responder' mangled-name='gnutls_ocsp_resp_get_responder' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_get_responder@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
-      <parameter type-id='type-id-275' name='dn'/>
+      <parameter type-id='type-id-1087' name='resp'/>
+      <parameter type-id='type-id-278' name='dn'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_get_version' mangled-name='gnutls_ocsp_resp_get_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_get_version@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
+      <parameter type-id='type-id-1087' name='resp'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_get_response' mangled-name='gnutls_ocsp_resp_get_response' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_get_response@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
-      <parameter type-id='type-id-275' name='response_type_oid'/>
-      <parameter type-id='type-id-275' name='response'/>
+      <parameter type-id='type-id-1087' name='resp'/>
+      <parameter type-id='type-id-278' name='response_type_oid'/>
+      <parameter type-id='type-id-278' name='response'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_get_status' mangled-name='gnutls_ocsp_resp_get_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_get_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
+      <parameter type-id='type-id-1087' name='resp'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='gnutls_ocsp_req_int' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1084'>
+    <class-decl name='gnutls_ocsp_req_int' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1088'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='req' type-id='type-id-387' visibility='default'/>
+        <var-decl name='req' type-id='type-id-390' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='init' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-1085'/>
-    <typedef-decl name='gnutls_ocsp_req_t' type-id='type-id-1085' id='type-id-1086'/>
+    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-1089'/>
+    <typedef-decl name='gnutls_ocsp_req_t' type-id='type-id-1089' id='type-id-1090'/>
     <function-decl name='gnutls_ocsp_req_randomize_nonce' mangled-name='gnutls_ocsp_req_randomize_nonce' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_randomize_nonce@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1086' name='req'/>
+      <parameter type-id='type-id-1090' name='req'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_req_set_nonce' mangled-name='gnutls_ocsp_req_set_nonce' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_set_nonce@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1086' name='req'/>
+      <parameter type-id='type-id-1090' name='req'/>
       <parameter type-id='type-id-10' name='critical'/>
       <parameter type-id='type-id-57' name='nonce'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-1084' const='yes' id='type-id-1087'/>
-    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-1088'/>
-    <typedef-decl name='gnutls_ocsp_req_const_t' type-id='type-id-1088' id='type-id-1089'/>
+    <qualified-type-def type-id='type-id-1088' const='yes' id='type-id-1091'/>
+    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-1092'/>
+    <typedef-decl name='gnutls_ocsp_req_const_t' type-id='type-id-1092' id='type-id-1093'/>
     <function-decl name='gnutls_ocsp_req_get_nonce' mangled-name='gnutls_ocsp_req_get_nonce' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_get_nonce@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1089' name='req'/>
-      <parameter type-id='type-id-419' name='critical'/>
-      <parameter type-id='type-id-275' name='nonce'/>
+      <parameter type-id='type-id-1093' name='req'/>
+      <parameter type-id='type-id-422' name='critical'/>
+      <parameter type-id='type-id-278' name='nonce'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_req_set_extension' mangled-name='gnutls_ocsp_req_set_extension' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_set_extension@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1086' name='req'/>
+      <parameter type-id='type-id-1090' name='req'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='critical'/>
       <parameter type-id='type-id-57' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_req_get_extension' mangled-name='gnutls_ocsp_req_get_extension' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_get_extension@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1089' name='req'/>
+      <parameter type-id='type-id-1093' name='req'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-275' name='oid'/>
-      <parameter type-id='type-id-419' name='critical'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-278' name='oid'/>
+      <parameter type-id='type-id-422' name='critical'/>
+      <parameter type-id='type-id-278' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_req_add_cert' mangled-name='gnutls_ocsp_req_add_cert' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_add_cert@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1086' name='req'/>
-      <parameter type-id='type-id-211' name='digest'/>
-      <parameter type-id='type-id-869' name='issuer'/>
-      <parameter type-id='type-id-869' name='cert'/>
+      <parameter type-id='type-id-1090' name='req'/>
+      <parameter type-id='type-id-212' name='digest'/>
+      <parameter type-id='type-id-470' name='issuer'/>
+      <parameter type-id='type-id-470' name='cert'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_req_add_cert_id' mangled-name='gnutls_ocsp_req_add_cert_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_add_cert_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1086' name='req'/>
-      <parameter type-id='type-id-211' name='digest'/>
+      <parameter type-id='type-id-1090' name='req'/>
+      <parameter type-id='type-id-212' name='digest'/>
       <parameter type-id='type-id-57' name='issuer_name_hash'/>
       <parameter type-id='type-id-57' name='issuer_key_hash'/>
       <parameter type-id='type-id-57' name='serial_number'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_req_get_cert_id' mangled-name='gnutls_ocsp_req_get_cert_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_get_cert_id@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1089' name='req'/>
+      <parameter type-id='type-id-1093' name='req'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-431' name='digest'/>
-      <parameter type-id='type-id-275' name='issuer_name_hash'/>
-      <parameter type-id='type-id-275' name='issuer_key_hash'/>
-      <parameter type-id='type-id-275' name='serial_number'/>
+      <parameter type-id='type-id-434' name='digest'/>
+      <parameter type-id='type-id-278' name='issuer_name_hash'/>
+      <parameter type-id='type-id-278' name='issuer_key_hash'/>
+      <parameter type-id='type-id-278' name='serial_number'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_req_get_version' mangled-name='gnutls_ocsp_req_get_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_get_version@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1089' name='req'/>
+      <parameter type-id='type-id-1093' name='req'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_export2' mangled-name='gnutls_ocsp_resp_export2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_export2@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-1078' name='resp'/>
-      <parameter type-id='type-id-275' name='data'/>
-      <parameter type-id='type-id-421' name='fmt'/>
+      <parameter type-id='type-id-1087' name='resp'/>
+      <parameter type-id='type-id-278' name='data'/>
+      <parameter type-id='type-id-424' name='fmt'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_export' mangled-name='gnutls_ocsp_resp_export' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_export@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-1087' name='resp'/>
+      <parameter type-id='type-id-278' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_req_export' mangled-name='gnutls_ocsp_req_export' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_export@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1089' name='req'/>
-      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-1093' name='req'/>
+      <parameter type-id='type-id-278' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_import2' mangled-name='gnutls_ocsp_resp_import2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_import2@@GNUTLS_3_6_3'>
-      <parameter type-id='type-id-1073' name='resp'/>
+      <parameter type-id='type-id-1082' name='resp'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-421' name='fmt'/>
+      <parameter type-id='type-id-424' name='fmt'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_import' mangled-name='gnutls_ocsp_resp_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1073' name='resp'/>
+      <parameter type-id='type-id-1082' name='resp'/>
       <parameter type-id='type-id-57' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_req_import' mangled-name='gnutls_ocsp_req_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_import@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1086' name='req'/>
+      <parameter type-id='type-id-1090' name='req'/>
       <parameter type-id='type-id-57' name='data'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_deinit' mangled-name='gnutls_ocsp_resp_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1073' name='resp'/>
+      <parameter type-id='type-id-1082' name='resp'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_init' mangled-name='gnutls_ocsp_resp_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1074' name='resp'/>
+      <parameter type-id='type-id-1083' name='resp'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_req_deinit' mangled-name='gnutls_ocsp_req_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_deinit@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1086' name='req'/>
+      <parameter type-id='type-id-1090' name='req'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1090'/>
+    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-1094'/>
     <function-decl name='gnutls_ocsp_req_init' mangled-name='gnutls_ocsp_req_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_init@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1090' name='req'/>
+      <parameter type-id='type-id-1094' name='req'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_get_responder2' mangled-name='gnutls_ocsp_resp_get_responder2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_get_responder2@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
-      <parameter type-id='type-id-275' name='dn'/>
+      <parameter type-id='type-id-1087' name='resp'/>
+      <parameter type-id='type-id-278' name='dn'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_get_signature' mangled-name='gnutls_ocsp_resp_get_signature' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_get_signature@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
-      <parameter type-id='type-id-275' name='sig'/>
+      <parameter type-id='type-id-1087' name='resp'/>
+      <parameter type-id='type-id-278' name='sig'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_trustlist_inlist' mangled-name='_gnutls_trustlist_inlist' visibility='default' binding='global' size-in-bits='64'>
@@ -17509,23 +17583,23 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ocsp_output.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
-    <enum-decl name='gnutls_ocsp_print_formats_t' id='type-id-1091'>
+  <abi-instr version='1.0' address-size='64' path='ocsp_output.c' comp-dir-path='/root/gnutls/lib/x509' language='LANG_C99'>
+    <enum-decl name='gnutls_ocsp_print_formats_t' id='type-id-1095'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_OCSP_PRINT_FULL' value='0'/>
       <enumerator name='GNUTLS_OCSP_PRINT_COMPACT' value='1'/>
     </enum-decl>
-    <typedef-decl name='gnutls_ocsp_print_formats_t' type-id='type-id-1091' id='type-id-1092'/>
+    <typedef-decl name='gnutls_ocsp_print_formats_t' type-id='type-id-1095' id='type-id-1096'/>
     <function-decl name='gnutls_ocsp_resp_print' mangled-name='gnutls_ocsp_resp_print' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_resp_print@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1078' name='resp'/>
-      <parameter type-id='type-id-1092' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-1087' name='resp'/>
+      <parameter type-id='type-id-1096' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_req_print' mangled-name='gnutls_ocsp_req_print' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_req_print@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1089' name='req'/>
-      <parameter type-id='type-id-1092' name='format'/>
-      <parameter type-id='type-id-275' name='out'/>
+      <parameter type-id='type-id-1093' name='req'/>
+      <parameter type-id='type-id-1096' name='format'/>
+      <parameter type-id='type-id-278' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_get_response' mangled-name='gnutls_ocsp_resp_get_response' visibility='default' binding='global' size-in-bits='64'>
@@ -17577,51 +17651,51 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='max_record.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <typedef-decl name='hello_ext_entry_st' type-id='type-id-296' id='type-id-1093'/>
-    <qualified-type-def type-id='type-id-1093' const='yes' id='type-id-1094'/>
-    <var-decl name='ext_mod_max_record_size' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='max_record.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <typedef-decl name='hello_ext_entry_st' type-id='type-id-299' id='type-id-1097'/>
+    <qualified-type-def type-id='type-id-1097' const='yes' id='type-id-1098'/>
+    <var-decl name='ext_mod_max_record_size' type-id='type-id-1098' visibility='default'/>
     <function-decl name='gnutls_record_set_max_recv_size' mangled-name='gnutls_record_set_max_recv_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_set_max_recv_size@@GNUTLS_3_6_8'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-99' name='size'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_set_max_size' mangled-name='gnutls_record_set_max_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_set_max_size@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-99' name='size'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='gnutls_record_get_max_size' mangled-name='gnutls_record_get_max_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_get_max_size@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-99'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='server_name.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_server_name' type-id='type-id-1094' visibility='default'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1095'>
+  <abi-instr version='1.0' address-size='64' path='server_name.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_server_name' type-id='type-id-1098' visibility='default'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1099'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_NAME_DNS' value='1'/>
     </enum-decl>
-    <typedef-decl name='gnutls_server_name_type_t' type-id='type-id-1095' id='type-id-1096'/>
+    <typedef-decl name='gnutls_server_name_type_t' type-id='type-id-1099' id='type-id-1100'/>
     <function-decl name='gnutls_server_name_set' mangled-name='gnutls_server_name_set' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_server_name_set@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-1096' name='type'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-1100' name='type'/>
       <parameter type-id='type-id-101' name='name'/>
       <parameter type-id='type-id-99' name='name_length'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_server_name_set_raw' mangled-name='_gnutls_server_name_set_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_server_name_set_raw@@GNUTLS_PRIVATE_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-1096' name='type'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-1100' name='type'/>
       <parameter type-id='type-id-101' name='name'/>
       <parameter type-id='type-id-99' name='name_length'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_server_name_get' mangled-name='gnutls_server_name_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_server_name_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-101' name='data'/>
-      <parameter type-id='type-id-422' name='data_length'/>
-      <parameter type-id='type-id-419' name='type'/>
+      <parameter type-id='type-id-425' name='data_length'/>
+      <parameter type-id='type-id-422' name='type'/>
       <parameter type-id='type-id-10' name='indx'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -17638,21 +17712,21 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='signature.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_sig' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='signature.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_sig' type-id='type-id-1098' visibility='default'/>
     <function-decl name='gnutls_sign_algorithm_get_client' mangled-name='gnutls_sign_algorithm_get_client' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sign_algorithm_get_client@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_sign_algorithm_get' mangled-name='gnutls_sign_algorithm_get' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sign_algorithm_get@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-1097'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-1101'/>
     <function-decl name='gnutls_sign_algorithm_get_requested' mangled-name='gnutls_sign_algorithm_get_requested' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sign_algorithm_get_requested@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-416' name='session'/>
       <parameter type-id='type-id-99' name='indx'/>
-      <parameter type-id='type-id-1097' name='algo'/>
+      <parameter type-id='type-id-1101' name='algo'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_privkey_compatible_with_sig' mangled-name='_gnutls_privkey_compatible_with_sig' visibility='default' binding='global' size-in-bits='64'>
@@ -17662,26 +17736,26 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='safe_renegotiation.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_sr' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='safe_renegotiation.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_sr' type-id='type-id-1098' visibility='default'/>
     <function-decl name='gnutls_safe_renegotiation_status' mangled-name='gnutls_safe_renegotiation_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_safe_renegotiation_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='session_ticket.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_session_ticket' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='session_ticket.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_session_ticket' type-id='type-id-1098' visibility='default'/>
     <function-decl name='gnutls_session_ticket_enable_server' mangled-name='gnutls_session_ticket_enable_server' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_ticket_enable_server@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-57' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_ticket_enable_client' mangled-name='gnutls_session_ticket_enable_client' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_ticket_enable_client@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_session_ticket_key_generate' mangled-name='gnutls_session_ticket_key_generate' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_ticket_key_generate@@GNUTLS_3_4'>
-      <parameter type-id='type-id-275' name='key'/>
+      <parameter type-id='type-id-278' name='key'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_epoch_set_keys' mangled-name='_gnutls_epoch_set_keys' visibility='default' binding='global' size-in-bits='64'>
@@ -17700,81 +17774,81 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='srp.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_srp' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='srp.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_srp' type-id='type-id-1098' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='heartbeat.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_heartbeat' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='heartbeat.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_heartbeat' type-id='type-id-1098' visibility='default'/>
     <function-decl name='gnutls_heartbeat_set_timeouts' mangled-name='gnutls_heartbeat_set_timeouts' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_heartbeat_set_timeouts@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='retrans_timeout'/>
       <parameter type-id='type-id-10' name='total_timeout'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_heartbeat_get_timeout' mangled-name='gnutls_heartbeat_get_timeout' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_heartbeat_get_timeout@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_heartbeat_pong' mangled-name='gnutls_heartbeat_pong' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_heartbeat_pong@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_heartbeat_ping' mangled-name='gnutls_heartbeat_ping' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_heartbeat_ping@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-99' name='data_size'/>
       <parameter type-id='type-id-10' name='max_tries'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_heartbeat_enable' mangled-name='gnutls_heartbeat_enable' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_heartbeat_enable@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='type'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_heartbeat_allowed' mangled-name='gnutls_heartbeat_allowed' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_heartbeat_allowed@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-10' name='type'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='status_request.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_status_request' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='status_request.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_status_request' type-id='type-id-1098' visibility='default'/>
     <function-decl name='gnutls_ocsp_status_request_enable_client' mangled-name='gnutls_ocsp_status_request_enable_client' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ocsp_status_request_enable_client@@GNUTLS_3_4'>
-      <parameter type-id='type-id-413' name='session'/>
-      <parameter type-id='type-id-275' name='responder_id'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-278' name='responder_id'/>
       <parameter type-id='type-id-99' name='responder_id_size'/>
-      <parameter type-id='type-id-275' name='extensions'/>
+      <parameter type-id='type-id-278' name='extensions'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dumbfw.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_dumbfw' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='dumbfw.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_dumbfw' type-id='type-id-1098' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ext_master_secret.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_ext_master_secret' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='ext_master_secret.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_ext_master_secret' type-id='type-id-1098' visibility='default'/>
     <function-decl name='gnutls_session_ext_master_secret_status' mangled-name='gnutls_session_ext_master_secret_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_ext_master_secret_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='etm.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_etm' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='etm.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_etm' type-id='type-id-1098' visibility='default'/>
     <function-decl name='gnutls_session_etm_status' mangled-name='gnutls_session_etm_status' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_session_etm_status@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='supported_versions.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_supported_versions' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='supported_versions.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_supported_versions' type-id='type-id-1098' visibility='default'/>
     <function-decl name='_gnutls_write_supported_versions' mangled-name='_gnutls_write_supported_versions' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='post_handshake.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_post_handshake' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='post_handshake.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_post_handshake' type-id='type-id-1098' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='key_share.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='key_share.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
     <function-decl name='_gnutls_buffer_append_fixed_mpi' mangled-name='_gnutls_buffer_append_fixed_mpi' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -17785,17 +17859,14 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cookie.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_cookie' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='cookie.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_cookie' type-id='type-id-1098' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='psk_ke_modes.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_psk_ke_modes' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='psk_ke_modes.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_psk_ke_modes' type-id='type-id-1098' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pre_shared_key.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_pre_shared_key' type-id='type-id-1094' visibility='default'/>
-    <function-decl name='_gnutls_psk_pwd_find_entry' mangled-name='_gnutls_psk_pwd_find_entry' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
+  <abi-instr version='1.0' address-size='64' path='pre_shared_key.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_pre_shared_key' type-id='type-id-1098' visibility='default'/>
     <function-decl name='_gnutls13_psk_ext_parser_init' mangled-name='_gnutls13_psk_ext_parser_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -17811,6 +17882,9 @@
     <function-decl name='_gnutls_ext_get_full_client_hello' mangled-name='_gnutls_ext_get_full_client_hello' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='_gnutls_psk_pwd_find_entry' mangled-name='_gnutls_psk_pwd_find_entry' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_anti_replay_check' mangled-name='_gnutls_anti_replay_check' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -17821,32 +17895,32 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='supported_groups.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_supported_groups' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='supported_groups.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_supported_groups' type-id='type-id-1098' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ec_point_formats.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_supported_ec_point_formats' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='ec_point_formats.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_supported_ec_point_formats' type-id='type-id-1098' visibility='default'/>
     <function-decl name='_gnutls_session_is_ecc' mangled-name='_gnutls_session_is_ecc' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='early_data.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_early_data' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='early_data.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_early_data' type-id='type-id-1098' visibility='default'/>
     <function-decl name='gnutls_record_set_max_early_data_size' mangled-name='gnutls_record_set_max_early_data_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_set_max_early_data_size@@GNUTLS_3_6_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-99' name='size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_record_get_max_early_data_size' mangled-name='gnutls_record_get_max_early_data_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_record_get_max_early_data_size@@GNUTLS_3_6_5'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <return type-id='type-id-99'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='record_size_limit.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_record_size_limit' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='record_size_limit.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_record_size_limit' type-id='type-id-1098' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='client_cert_type.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_client_cert_type' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='client_cert_type.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_client_cert_type' type-id='type-id-1098' visibility='default'/>
     <function-decl name='_gnutls_session_cert_type_supported' mangled-name='_gnutls_session_cert_type_supported' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -17854,88 +17928,88 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='server_cert_type.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_server_cert_type' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='server_cert_type.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_server_cert_type' type-id='type-id-1098' visibility='default'/>
     <function-decl name='_gnutls_session_server_cert_type_set' mangled-name='_gnutls_session_server_cert_type_set' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='alpn.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_alpn' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='alpn.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_alpn' type-id='type-id-1098' visibility='default'/>
     <function-decl name='gnutls_alpn_set_protocols' mangled-name='gnutls_alpn_set_protocols' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_alpn_set_protocols@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-57' name='protocols'/>
       <parameter type-id='type-id-10' name='protocols_size'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_alpn_get_selected_protocol' mangled-name='gnutls_alpn_get_selected_protocol' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_alpn_get_selected_protocol@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-275' name='protocol'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-278' name='protocol'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='srtp.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_srtp' type-id='type-id-1094' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='srtp.c' comp-dir-path='/root/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_srtp' type-id='type-id-1098' visibility='default'/>
     <function-decl name='gnutls_srtp_get_keys' mangled-name='gnutls_srtp_get_keys' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srtp_get_keys@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-101' name='key_material'/>
       <parameter type-id='type-id-10' name='key_material_size'/>
-      <parameter type-id='type-id-275' name='client_key'/>
-      <parameter type-id='type-id-275' name='client_salt'/>
-      <parameter type-id='type-id-275' name='server_key'/>
-      <parameter type-id='type-id-275' name='server_salt'/>
+      <parameter type-id='type-id-278' name='client_key'/>
+      <parameter type-id='type-id-278' name='client_salt'/>
+      <parameter type-id='type-id-278' name='server_key'/>
+      <parameter type-id='type-id-278' name='server_salt'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srtp_set_profile_direct' mangled-name='gnutls_srtp_set_profile_direct' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srtp_set_profile_direct@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-27' name='profiles'/>
-      <parameter type-id='type-id-426' name='err_pos'/>
+      <parameter type-id='type-id-429' name='err_pos'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1098'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1102'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_SRTP_AES128_CM_HMAC_SHA1_80' value='1'/>
       <enumerator name='GNUTLS_SRTP_AES128_CM_HMAC_SHA1_32' value='2'/>
       <enumerator name='GNUTLS_SRTP_NULL_HMAC_SHA1_80' value='5'/>
       <enumerator name='GNUTLS_SRTP_NULL_HMAC_SHA1_32' value='6'/>
     </enum-decl>
-    <typedef-decl name='gnutls_srtp_profile_t' type-id='type-id-1098' id='type-id-1099'/>
+    <typedef-decl name='gnutls_srtp_profile_t' type-id='type-id-1102' id='type-id-1103'/>
     <function-decl name='gnutls_srtp_set_profile' mangled-name='gnutls_srtp_set_profile' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srtp_set_profile@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-1099' name='profile'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-1103' name='profile'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srtp_set_mki' mangled-name='gnutls_srtp_set_mki' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srtp_set_mki@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-237' name='session'/>
       <parameter type-id='type-id-57' name='mki'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srtp_get_mki' mangled-name='gnutls_srtp_get_mki' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srtp_get_mki@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-275' name='mki'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-278' name='mki'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srtp_get_profile_name' mangled-name='gnutls_srtp_get_profile_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srtp_get_profile_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-1099' name='profile'/>
+      <parameter type-id='type-id-1103' name='profile'/>
       <return type-id='type-id-27'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-1100'/>
+    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-1104'/>
     <function-decl name='gnutls_srtp_get_profile_id' mangled-name='gnutls_srtp_get_profile_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srtp_get_profile_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='name'/>
-      <parameter type-id='type-id-1100' name='profile'/>
+      <parameter type-id='type-id-1104' name='profile'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srtp_get_selected_profile' mangled-name='gnutls_srtp_get_selected_profile' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srtp_get_selected_profile@@GNUTLS_3_4'>
-      <parameter type-id='type-id-236' name='session'/>
-      <parameter type-id='type-id-1100' name='profile'/>
+      <parameter type-id='type-id-237' name='session'/>
+      <parameter type-id='type-id-1104' name='profile'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_prf' mangled-name='gnutls_prf' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='anon.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='anon.c' comp-dir-path='/root/gnutls/lib/auth' language='LANG_C99'>
     <function-decl name='_gnutls_proc_dh_common_client_kx' mangled-name='_gnutls_proc_dh_common_client_kx' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -17949,7 +18023,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cert.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cert.c' comp-dir-path='/root/gnutls/lib/auth' language='LANG_C99'>
     <function-decl name='_gnutls_handshake_verify_data' mangled-name='_gnutls_handshake_verify_data' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -17987,7 +18061,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dh_common.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dh_common.c' comp-dir-path='/root/gnutls/lib/auth' language='LANG_C99'>
     <function-decl name='_gnutls_dh_set_secret_bits' mangled-name='_gnutls_dh_set_secret_bits' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18001,7 +18075,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dhe.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dhe.c' comp-dir-path='/root/gnutls/lib/auth' language='LANG_C99'>
     <function-decl name='_gnutls_proc_dhe_signature' mangled-name='_gnutls_proc_dhe_signature' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18009,12 +18083,12 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='rsa_psk.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='rsa_psk.c' comp-dir-path='/root/gnutls/lib/auth' language='LANG_C99'>
     <function-decl name='_gnutls_get_public_rsa_params' mangled-name='_gnutls_get_public_rsa_params' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dhe_psk.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dhe_psk.c' comp-dir-path='/root/gnutls/lib/auth' language='LANG_C99'>
     <function-decl name='_gnutls_proc_ecdh_common_server_kx' mangled-name='_gnutls_proc_ecdh_common_server_kx' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18031,7 +18105,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='srp_kx.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='srp_kx.c' comp-dir-path='/root/gnutls/lib/auth' language='LANG_C99'>
     <var-decl name='gnutls_srp_1024_group_prime' type-id='type-id-65' mangled-name='gnutls_srp_1024_group_prime' visibility='default' elf-symbol-id='gnutls_srp_1024_group_prime@@GNUTLS_3_4'/>
     <var-decl name='gnutls_srp_1024_group_generator' type-id='type-id-65' mangled-name='gnutls_srp_1024_group_generator' visibility='default' elf-symbol-id='gnutls_srp_1024_group_generator@@GNUTLS_3_4'/>
     <var-decl name='gnutls_srp_1536_group_prime' type-id='type-id-65' mangled-name='gnutls_srp_1536_group_prime' visibility='default' elf-symbol-id='gnutls_srp_1536_group_prime@@GNUTLS_3_4'/>
@@ -18072,12 +18146,12 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='srp_passwd.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='srp_passwd.c' comp-dir-path='/root/gnutls/lib/auth' language='LANG_C99'>
     <function-decl name='_gnutls_sbase64_decode' mangled-name='_gnutls_sbase64_decode' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='srp_rsa.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='srp_rsa.c' comp-dir-path='/root/gnutls/lib/auth' language='LANG_C99'>
     <function-decl name='_gnutls_proc_srp_server_kx' mangled-name='_gnutls_proc_srp_server_kx' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18085,31 +18159,31 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='srp_sb64.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='srp_sb64.c' comp-dir-path='/root/gnutls/lib/auth' language='LANG_C99'>
     <function-decl name='gnutls_srp_base64_decode2' mangled-name='gnutls_srp_base64_decode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_base64_decode2@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='b64_data'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-278' name='result'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srp_base64_decode' mangled-name='gnutls_srp_base64_decode' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_base64_decode@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='b64_data'/>
-      <parameter type-id='type-id-376' name='result'/>
-      <parameter type-id='type-id-422' name='result_size'/>
+      <parameter type-id='type-id-379' name='result'/>
+      <parameter type-id='type-id-425' name='result_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srp_base64_encode2' mangled-name='gnutls_srp_base64_encode2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_base64_encode2@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='b64_data'/>
-      <parameter type-id='type-id-275' name='result'/>
+      <parameter type-id='type-id-278' name='result'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_srp_base64_encode' mangled-name='gnutls_srp_base64_encode' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_base64_encode@@GNUTLS_3_4'>
       <parameter type-id='type-id-57' name='b64_data'/>
-      <parameter type-id='type-id-376' name='result'/>
-      <parameter type-id='type-id-422' name='result_size'/>
+      <parameter type-id='type-id-379' name='result'/>
+      <parameter type-id='type-id-425' name='result_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='vko_gost.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='vko_gost.c' comp-dir-path='/root/gnutls/lib/auth' language='LANG_C99'>
     <function-decl name='_gnutls_ecc_curve_get_group' mangled-name='_gnutls_ecc_curve_get_group' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18120,11 +18194,11 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cert_types.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-1101'/>
-    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-1102'/>
+  <abi-instr version='1.0' address-size='64' path='cert_types.c' comp-dir-path='/root/gnutls/lib/algorithms' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-1105'/>
+    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-1106'/>
     <function-decl name='gnutls_certificate_type_list' mangled-name='gnutls_certificate_type_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_type_list@@GNUTLS_3_4'>
-      <return type-id='type-id-1102'/>
+      <return type-id='type-id-1106'/>
     </function-decl>
     <function-decl name='gnutls_certificate_type_get_id' mangled-name='gnutls_certificate_type_get_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_certificate_type_get_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='name'/>
@@ -18135,11 +18209,11 @@
       <return type-id='type-id-27'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ciphers.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-29' const='yes' id='type-id-1103'/>
-    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-1104'/>
+  <abi-instr version='1.0' address-size='64' path='ciphers.c' comp-dir-path='/root/gnutls/lib/algorithms' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-29' const='yes' id='type-id-1107'/>
+    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-1108'/>
     <function-decl name='gnutls_cipher_list' mangled-name='gnutls_cipher_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_list@@GNUTLS_3_4'>
-      <return type-id='type-id-1104'/>
+      <return type-id='type-id-1108'/>
     </function-decl>
     <function-decl name='gnutls_cipher_get_id' mangled-name='gnutls_cipher_get_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_get_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='name'/>
@@ -18170,24 +18244,24 @@
       <return type-id='type-id-79'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ciphersuites.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ciphersuites.c' comp-dir-path='/root/gnutls/lib/algorithms' language='LANG_C99'>
     <function-decl name='gnutls_priority_get_cipher_suite_index' mangled-name='gnutls_priority_get_cipher_suite_index' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_priority_get_cipher_suite_index@@GNUTLS_3_4'>
-      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-427' name='pcache'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-419' name='sidx'/>
+      <parameter type-id='type-id-422' name='sidx'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-1105'/>
-    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-1106'/>
-    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-1107'/>
-    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-1108'/>
+    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-1109'/>
+    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-1110'/>
+    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-1111'/>
+    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-1112'/>
     <function-decl name='gnutls_cipher_suite_info' mangled-name='gnutls_cipher_suite_info' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_suite_info@@GNUTLS_3_4'>
       <parameter type-id='type-id-99' name='idx'/>
       <parameter type-id='type-id-64' name='cs_id'/>
-      <parameter type-id='type-id-1105' name='kx'/>
-      <parameter type-id='type-id-1106' name='cipher'/>
-      <parameter type-id='type-id-1107' name='mac'/>
-      <parameter type-id='type-id-1108' name='min_version'/>
+      <parameter type-id='type-id-1109' name='kx'/>
+      <parameter type-id='type-id-1110' name='cipher'/>
+      <parameter type-id='type-id-1111' name='mac'/>
+      <parameter type-id='type-id-1112' name='min_version'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_cipher_suite_get_name' mangled-name='gnutls_cipher_suite_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_suite_get_name@@GNUTLS_3_4'>
@@ -18206,7 +18280,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ecc.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ecc.c' comp-dir-path='/root/gnutls/lib/algorithms' language='LANG_C99'>
     <function-decl name='gnutls_ecc_curve_get_pk' mangled-name='gnutls_ecc_curve_get_pk' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ecc_curve_get_pk@@GNUTLS_3_4'>
       <parameter type-id='type-id-59' name='curve'/>
       <return type-id='type-id-60'/>
@@ -18235,17 +18309,17 @@
       <parameter type-id='type-id-59' name='curve'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-59' const='yes' id='type-id-1109'/>
-    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-1110'/>
+    <qualified-type-def type-id='type-id-59' const='yes' id='type-id-1113'/>
+    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-1114'/>
     <function-decl name='gnutls_ecc_curve_list' mangled-name='gnutls_ecc_curve_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_ecc_curve_list@@GNUTLS_3_4'>
-      <return type-id='type-id-1110'/>
+      <return type-id='type-id-1114'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='kx.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-1111'/>
-    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-1112'/>
+  <abi-instr version='1.0' address-size='64' path='kx.c' comp-dir-path='/root/gnutls/lib/algorithms' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-1115'/>
+    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-1116'/>
     <function-decl name='gnutls_kx_list' mangled-name='gnutls_kx_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_kx_list@@GNUTLS_3_4'>
-      <return type-id='type-id-1112'/>
+      <return type-id='type-id-1116'/>
     </function-decl>
     <function-decl name='gnutls_kx_get_id' mangled-name='gnutls_kx_get_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_kx_get_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='name'/>
@@ -18256,9 +18330,9 @@
       <return type-id='type-id-27'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='mac.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='mac.c' comp-dir-path='/root/gnutls/lib/algorithms' language='LANG_C99'>
     <function-decl name='gnutls_digest_get_oid' mangled-name='gnutls_digest_get_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_digest_get_oid@@GNUTLS_3_4'>
-      <parameter type-id='type-id-211' name='algorithm'/>
+      <parameter type-id='type-id-212' name='algorithm'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_oid_to_mac' mangled-name='gnutls_oid_to_mac' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_oid_to_mac@@GNUTLS_3_4'>
@@ -18267,17 +18341,17 @@
     </function-decl>
     <function-decl name='gnutls_oid_to_digest' mangled-name='gnutls_oid_to_digest' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_oid_to_digest@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='oid'/>
-      <return type-id='type-id-211'/>
+      <return type-id='type-id-212'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-211' const='yes' id='type-id-1113'/>
-    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-1114'/>
+    <qualified-type-def type-id='type-id-212' const='yes' id='type-id-1117'/>
+    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-1118'/>
     <function-decl name='gnutls_digest_list' mangled-name='gnutls_digest_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_digest_list@@GNUTLS_3_4'>
-      <return type-id='type-id-1114'/>
+      <return type-id='type-id-1118'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-1115'/>
-    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-1116'/>
+    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-1119'/>
+    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-1120'/>
     <function-decl name='gnutls_mac_list' mangled-name='gnutls_mac_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_mac_list@@GNUTLS_3_4'>
-      <return type-id='type-id-1116'/>
+      <return type-id='type-id-1120'/>
     </function-decl>
     <function-decl name='gnutls_mac_get_nonce_size' mangled-name='gnutls_mac_get_nonce_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_mac_get_nonce_size@@GNUTLS_3_4'>
       <parameter type-id='type-id-31' name='algorithm'/>
@@ -18293,10 +18367,10 @@
     </function-decl>
     <function-decl name='gnutls_digest_get_id' mangled-name='gnutls_digest_get_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_digest_get_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='name'/>
-      <return type-id='type-id-211'/>
+      <return type-id='type-id-212'/>
     </function-decl>
     <function-decl name='gnutls_digest_get_name' mangled-name='gnutls_digest_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_digest_get_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-211' name='algorithm'/>
+      <parameter type-id='type-id-212' name='algorithm'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_mac_get_name' mangled-name='gnutls_mac_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_mac_get_name@@GNUTLS_3_4'>
@@ -18308,11 +18382,11 @@
       <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='protocols.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-32' const='yes' id='type-id-1117'/>
-    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-1118'/>
+  <abi-instr version='1.0' address-size='64' path='protocols.c' comp-dir-path='/root/gnutls/lib/algorithms' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-32' const='yes' id='type-id-1121'/>
+    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-1122'/>
     <function-decl name='gnutls_protocol_list' mangled-name='gnutls_protocol_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_protocol_list@@GNUTLS_3_4'>
-      <return type-id='type-id-1118'/>
+      <return type-id='type-id-1122'/>
     </function-decl>
     <function-decl name='gnutls_protocol_get_id' mangled-name='gnutls_protocol_get_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_protocol_get_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='name'/>
@@ -18327,7 +18401,7 @@
       <return type-id='type-id-23'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='publickey.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='publickey.c' comp-dir-path='/root/gnutls/lib/algorithms' language='LANG_C99'>
     <function-decl name='gnutls_pk_get_oid' mangled-name='gnutls_pk_get_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pk_get_oid@@GNUTLS_3_4'>
       <parameter type-id='type-id-60' name='algorithm'/>
       <return type-id='type-id-27'/>
@@ -18345,34 +18419,34 @@
       <return type-id='type-id-60'/>
     </function-decl>
     <function-decl name='gnutls_pk_list' mangled-name='gnutls_pk_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pk_list@@GNUTLS_3_4'>
-      <return type-id='type-id-470'/>
+      <return type-id='type-id-473'/>
     </function-decl>
     <function-decl name='gnutls_pk_algorithm_get_name' mangled-name='gnutls_pk_algorithm_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pk_algorithm_get_name@@GNUTLS_3_4'>
       <parameter type-id='type-id-60' name='algorithm'/>
       <return type-id='type-id-27'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='secparams.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='secparams.c' comp-dir-path='/root/gnutls/lib/algorithms' language='LANG_C99'>
     <function-decl name='gnutls_pk_bits_to_sec_param' mangled-name='gnutls_pk_bits_to_sec_param' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pk_bits_to_sec_param@@GNUTLS_3_4'>
       <parameter type-id='type-id-60' name='algo'/>
       <parameter type-id='type-id-10' name='bits'/>
-      <return type-id='type-id-202'/>
+      <return type-id='type-id-203'/>
     </function-decl>
     <function-decl name='gnutls_sec_param_get_name' mangled-name='gnutls_sec_param_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sec_param_get_name@@GNUTLS_3_4'>
-      <parameter type-id='type-id-202' name='param'/>
+      <parameter type-id='type-id-203' name='param'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_sec_param_to_symmetric_bits' mangled-name='gnutls_sec_param_to_symmetric_bits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sec_param_to_symmetric_bits@@GNUTLS_3_4'>
-      <parameter type-id='type-id-202' name='param'/>
+      <parameter type-id='type-id-203' name='param'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='gnutls_sec_param_to_pk_bits' mangled-name='gnutls_sec_param_to_pk_bits' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sec_param_to_pk_bits@@GNUTLS_3_4'>
       <parameter type-id='type-id-60' name='algo'/>
-      <parameter type-id='type-id-202' name='param'/>
+      <parameter type-id='type-id-203' name='param'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='sign.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='sign.c' comp-dir-path='/root/gnutls/lib/algorithms' language='LANG_C99'>
     <function-decl name='gnutls_sign_supports_pk_algorithm' mangled-name='gnutls_sign_supports_pk_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sign_supports_pk_algorithm@@GNUTLS_3_6_0'>
       <parameter type-id='type-id-21' name='sign'/>
       <parameter type-id='type-id-60' name='pk'/>
@@ -18384,7 +18458,7 @@
     </function-decl>
     <function-decl name='gnutls_sign_get_hash_algorithm' mangled-name='gnutls_sign_get_hash_algorithm' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sign_get_hash_algorithm@@GNUTLS_3_4'>
       <parameter type-id='type-id-21' name='sign'/>
-      <return type-id='type-id-211'/>
+      <return type-id='type-id-212'/>
     </function-decl>
     <function-decl name='gnutls_sign_get_oid' mangled-name='gnutls_sign_get_oid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sign_get_oid@@GNUTLS_3_4'>
       <parameter type-id='type-id-21' name='sign'/>
@@ -18392,7 +18466,7 @@
     </function-decl>
     <function-decl name='gnutls_pk_to_sign' mangled-name='gnutls_pk_to_sign' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pk_to_sign@@GNUTLS_3_4'>
       <parameter type-id='type-id-60' name='pk'/>
-      <parameter type-id='type-id-211' name='hash'/>
+      <parameter type-id='type-id-212' name='hash'/>
       <return type-id='type-id-21'/>
     </function-decl>
     <function-decl name='gnutls_oid_to_sign' mangled-name='gnutls_oid_to_sign' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_oid_to_sign@@GNUTLS_3_4'>
@@ -18403,10 +18477,10 @@
       <parameter type-id='type-id-27' name='name'/>
       <return type-id='type-id-21'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-21' const='yes' id='type-id-1119'/>
-    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-1120'/>
+    <qualified-type-def type-id='type-id-21' const='yes' id='type-id-1123'/>
+    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-1124'/>
     <function-decl name='gnutls_sign_list' mangled-name='gnutls_sign_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sign_list@@GNUTLS_3_4'>
-      <return type-id='type-id-1120'/>
+      <return type-id='type-id-1124'/>
     </function-decl>
     <function-decl name='gnutls_sign_is_secure2' mangled-name='gnutls_sign_is_secure2' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_sign_is_secure2@@GNUTLS_3_6_0'>
       <parameter type-id='type-id-21' name='algorithm'/>
@@ -18425,7 +18499,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='groups.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='groups.c' comp-dir-path='/root/gnutls/lib/algorithms' language='LANG_C99'>
     <function-decl name='gnutls_group_get_name' mangled-name='gnutls_group_get_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_group_get_name@@GNUTLS_3_6_0'>
       <parameter type-id='type-id-56' name='group'/>
       <return type-id='type-id-27'/>
@@ -18434,66 +18508,66 @@
       <parameter type-id='type-id-27' name='name'/>
       <return type-id='type-id-56'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-56' const='yes' id='type-id-1121'/>
-    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-1122'/>
+    <qualified-type-def type-id='type-id-56' const='yes' id='type-id-1125'/>
+    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-1126'/>
     <function-decl name='gnutls_group_list' mangled-name='gnutls_group_list' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_group_list@@GNUTLS_3_6_0'>
-      <return type-id='type-id-1122'/>
+      <return type-id='type-id-1126'/>
     </function-decl>
     <function-decl name='_gnutls_ecc_curve_is_supported' mangled-name='_gnutls_ecc_curve_is_supported' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='accelerated.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='accelerated.c' comp-dir-path='/root/gnutls/lib/accelerated' language='LANG_C99'>
     <function-decl name='register_x86_crypto' mangled-name='register_x86_crypto' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='aes-cbc-x86-aesni.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <class-decl name='__anonymous_struct__' size-in-bits='768' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1123' visibility='default' id='type-id-1124'>
+  <abi-instr version='1.0' address-size='64' path='aes-cbc-x86-aesni.c' comp-dir-path='/root/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <class-decl name='__anonymous_struct__' size-in-bits='768' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1127' visibility='default' id='type-id-1128'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='init' type-id='type-id-808' visibility='default'/>
+        <var-decl name='init' type-id='type-id-811' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='setkey' type-id='type-id-809' visibility='default'/>
+        <var-decl name='setkey' type-id='type-id-812' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='setiv' type-id='type-id-813' visibility='default'/>
+        <var-decl name='setiv' type-id='type-id-816' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='getiv' type-id='type-id-1125' visibility='default'/>
+        <var-decl name='getiv' type-id='type-id-1129' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='encrypt' type-id='type-id-814' visibility='default'/>
+        <var-decl name='encrypt' type-id='type-id-817' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='decrypt' type-id='type-id-815' visibility='default'/>
+        <var-decl name='decrypt' type-id='type-id-818' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='aead_encrypt' type-id='type-id-810' visibility='default'/>
+        <var-decl name='aead_encrypt' type-id='type-id-813' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='aead_decrypt' type-id='type-id-811' visibility='default'/>
+        <var-decl name='aead_decrypt' type-id='type-id-814' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='deinit' type-id='type-id-812' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-815' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='auth' type-id='type-id-1126' visibility='default'/>
+        <var-decl name='auth' type-id='type-id-1130' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='tag' type-id='type-id-1127' visibility='default'/>
+        <var-decl name='tag' type-id='type-id-1131' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='exists' type-id='type-id-1128' visibility='default'/>
+        <var-decl name='exists' type-id='type-id-1132' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_cipher_getiv_func' type-id='type-id-117' id='type-id-1125'/>
-    <typedef-decl name='gnutls_cipher_auth_func' type-id='type-id-117' id='type-id-1126'/>
-    <typedef-decl name='gnutls_cipher_tag_func' type-id='type-id-119' id='type-id-1127'/>
-    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-1128'/>
-    <typedef-decl name='gnutls_crypto_cipher_st' type-id='type-id-1124' id='type-id-1123'/>
-    <qualified-type-def type-id='type-id-1123' const='yes' id='type-id-1130'/>
-    <var-decl name='_gnutls_aesni_x86' type-id='type-id-1130' visibility='default'/>
+    <typedef-decl name='gnutls_cipher_getiv_func' type-id='type-id-117' id='type-id-1129'/>
+    <typedef-decl name='gnutls_cipher_auth_func' type-id='type-id-117' id='type-id-1130'/>
+    <typedef-decl name='gnutls_cipher_tag_func' type-id='type-id-119' id='type-id-1131'/>
+    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-1132'/>
+    <typedef-decl name='gnutls_crypto_cipher_st' type-id='type-id-1128' id='type-id-1127'/>
+    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1134'/>
+    <var-decl name='_gnutls_aesni_x86' type-id='type-id-1134' visibility='default'/>
     <function-decl name='aesni_cbc_encrypt' mangled-name='aesni_cbc_encrypt' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18503,13 +18577,13 @@
     <function-decl name='aesni_set_encrypt_key' mangled-name='aesni_set_encrypt_key' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1129'>
+    <function-type size-in-bits='64' id='type-id-1133'>
       <parameter type-id='type-id-29'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='aes-cbc-x86-ssse3.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_ssse3' type-id='type-id-1130' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-cbc-x86-ssse3.c' comp-dir-path='/root/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_ssse3' type-id='type-id-1134' visibility='default'/>
     <function-decl name='vpaes_cbc_encrypt' mangled-name='vpaes_cbc_encrypt' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18520,8 +18594,8 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='aes-ccm-x86-aesni.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_ccm_x86_aesni' type-id='type-id-1130' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-ccm-x86-aesni.c' comp-dir-path='/root/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_ccm_x86_aesni' type-id='type-id-1134' visibility='default'/>
     <function-decl name='aesni_ecb_encrypt' mangled-name='aesni_ecb_encrypt' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18532,8 +18606,8 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='aes-gcm-padlock.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_padlock' type-id='type-id-1130' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-padlock.c' comp-dir-path='/root/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_padlock' type-id='type-id-1134' visibility='default'/>
     <function-decl name='nettle_gcm_update' mangled-name='nettle_gcm_update' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18559,11 +18633,11 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-aesni.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_x86_aesni' type-id='type-id-1130' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-aesni.c' comp-dir-path='/root/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_x86_aesni' type-id='type-id-1134' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-pclmul-avx.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_pclmul_avx' type-id='type-id-1130' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-pclmul-avx.c' comp-dir-path='/root/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_pclmul_avx' type-id='type-id-1134' visibility='default'/>
     <function-decl name='aesni_gcm_decrypt' mangled-name='aesni_gcm_decrypt' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18583,8 +18657,8 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-pclmul.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_pclmul' type-id='type-id-1130' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-pclmul.c' comp-dir-path='/root/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_pclmul' type-id='type-id-1134' visibility='default'/>
     <function-decl name='gcm_ghash_clmul' mangled-name='gcm_ghash_clmul' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18595,14 +18669,14 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-ssse3.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_x86_ssse3' type-id='type-id-1130' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-ssse3.c' comp-dir-path='/root/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_x86_ssse3' type-id='type-id-1134' visibility='default'/>
     <function-decl name='vpaes_encrypt' mangled-name='vpaes_encrypt' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='aes-padlock.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_padlock' type-id='type-id-1130' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-padlock.c' comp-dir-path='/root/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_padlock' type-id='type-id-1134' visibility='default'/>
     <function-decl name='padlock_cbc_encrypt' mangled-name='padlock_cbc_encrypt' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18616,42 +18690,42 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hmac-padlock.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1131' visibility='default' id='type-id-1132'>
+  <abi-instr version='1.0' address-size='64' path='hmac-padlock.c' comp-dir-path='/root/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1135' visibility='default' id='type-id-1136'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='init' type-id='type-id-797' visibility='default'/>
+        <var-decl name='init' type-id='type-id-800' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='setkey' type-id='type-id-798' visibility='default'/>
+        <var-decl name='setkey' type-id='type-id-801' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='setnonce' type-id='type-id-799' visibility='default'/>
+        <var-decl name='setnonce' type-id='type-id-802' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='hash' type-id='type-id-800' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-803' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='output' type-id='type-id-801' visibility='default'/>
+        <var-decl name='output' type-id='type-id-804' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='deinit' type-id='type-id-802' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-805' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='fast' type-id='type-id-805' visibility='default'/>
+        <var-decl name='fast' type-id='type-id-808' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='copy' type-id='type-id-1133' visibility='default'/>
+        <var-decl name='copy' type-id='type-id-1137' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='exists' type-id='type-id-1134' visibility='default'/>
+        <var-decl name='exists' type-id='type-id-1138' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_mac_copy_func' type-id='type-id-130' id='type-id-1133'/>
-    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-1134'/>
-    <typedef-decl name='gnutls_crypto_mac_st' type-id='type-id-1132' id='type-id-1131'/>
-    <qualified-type-def type-id='type-id-1131' const='yes' id='type-id-1136'/>
-    <var-decl name='_gnutls_hmac_sha_padlock' type-id='type-id-1136' visibility='default'/>
-    <var-decl name='_gnutls_hmac_sha_padlock_nano' type-id='type-id-1136' visibility='default'/>
+    <typedef-decl name='gnutls_mac_copy_func' type-id='type-id-130' id='type-id-1137'/>
+    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-1138'/>
+    <typedef-decl name='gnutls_crypto_mac_st' type-id='type-id-1136' id='type-id-1135'/>
+    <qualified-type-def type-id='type-id-1135' const='yes' id='type-id-1140'/>
+    <var-decl name='_gnutls_hmac_sha_padlock' type-id='type-id-1140' visibility='default'/>
+    <var-decl name='_gnutls_hmac_sha_padlock_nano' type-id='type-id-1140' visibility='default'/>
     <function-decl name='wrap_padlock_hash_fast' mangled-name='wrap_padlock_hash_fast' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18670,13 +18744,13 @@
     <function-decl name='padlock_sha1_update' mangled-name='padlock_sha1_update' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1135'>
+    <function-type size-in-bits='64' id='type-id-1139'>
       <parameter type-id='type-id-31'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hmac-x86-ssse3.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_hmac_sha_x86_ssse3' type-id='type-id-1136' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='hmac-x86-ssse3.c' comp-dir-path='/root/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_hmac_sha_x86_ssse3' type-id='type-id-1140' visibility='default'/>
     <function-decl name='x86_sha512_update' mangled-name='x86_sha512_update' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18687,8 +18761,8 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='sha-padlock.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <class-decl name='nettle_hash' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1137'>
+  <abi-instr version='1.0' address-size='64' path='sha-padlock.c' comp-dir-path='/root/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <class-decl name='nettle_hash' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1141'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
@@ -18702,56 +18776,56 @@
         <var-decl name='block_size' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='init' type-id='type-id-1138' visibility='default'/>
+        <var-decl name='init' type-id='type-id-1142' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='update' type-id='type-id-1139' visibility='default'/>
+        <var-decl name='update' type-id='type-id-1143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='digest' type-id='type-id-1140' visibility='default'/>
+        <var-decl name='digest' type-id='type-id-1144' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='nettle_hash_init_func' type-id='type-id-120' id='type-id-1141'/>
-    <pointer-type-def type-id='type-id-1141' size-in-bits='64' id='type-id-1138'/>
-    <typedef-decl name='nettle_hash_update_func' type-id='type-id-1142' id='type-id-1143'/>
-    <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-1139'/>
-    <typedef-decl name='nettle_hash_digest_func' type-id='type-id-1144' id='type-id-1145'/>
-    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-1140'/>
-    <qualified-type-def type-id='type-id-1137' const='yes' id='type-id-1146'/>
-    <var-decl name='padlock_sha1' type-id='type-id-1146' visibility='default'/>
-    <var-decl name='padlock_sha224' type-id='type-id-1146' visibility='default'/>
-    <var-decl name='padlock_sha256' type-id='type-id-1146' visibility='default'/>
-    <var-decl name='padlock_sha384' type-id='type-id-1146' visibility='default'/>
-    <var-decl name='padlock_sha512' type-id='type-id-1146' visibility='default'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='448' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1147' visibility='default' id='type-id-1148'>
+    <typedef-decl name='nettle_hash_init_func' type-id='type-id-120' id='type-id-1145'/>
+    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-1142'/>
+    <typedef-decl name='nettle_hash_update_func' type-id='type-id-1146' id='type-id-1147'/>
+    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-1143'/>
+    <typedef-decl name='nettle_hash_digest_func' type-id='type-id-1148' id='type-id-1149'/>
+    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-1144'/>
+    <qualified-type-def type-id='type-id-1141' const='yes' id='type-id-1150'/>
+    <var-decl name='padlock_sha1' type-id='type-id-1150' visibility='default'/>
+    <var-decl name='padlock_sha224' type-id='type-id-1150' visibility='default'/>
+    <var-decl name='padlock_sha256' type-id='type-id-1150' visibility='default'/>
+    <var-decl name='padlock_sha384' type-id='type-id-1150' visibility='default'/>
+    <var-decl name='padlock_sha512' type-id='type-id-1150' visibility='default'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='448' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1151' visibility='default' id='type-id-1152'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='init' type-id='type-id-788' visibility='default'/>
+        <var-decl name='init' type-id='type-id-791' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='hash' type-id='type-id-789' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-792' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='output' type-id='type-id-790' visibility='default'/>
+        <var-decl name='output' type-id='type-id-793' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='deinit' type-id='type-id-791' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-794' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='fast' type-id='type-id-794' visibility='default'/>
+        <var-decl name='fast' type-id='type-id-797' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='copy' type-id='type-id-1149' visibility='default'/>
+        <var-decl name='copy' type-id='type-id-1153' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='exists' type-id='type-id-1150' visibility='default'/>
+        <var-decl name='exists' type-id='type-id-1154' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_digest_copy_func' type-id='type-id-130' id='type-id-1149'/>
-    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-1150'/>
-    <typedef-decl name='gnutls_crypto_digest_st' type-id='type-id-1148' id='type-id-1147'/>
-    <qualified-type-def type-id='type-id-1147' const='yes' id='type-id-1152'/>
-    <var-decl name='_gnutls_sha_padlock' type-id='type-id-1152' visibility='default'/>
-    <var-decl name='_gnutls_sha_padlock_nano' type-id='type-id-1152' visibility='default'/>
+    <typedef-decl name='gnutls_digest_copy_func' type-id='type-id-130' id='type-id-1153'/>
+    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-1154'/>
+    <typedef-decl name='gnutls_crypto_digest_st' type-id='type-id-1152' id='type-id-1151'/>
+    <qualified-type-def type-id='type-id-1151' const='yes' id='type-id-1156'/>
+    <var-decl name='_gnutls_sha_padlock' type-id='type-id-1156' visibility='default'/>
+    <var-decl name='_gnutls_sha_padlock_nano' type-id='type-id-1156' visibility='default'/>
     <function-decl name='padlock_sha1_oneshot' mangled-name='padlock_sha1_oneshot' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18782,30 +18856,30 @@
     <function-decl name='padlock_sha1_blocks' mangled-name='padlock_sha1_blocks' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1151'>
-      <parameter type-id='type-id-211'/>
+    <function-type size-in-bits='64' id='type-id-1155'>
+      <parameter type-id='type-id-212'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1142'>
+    <function-type size-in-bits='64' id='type-id-1146'>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-99'/>
-      <parameter type-id='type-id-900'/>
+      <parameter type-id='type-id-903'/>
       <return type-id='type-id-111'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1144'>
+    <function-type size-in-bits='64' id='type-id-1148'>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-99'/>
-      <parameter type-id='type-id-191'/>
+      <parameter type-id='type-id-192'/>
       <return type-id='type-id-111'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='sha-x86-ssse3.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='x86_sha1' type-id='type-id-1146' visibility='default'/>
-    <var-decl name='x86_sha224' type-id='type-id-1146' visibility='default'/>
-    <var-decl name='x86_sha256' type-id='type-id-1146' visibility='default'/>
-    <var-decl name='x86_sha384' type-id='type-id-1146' visibility='default'/>
-    <var-decl name='x86_sha512' type-id='type-id-1146' visibility='default'/>
-    <var-decl name='_gnutls_sha_x86_ssse3' type-id='type-id-1152' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='sha-x86-ssse3.c' comp-dir-path='/root/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='x86_sha1' type-id='type-id-1150' visibility='default'/>
+    <var-decl name='x86_sha224' type-id='type-id-1150' visibility='default'/>
+    <var-decl name='x86_sha256' type-id='type-id-1150' visibility='default'/>
+    <var-decl name='x86_sha384' type-id='type-id-1150' visibility='default'/>
+    <var-decl name='x86_sha512' type-id='type-id-1150' visibility='default'/>
+    <var-decl name='_gnutls_sha_x86_ssse3' type-id='type-id-1156' visibility='default'/>
     <function-decl name='nettle_sha512_update' mangled-name='nettle_sha512_update' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18825,7 +18899,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='x86-common.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x86-common.c' comp-dir-path='/root/gnutls/lib/accelerated/x86' language='LANG_C99'>
     <function-decl name='gnutls_crypto_single_cipher_register' mangled-name='gnutls_crypto_single_cipher_register' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18842,75 +18916,81 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pk.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pk.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <var-decl name='crypto_pk_prio' type-id='type-id-22' visibility='default'/>
-    <class-decl name='gnutls_crypto_pk' size-in-bits='768' is-struct='yes' visibility='default' id='type-id-1153'>
+    <class-decl name='gnutls_crypto_pk' size-in-bits='768' is-struct='yes' visibility='default' id='type-id-1157'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='encrypt' type-id='type-id-1154' visibility='default'/>
+        <var-decl name='encrypt' type-id='type-id-1158' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='decrypt' type-id='type-id-1154' visibility='default'/>
+        <var-decl name='decrypt' type-id='type-id-1158' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='decrypt2' type-id='type-id-1155' visibility='default'/>
+        <var-decl name='decrypt2' type-id='type-id-1159' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='sign' type-id='type-id-1156' visibility='default'/>
+        <var-decl name='sign' type-id='type-id-1160' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='verify' type-id='type-id-1157' visibility='default'/>
+        <var-decl name='verify' type-id='type-id-1161' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='verify_priv_params' type-id='type-id-1158' visibility='default'/>
+        <var-decl name='verify_priv_params' type-id='type-id-1162' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='verify_pub_params' type-id='type-id-1158' visibility='default'/>
+        <var-decl name='verify_pub_params' type-id='type-id-1162' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='generate_keys' type-id='type-id-1159' visibility='default'/>
+        <var-decl name='generate_keys' type-id='type-id-1163' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='generate_params' type-id='type-id-1160' visibility='default'/>
+        <var-decl name='generate_params' type-id='type-id-1164' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='pk_fixup_private_params' type-id='type-id-1161' visibility='default'/>
+        <var-decl name='pk_fixup_private_params' type-id='type-id-1165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='derive' type-id='type-id-1162' visibility='default'/>
+        <var-decl name='derive' type-id='type-id-1166' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='curve_exists' type-id='type-id-1163' visibility='default'/>
+        <var-decl name='curve_exists' type-id='type-id-1167' visibility='default'/>
       </data-member>
     </class-decl>
-    <qualified-type-def type-id='type-id-312' const='yes' id='type-id-1164'/>
-    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-1165'/>
-    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-1154'/>
-    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-1155'/>
-    <qualified-type-def type-id='type-id-317' const='yes' id='type-id-1168'/>
+    <qualified-type-def type-id='type-id-315' const='yes' id='type-id-1168'/>
     <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-1169'/>
-    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1156'/>
-    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-1157'/>
-    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-1158'/>
-    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-1173'/>
-    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-1159'/>
-    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-1160'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1176'>
+    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1158'/>
+    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-1159'/>
+    <qualified-type-def type-id='type-id-320' const='yes' id='type-id-1172'/>
+    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-1173'/>
+    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-1160'/>
+    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-1161'/>
+    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-1162'/>
+    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-1177'/>
+    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-1163'/>
+    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-1164'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1180'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_IMPORT' value='0'/>
       <enumerator name='GNUTLS_EXPORT' value='1'/>
     </enum-decl>
-    <typedef-decl name='gnutls_direction_t' type-id='type-id-1176' id='type-id-1177'/>
-    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-1161'/>
-    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-1162'/>
-    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-1163'/>
-    <typedef-decl name='gnutls_crypto_pk_st' type-id='type-id-1153' id='type-id-1181'/>
-    <var-decl name='_gnutls_pk_ops' type-id='type-id-1181' visibility='default'/>
-    <function-decl name='nettle_get_secp_256r1' mangled-name='nettle_get_secp_256r1' visibility='default' binding='global' size-in-bits='64'>
+    <typedef-decl name='gnutls_direction_t' type-id='type-id-1180' id='type-id-1181'/>
+    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-1165'/>
+    <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-1166'/>
+    <pointer-type-def type-id='type-id-1184' size-in-bits='64' id='type-id-1167'/>
+    <typedef-decl name='gnutls_crypto_pk_st' type-id='type-id-1157' id='type-id-1185'/>
+    <var-decl name='_gnutls_pk_ops' type-id='type-id-1185' visibility='default'/>
+    <function-decl name='nettle_get_secp_192r1' mangled-name='nettle_get_secp_192r1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_get_secp_521r1' mangled-name='nettle_get_secp_521r1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='nettle_get_secp_256r1' mangled-name='nettle_get_secp_256r1' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='nettle_get_secp_224r1' mangled-name='nettle_get_secp_224r1' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='nettle_get_secp_384r1' mangled-name='nettle_get_secp_384r1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18920,10 +19000,10 @@
     <function-decl name='nettle_ecc_point_set' mangled-name='nettle_ecc_point_set' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_get_gost_256cpa' mangled-name='_gnutls_get_gost_256cpa' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_get_gost_gc256b' mangled-name='_gnutls_get_gost_gc256b' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_get_gost_512a' mangled-name='_gnutls_get_gost_512a' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_get_gost_gc512a' mangled-name='_gnutls_get_gost_gc512a' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ecc_point_clear' mangled-name='nettle_ecc_point_clear' visibility='default' binding='global' size-in-bits='64'>
@@ -18944,6 +19024,9 @@
     <function-decl name='__gmpz_cmp' mangled-name='__gmpz_cmp' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='gnutls_nettle_curve448_ed448_shake256_public_key' mangled-name='gnutls_nettle_curve448_ed448_shake256_public_key' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='nettle_ed25519_sha512_public_key' mangled-name='nettle_ed25519_sha512_public_key' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19019,6 +19102,9 @@
     <function-decl name='nettle_ecc_scalar_get' mangled-name='nettle_ecc_scalar_get' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='gnutls_nettle_curve448_curve448_mul_g' mangled-name='gnutls_nettle_curve448_curve448_mul_g' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='nettle_curve25519_mul_g' mangled-name='nettle_curve25519_mul_g' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19043,6 +19129,9 @@
     <function-decl name='nettle_ed25519_sha512_verify' mangled-name='nettle_ed25519_sha512_verify' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='gnutls_nettle_curve448_ed448_shake256_verify' mangled-name='gnutls_nettle_curve448_ed448_shake256_verify' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_decode_gost_rs' mangled-name='_gnutls_decode_gost_rs' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19064,6 +19153,9 @@
     <function-decl name='nettle_rsa_pkcs1_verify' mangled-name='nettle_rsa_pkcs1_verify' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='gnutls_nettle_curve448_ed448_shake256_sign' mangled-name='gnutls_nettle_curve448_ed448_shake256_sign' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='nettle_ed25519_sha512_sign' mangled-name='nettle_ed25519_sha512_sign' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19115,6 +19207,9 @@
     <function-decl name='nettle_mpz_get_str_256' mangled-name='nettle_mpz_get_str_256' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='gnutls_nettle_curve448_curve448_mul' mangled-name='gnutls_nettle_curve448_curve448_mul' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='nettle_curve25519_mul' mangled-name='nettle_curve25519_mul' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19145,180 +19240,180 @@
     <function-decl name='nettle_rsa_private_key_prepare' mangled-name='nettle_rsa_private_key_prepare' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1180'>
+    <function-type size-in-bits='64' id='type-id-1184'>
       <parameter type-id='type-id-59'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1171'>
+    <function-type size-in-bits='64' id='type-id-1175'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-1165'/>
       <parameter type-id='type-id-1169'/>
+      <parameter type-id='type-id-1173'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1167'>
+    <function-type size-in-bits='64' id='type-id-1171'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-99'/>
-      <parameter type-id='type-id-1165'/>
+      <parameter type-id='type-id-1169'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1172'>
+    <function-type size-in-bits='64' id='type-id-1176'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-1165'/>
+      <parameter type-id='type-id-1169'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1166'>
+    <function-type size-in-bits='64' id='type-id-1170'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-1165'/>
+      <parameter type-id='type-id-1169'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1170'>
+    <function-type size-in-bits='64' id='type-id-1174'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-278'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-1165'/>
       <parameter type-id='type-id-1169'/>
+      <parameter type-id='type-id-1173'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1179'>
+    <function-type size-in-bits='64' id='type-id-1183'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-275'/>
-      <parameter type-id='type-id-1165'/>
-      <parameter type-id='type-id-1165'/>
+      <parameter type-id='type-id-278'/>
+      <parameter type-id='type-id-1169'/>
+      <parameter type-id='type-id-1169'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1178'>
+    <function-type size-in-bits='64' id='type-id-1182'>
       <parameter type-id='type-id-60'/>
+      <parameter type-id='type-id-1181'/>
       <parameter type-id='type-id-1177'/>
-      <parameter type-id='type-id-1173'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1175'>
+    <function-type size-in-bits='64' id='type-id-1179'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-1173'/>
+      <parameter type-id='type-id-1177'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1174'>
+    <function-type size-in-bits='64' id='type-id-1178'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-1173'/>
+      <parameter type-id='type-id-1177'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='mpi.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='mpi.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <var-decl name='crypto_bigint_prio' type-id='type-id-22' visibility='default'/>
-    <class-decl name='gnutls_crypto_bigint' size-in-bits='1600' is-struct='yes' visibility='default' id='type-id-1182'>
+    <class-decl name='gnutls_crypto_bigint' size-in-bits='1600' is-struct='yes' visibility='default' id='type-id-1186'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='bigint_init' type-id='type-id-1183' visibility='default'/>
+        <var-decl name='bigint_init' type-id='type-id-1187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='bigint_init_multi' type-id='type-id-1184' visibility='default'/>
+        <var-decl name='bigint_init_multi' type-id='type-id-1188' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='bigint_release' type-id='type-id-1185' visibility='default'/>
+        <var-decl name='bigint_release' type-id='type-id-1189' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='bigint_clear' type-id='type-id-1185' visibility='default'/>
+        <var-decl name='bigint_clear' type-id='type-id-1189' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='bigint_cmp' type-id='type-id-1186' visibility='default'/>
+        <var-decl name='bigint_cmp' type-id='type-id-1190' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='bigint_cmp_ui' type-id='type-id-1187' visibility='default'/>
+        <var-decl name='bigint_cmp_ui' type-id='type-id-1191' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='bigint_modm' type-id='type-id-1188' visibility='default'/>
+        <var-decl name='bigint_modm' type-id='type-id-1192' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='bigint_set' type-id='type-id-1189' visibility='default'/>
+        <var-decl name='bigint_set' type-id='type-id-1193' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='bigint_copy' type-id='type-id-1190' visibility='default'/>
+        <var-decl name='bigint_copy' type-id='type-id-1194' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='bigint_set_ui' type-id='type-id-1191' visibility='default'/>
+        <var-decl name='bigint_set_ui' type-id='type-id-1195' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='bigint_get_nbits' type-id='type-id-1192' visibility='default'/>
+        <var-decl name='bigint_get_nbits' type-id='type-id-1196' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='bigint_powm' type-id='type-id-1193' visibility='default'/>
+        <var-decl name='bigint_powm' type-id='type-id-1197' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='bigint_addm' type-id='type-id-1193' visibility='default'/>
+        <var-decl name='bigint_addm' type-id='type-id-1197' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='bigint_subm' type-id='type-id-1193' visibility='default'/>
+        <var-decl name='bigint_subm' type-id='type-id-1197' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='bigint_mulm' type-id='type-id-1193' visibility='default'/>
+        <var-decl name='bigint_mulm' type-id='type-id-1197' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='bigint_add' type-id='type-id-1188' visibility='default'/>
+        <var-decl name='bigint_add' type-id='type-id-1192' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='bigint_sub' type-id='type-id-1188' visibility='default'/>
+        <var-decl name='bigint_sub' type-id='type-id-1192' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='bigint_mul' type-id='type-id-1188' visibility='default'/>
+        <var-decl name='bigint_mul' type-id='type-id-1192' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='bigint_add_ui' type-id='type-id-1194' visibility='default'/>
+        <var-decl name='bigint_add_ui' type-id='type-id-1198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='bigint_sub_ui' type-id='type-id-1194' visibility='default'/>
+        <var-decl name='bigint_sub_ui' type-id='type-id-1198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='bigint_mul_ui' type-id='type-id-1194' visibility='default'/>
+        <var-decl name='bigint_mul_ui' type-id='type-id-1198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='bigint_div' type-id='type-id-1188' visibility='default'/>
+        <var-decl name='bigint_div' type-id='type-id-1192' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='bigint_prime_check' type-id='type-id-1195' visibility='default'/>
+        <var-decl name='bigint_prime_check' type-id='type-id-1199' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='bigint_scan' type-id='type-id-1196' visibility='default'/>
+        <var-decl name='bigint_scan' type-id='type-id-1200' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='bigint_print' type-id='type-id-1197' visibility='default'/>
+        <var-decl name='bigint_print' type-id='type-id-1201' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-318' size-in-bits='64' id='type-id-1198'/>
-    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-1183'/>
-    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-1184'/>
-    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-1185'/>
-    <qualified-type-def type-id='type-id-318' const='yes' id='type-id-1202'/>
-    <pointer-type-def type-id='type-id-1203' size-in-bits='64' id='type-id-1186'/>
-    <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-1187'/>
-    <pointer-type-def type-id='type-id-1205' size-in-bits='64' id='type-id-1188'/>
-    <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-1189'/>
+    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-1202'/>
+    <pointer-type-def type-id='type-id-1203' size-in-bits='64' id='type-id-1187'/>
+    <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-1188'/>
+    <pointer-type-def type-id='type-id-1205' size-in-bits='64' id='type-id-1189'/>
+    <qualified-type-def type-id='type-id-321' const='yes' id='type-id-1206'/>
     <pointer-type-def type-id='type-id-1207' size-in-bits='64' id='type-id-1190'/>
     <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-1191'/>
     <pointer-type-def type-id='type-id-1209' size-in-bits='64' id='type-id-1192'/>
     <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-1193'/>
     <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-1194'/>
     <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-1195'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1213'>
+    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-1196'/>
+    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-1197'/>
+    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-1198'/>
+    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-1199'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1217'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_MPI_FORMAT_USG' value='0'/>
       <enumerator name='GNUTLS_MPI_FORMAT_STD' value='1'/>
       <enumerator name='GNUTLS_MPI_FORMAT_ULE' value='2'/>
     </enum-decl>
-    <typedef-decl name='gnutls_bigint_format_t' type-id='type-id-1213' id='type-id-1214'/>
-    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-1196'/>
-    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-1197'/>
-    <typedef-decl name='gnutls_crypto_bigint_st' type-id='type-id-1182' id='type-id-1217'/>
-    <var-decl name='_gnutls_mpi_ops' type-id='type-id-1217' mangled-name='_gnutls_mpi_ops' visibility='default' elf-symbol-id='_gnutls_mpi_ops@@GNUTLS_PRIVATE_3_4'/>
+    <typedef-decl name='gnutls_bigint_format_t' type-id='type-id-1217' id='type-id-1218'/>
+    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-1200'/>
+    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-1201'/>
+    <typedef-decl name='gnutls_crypto_bigint_st' type-id='type-id-1186' id='type-id-1221'/>
+    <var-decl name='_gnutls_mpi_ops' type-id='type-id-1221' mangled-name='_gnutls_mpi_ops' visibility='default' elf-symbol-id='_gnutls_mpi_ops@@GNUTLS_PRIVATE_3_4'/>
     <function-decl name='__gmpz_probab_prime_p' mangled-name='__gmpz_probab_prime_p' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19355,88 +19450,97 @@
     <function-decl name='nettle_mpz_set_str_256_s' mangled-name='nettle_mpz_set_str_256_s' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1199'>
-      <parameter type-id='type-id-1198'/>
+    <function-type size-in-bits='64' id='type-id-1203'>
+      <parameter type-id='type-id-1202'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1200'>
-      <parameter type-id='type-id-1198'/>
+    <function-type size-in-bits='64' id='type-id-1204'>
+      <parameter type-id='type-id-1202'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1212'>
-      <parameter type-id='type-id-1202'/>
+    <function-type size-in-bits='64' id='type-id-1216'>
+      <parameter type-id='type-id-1206'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1203'>
-      <parameter type-id='type-id-1202'/>
-      <parameter type-id='type-id-1202'/>
+    <function-type size-in-bits='64' id='type-id-1207'>
+      <parameter type-id='type-id-1206'/>
+      <parameter type-id='type-id-1206'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1204'>
-      <parameter type-id='type-id-1202'/>
+    <function-type size-in-bits='64' id='type-id-1208'>
+      <parameter type-id='type-id-1206'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1216'>
-      <parameter type-id='type-id-1202'/>
+    <function-type size-in-bits='64' id='type-id-1220'>
+      <parameter type-id='type-id-1206'/>
       <parameter type-id='type-id-101'/>
-      <parameter type-id='type-id-422'/>
-      <parameter type-id='type-id-1214'/>
+      <parameter type-id='type-id-425'/>
+      <parameter type-id='type-id-1218'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1206'>
-      <parameter type-id='type-id-318'/>
-      <parameter type-id='type-id-1202'/>
+    <function-type size-in-bits='64' id='type-id-1210'>
+      <parameter type-id='type-id-321'/>
+      <parameter type-id='type-id-1206'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1205'>
-      <parameter type-id='type-id-318'/>
-      <parameter type-id='type-id-1202'/>
-      <parameter type-id='type-id-1202'/>
+    <function-type size-in-bits='64' id='type-id-1209'>
+      <parameter type-id='type-id-321'/>
+      <parameter type-id='type-id-1206'/>
+      <parameter type-id='type-id-1206'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1210'>
-      <parameter type-id='type-id-318'/>
-      <parameter type-id='type-id-1202'/>
-      <parameter type-id='type-id-1202'/>
-      <parameter type-id='type-id-1202'/>
+    <function-type size-in-bits='64' id='type-id-1214'>
+      <parameter type-id='type-id-321'/>
+      <parameter type-id='type-id-1206'/>
+      <parameter type-id='type-id-1206'/>
+      <parameter type-id='type-id-1206'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1211'>
-      <parameter type-id='type-id-318'/>
-      <parameter type-id='type-id-1202'/>
+    <function-type size-in-bits='64' id='type-id-1215'>
+      <parameter type-id='type-id-321'/>
+      <parameter type-id='type-id-1206'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1208'>
-      <parameter type-id='type-id-318'/>
+    <function-type size-in-bits='64' id='type-id-1212'>
+      <parameter type-id='type-id-321'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1215'>
-      <parameter type-id='type-id-318'/>
+    <function-type size-in-bits='64' id='type-id-1219'>
+      <parameter type-id='type-id-321'/>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-99'/>
-      <parameter type-id='type-id-1214'/>
+      <parameter type-id='type-id-1218'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1207'>
-      <parameter type-id='type-id-1202'/>
-      <return type-id='type-id-318'/>
+    <function-type size-in-bits='64' id='type-id-1211'>
+      <parameter type-id='type-id-1206'/>
+      <return type-id='type-id-321'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1209'>
-      <parameter type-id='type-id-1202'/>
+    <function-type size-in-bits='64' id='type-id-1213'>
+      <parameter type-id='type-id-1206'/>
       <return type-id='type-id-10'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1201'>
-      <parameter type-id='type-id-318'/>
+    <function-type size-in-bits='64' id='type-id-1205'>
+      <parameter type-id='type-id-321'/>
       <return type-id='type-id-111'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='mac.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <var-decl name='_gnutls_mac_ops' type-id='type-id-1131' visibility='default'/>
-    <var-decl name='_gnutls_digest_ops' type-id='type-id-1147' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='mac.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <var-decl name='_gnutls_mac_ops' type-id='type-id-1135' visibility='default'/>
+    <var-decl name='_gnutls_digest_ops' type-id='type-id-1151' visibility='default'/>
+    <function-decl name='nettle_pbkdf2' mangled-name='nettle_pbkdf2' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='nettle_hkdf_expand' mangled-name='nettle_hkdf_expand' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='nettle_hkdf_extract' mangled-name='nettle_hkdf_extract' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_streebog512_init' mangled-name='_gnutls_streebog512_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19479,18 +19583,18 @@
     <function-decl name='nettle_umac96_set_key' mangled-name='nettle_umac96_set_key' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_gost28147_imit_set_key' mangled-name='_gnutls_gost28147_imit_set_key' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_gost28147_imit_set_param' mangled-name='_gnutls_gost28147_imit_set_param' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_gost28147_imit_set_param' mangled-name='_gnutls_gost28147_imit_set_param' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_gost28147_imit_set_key' mangled-name='_gnutls_gost28147_imit_set_key' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_sha1_digest' mangled-name='nettle_sha1_digest' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cipher.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <var-decl name='_gnutls_cipher_ops' type-id='type-id-1123' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='cipher.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <var-decl name='_gnutls_cipher_ops' type-id='type-id-1127' visibility='default'/>
     <function-decl name='nettle_xts_aes256_decrypt_message' mangled-name='nettle_xts_aes256_decrypt_message' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19527,10 +19631,10 @@
     <function-decl name='_gnutls_gost28147_cnt_init' mangled-name='_gnutls_gost28147_cnt_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_gost28147_set_key' mangled-name='_gnutls_gost28147_set_key' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_gost28147_set_param' mangled-name='_gnutls_gost28147_set_param' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_gost28147_set_param' mangled-name='_gnutls_gost28147_set_param' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_gost28147_set_key' mangled-name='_gnutls_gost28147_set_key' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_cfb_decrypt' mangled-name='nettle_cfb_decrypt' visibility='default' binding='global' size-in-bits='64'>
@@ -19546,7 +19650,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='prf.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='prf.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='_gnutls_prf_raw' mangled-name='_gnutls_prf_raw' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_prf_raw@@GNUTLS_FIPS140_3_4'>
       <parameter type-id='type-id-31' name='mac'/>
       <parameter type-id='type-id-99' name='master_size'/>
@@ -19554,14 +19658,20 @@
       <parameter type-id='type-id-99' name='label_size'/>
       <parameter type-id='type-id-27' name='label'/>
       <parameter type-id='type-id-99' name='seed_size'/>
-      <parameter type-id='type-id-900' name='seed'/>
+      <parameter type-id='type-id-903' name='seed'/>
       <parameter type-id='type-id-99' name='outsize'/>
-      <parameter type-id='type-id-376' name='out'/>
+      <parameter type-id='type-id-379' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
+    <function-decl name='nettle_hmac_sha256_set_key' mangled-name='nettle_hmac_sha256_set_key' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='nettle_tls12_prf' mangled-name='nettle_tls12_prf' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='nettle_hmac_sha384_set_key' mangled-name='nettle_hmac_sha384_set_key' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_hmac_streebog256_set_key' mangled-name='_gnutls_hmac_streebog256_set_key' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19572,12 +19682,12 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='backport/cfb8.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='backport/cfb8.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='nettle_memxor3' mangled-name='nettle_memxor3' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='rnd.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='rnd.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='nettle_chacha_crypt' mangled-name='nettle_chacha_crypt' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19588,19 +19698,19 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='int/rsa-keygen-fips186.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <class-decl name='rsa_public_key' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-1218'>
+  <abi-instr version='1.0' address-size='64' path='int/rsa-keygen-fips186.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <class-decl name='rsa_public_key' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-1222'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='size' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='n' type-id='type-id-1219' visibility='default'/>
+        <var-decl name='n' type-id='type-id-1223' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='e' type-id='type-id-1219' visibility='default'/>
+        <var-decl name='e' type-id='type-id-1223' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1220' visibility='default' id='type-id-1221'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1224' visibility='default' id='type-id-1225'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='_mp_alloc' type-id='type-id-22' visibility='default'/>
       </data-member>
@@ -19608,52 +19718,52 @@
         <var-decl name='_mp_size' type-id='type-id-22' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='_mp_d' type-id='type-id-1222' visibility='default'/>
+        <var-decl name='_mp_d' type-id='type-id-1226' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='mp_limb_t' type-id='type-id-38' id='type-id-1223'/>
-    <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-1222'/>
-    <typedef-decl name='__mpz_struct' type-id='type-id-1221' id='type-id-1220'/>
+    <typedef-decl name='mp_limb_t' type-id='type-id-38' id='type-id-1227'/>
+    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-1226'/>
+    <typedef-decl name='__mpz_struct' type-id='type-id-1225' id='type-id-1224'/>
 
-    <array-type-def dimensions='1' type-id='type-id-1220' size-in-bits='128' id='type-id-1224'>
-      <subrange length='1' type-id='type-id-38' id='type-id-1225'/>
+    <array-type-def dimensions='1' type-id='type-id-1224' size-in-bits='128' id='type-id-1228'>
+      <subrange length='1' type-id='type-id-38' id='type-id-1229'/>
 
     </array-type-def>
-    <typedef-decl name='mpz_t' type-id='type-id-1224' id='type-id-1219'/>
-    <pointer-type-def type-id='type-id-1218' size-in-bits='64' id='type-id-1226'/>
-    <class-decl name='rsa_private_key' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-1227'>
+    <typedef-decl name='mpz_t' type-id='type-id-1228' id='type-id-1223'/>
+    <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-1230'/>
+    <class-decl name='rsa_private_key' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-1231'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='size' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='d' type-id='type-id-1219' visibility='default'/>
+        <var-decl name='d' type-id='type-id-1223' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='p' type-id='type-id-1219' visibility='default'/>
+        <var-decl name='p' type-id='type-id-1223' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='q' type-id='type-id-1219' visibility='default'/>
+        <var-decl name='q' type-id='type-id-1223' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='a' type-id='type-id-1219' visibility='default'/>
+        <var-decl name='a' type-id='type-id-1223' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='b' type-id='type-id-1219' visibility='default'/>
+        <var-decl name='b' type-id='type-id-1223' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='c' type-id='type-id-1219' visibility='default'/>
+        <var-decl name='c' type-id='type-id-1223' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-1228'/>
-    <typedef-decl name='nettle_progress_func' type-id='type-id-1229' id='type-id-1230'/>
-    <pointer-type-def type-id='type-id-1230' size-in-bits='64' id='type-id-1231'/>
+    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1232'/>
+    <typedef-decl name='nettle_progress_func' type-id='type-id-1233' id='type-id-1234'/>
+    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-1235'/>
     <function-decl name='_rsa_generate_fips186_4_keypair' mangled-name='_rsa_generate_fips186_4_keypair' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_rsa_generate_fips186_4_keypair@@GNUTLS_FIPS140_3_4'>
-      <parameter type-id='type-id-1226' name='pub'/>
-      <parameter type-id='type-id-1228' name='key'/>
+      <parameter type-id='type-id-1230' name='pub'/>
+      <parameter type-id='type-id-1232' name='key'/>
       <parameter type-id='type-id-10' name='seed_length'/>
-      <parameter type-id='type-id-191' name='seed'/>
+      <parameter type-id='type-id-192' name='seed'/>
       <parameter type-id='type-id-101' name='progress_ctx'/>
-      <parameter type-id='type-id-1231' name='progress'/>
+      <parameter type-id='type-id-1235' name='progress'/>
       <parameter type-id='type-id-10' name='n_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -19681,13 +19791,13 @@
     <function-decl name='__gmpz_gcd' mangled-name='__gmpz_gcd' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1229'>
+    <function-type size-in-bits='64' id='type-id-1233'>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-22'/>
       <return type-id='type-id-111'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='int/provable-prime.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='int/provable-prime.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='__gmpz_fdiv_r_2exp' mangled-name='__gmpz_fdiv_r_2exp' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19695,50 +19805,50 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='int/dsa-keygen-fips186.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <class-decl name='dsa_params' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1232'>
+  <abi-instr version='1.0' address-size='64' path='int/dsa-keygen-fips186.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <class-decl name='dsa_params' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1236'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='p' type-id='type-id-1219' visibility='default'/>
+        <var-decl name='p' type-id='type-id-1223' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='q' type-id='type-id-1219' visibility='default'/>
+        <var-decl name='q' type-id='type-id-1223' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='g' type-id='type-id-1219' visibility='default'/>
+        <var-decl name='g' type-id='type-id-1223' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1232' size-in-bits='64' id='type-id-1233'/>
-    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-1234'/>
-    <typedef-decl name='nettle_random_func' type-id='type-id-1144' id='type-id-1235'/>
-    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-1236'/>
+    <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-1237'/>
+    <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-1238'/>
+    <typedef-decl name='nettle_random_func' type-id='type-id-1148' id='type-id-1239'/>
+    <pointer-type-def type-id='type-id-1239' size-in-bits='64' id='type-id-1240'/>
     <function-decl name='dsa_generate_dss_keypair' mangled-name='dsa_generate_dss_keypair' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dsa_generate_dss_keypair@@GNUTLS_FIPS140_3_4'>
-      <parameter type-id='type-id-1233' name='params'/>
-      <parameter type-id='type-id-1234' name='y'/>
-      <parameter type-id='type-id-1234' name='x'/>
+      <parameter type-id='type-id-1237' name='params'/>
+      <parameter type-id='type-id-1238' name='y'/>
+      <parameter type-id='type-id-1238' name='x'/>
       <parameter type-id='type-id-101' name='random_ctx'/>
-      <parameter type-id='type-id-1236' name='random'/>
+      <parameter type-id='type-id-1240' name='random'/>
       <parameter type-id='type-id-101' name='progress_ctx'/>
-      <parameter type-id='type-id-1231' name='progress'/>
+      <parameter type-id='type-id-1235' name='progress'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <class-decl name='dss_params_validation_seeds' size-in-bits='6400' is-struct='yes' visibility='default' id='type-id-1237'>
+    <class-decl name='dss_params_validation_seeds' size-in-bits='6400' is-struct='yes' visibility='default' id='type-id-1241'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='seed_length' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='seed' type-id='type-id-1238' visibility='default'/>
+        <var-decl name='seed' type-id='type-id-1242' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
         <var-decl name='pseed_length' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2144'>
-        <var-decl name='pseed' type-id='type-id-1238' visibility='default'/>
+        <var-decl name='pseed' type-id='type-id-1242' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
         <var-decl name='qseed_length' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4256'>
-        <var-decl name='qseed' type-id='type-id-1238' visibility='default'/>
+        <var-decl name='qseed' type-id='type-id-1242' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6336'>
         <var-decl name='pgen_counter' type-id='type-id-10' visibility='default'/>
@@ -19748,28 +19858,28 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2056' id='type-id-1238'>
-      <subrange length='257' type-id='type-id-38' id='type-id-1239'/>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2056' id='type-id-1242'>
+      <subrange length='257' type-id='type-id-38' id='type-id-1243'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-1240'/>
+    <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-1244'/>
     <function-decl name='_dsa_generate_dss_pq' mangled-name='_dsa_generate_dss_pq' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_dsa_generate_dss_pq@@GNUTLS_FIPS140_3_4'>
-      <parameter type-id='type-id-1233' name='params'/>
-      <parameter type-id='type-id-1240' name='cert'/>
+      <parameter type-id='type-id-1237' name='params'/>
+      <parameter type-id='type-id-1244' name='cert'/>
       <parameter type-id='type-id-10' name='seed_length'/>
       <parameter type-id='type-id-101' name='seed'/>
       <parameter type-id='type-id-101' name='progress_ctx'/>
-      <parameter type-id='type-id-1231' name='progress'/>
+      <parameter type-id='type-id-1235' name='progress'/>
       <parameter type-id='type-id-10' name='p_bits'/>
       <parameter type-id='type-id-10' name='q_bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_dsa_generate_dss_g' mangled-name='_dsa_generate_dss_g' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_dsa_generate_dss_g@@GNUTLS_FIPS140_3_4'>
-      <parameter type-id='type-id-1233' name='params'/>
+      <parameter type-id='type-id-1237' name='params'/>
       <parameter type-id='type-id-10' name='domain_seed_size'/>
-      <parameter type-id='type-id-900' name='domain_seed'/>
+      <parameter type-id='type-id-903' name='domain_seed'/>
       <parameter type-id='type-id-101' name='progress_ctx'/>
-      <parameter type-id='type-id-1231' name='progress'/>
+      <parameter type-id='type-id-1235' name='progress'/>
       <parameter type-id='type-id-10' name='index'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -19777,16 +19887,16 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='int/dsa-validate.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='int/dsa-validate.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='_dsa_validate_dss_pq' mangled-name='_dsa_validate_dss_pq' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_dsa_validate_dss_pq@@GNUTLS_FIPS140_3_4'>
-      <parameter type-id='type-id-1233' name='pub'/>
-      <parameter type-id='type-id-1240' name='cert'/>
+      <parameter type-id='type-id-1237' name='pub'/>
+      <parameter type-id='type-id-1244' name='cert'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_dsa_validate_dss_g' mangled-name='_dsa_validate_dss_g' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_dsa_validate_dss_g@@GNUTLS_FIPS140_3_4'>
-      <parameter type-id='type-id-1233' name='pub'/>
+      <parameter type-id='type-id-1237' name='pub'/>
       <parameter type-id='type-id-10' name='domain_seed_size'/>
-      <parameter type-id='type-id-900' name='domain_seed'/>
+      <parameter type-id='type-id-903' name='domain_seed'/>
       <parameter type-id='type-id-10' name='index'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -19800,7 +19910,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='int/tls1-prf.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='int/tls1-prf.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='nettle_hmac_md5_set_key' mangled-name='nettle_hmac_md5_set_key' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19808,7 +19918,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='int/dsa-compute-k.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='int/dsa-compute-k.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='__gmpn_rshift' mangled-name='__gmpn_rshift' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19840,73 +19950,70 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='int/ecdsa-compute-k.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='int/ecdsa-compute-k.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='__gmpz_init_set_str' mangled-name='__gmpz_init_set_str' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='sysrng-linux.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-1242'/>
-    <typedef-decl name='get_entropy_func' type-id='type-id-1242' id='type-id-1243'/>
-    <var-decl name='_rnd_get_system_entropy' type-id='type-id-1243' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='sysrng-linux.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-1246'/>
+    <typedef-decl name='get_entropy_func' type-id='type-id-1246' id='type-id-1247'/>
+    <var-decl name='_rnd_get_system_entropy' type-id='type-id-1247' visibility='default'/>
     <function-decl name='close' mangled-name='close' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='strerror' mangled-name='strerror' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='read' mangled-name='read' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__read_alias' mangled-name='read' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='getrandom' mangled-name='getrandom' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='open' mangled-name='open' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__open_alias' mangled-name='open' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='fcntl' mangled-name='fcntl' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1241'>
+    <function-type size-in-bits='64' id='type-id-1245'>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/gost28147.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <class-decl name='gost28147_param' size-in-bits='32800' is-struct='yes' visibility='default' id='type-id-1244'>
+  <abi-instr version='1.0' address-size='64' path='gost/gost28147.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <class-decl name='gost28147_param' size-in-bits='32800' is-struct='yes' visibility='default' id='type-id-1248'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='key_meshing' type-id='type-id-22' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='sbox' type-id='type-id-1245' visibility='default'/>
+        <var-decl name='sbox' type-id='type-id-1249' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='32768' id='type-id-1245'>
-      <subrange length='1024' type-id='type-id-38' id='type-id-1246'/>
+    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='32768' id='type-id-1249'>
+      <subrange length='1024' type-id='type-id-38' id='type-id-1250'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-1244' const='yes' id='type-id-1247'/>
-    <var-decl name='_gnutls_gost28147_param_test_3411' type-id='type-id-1247' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_3411' type-id='type-id-1247' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_Test_89' type-id='type-id-1247' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_A' type-id='type-id-1247' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_B' type-id='type-id-1247' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_C' type-id='type-id-1247' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_D' type-id='type-id-1247' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_TC26_Z' type-id='type-id-1247' visibility='default'/>
+    <qualified-type-def type-id='type-id-1248' const='yes' id='type-id-1251'/>
+    <var-decl name='_gnutls_gost28147_param_test_3411' type-id='type-id-1251' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_3411' type-id='type-id-1251' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_Test_89' type-id='type-id-1251' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_A' type-id='type-id-1251' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_B' type-id='type-id-1251' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_C' type-id='type-id-1251' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_D' type-id='type-id-1251' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_TC26_Z' type-id='type-id-1251' visibility='default'/>
     <function-decl name='_nettle_write_le32' mangled-name='_nettle_write_le32' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/gost-wrap.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/gost-wrap.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='_gnutls_gost28147_decrypt' mangled-name='_gnutls_gost28147_decrypt' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_gost28147_imit_init' mangled-name='_gnutls_gost28147_imit_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
     <function-decl name='_gnutls_gost28147_imit_set_nonce' mangled-name='_gnutls_gost28147_imit_set_nonce' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19923,29 +20030,29 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/gosthash94.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/gosthash94.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='_gnutls_gost28147_encrypt_simple' mangled-name='_gnutls_gost28147_encrypt_simple' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/gosthash94-meta.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <var-decl name='_gnutls_gosthash94cp' type-id='type-id-1146' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='gost/gosthash94-meta.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <var-decl name='_gnutls_gosthash94cp' type-id='type-id-1150' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/streebog-meta.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <var-decl name='_gnutls_streebog512' type-id='type-id-1146' visibility='default'/>
-    <var-decl name='_gnutls_streebog256' type-id='type-id-1146' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='gost/streebog-meta.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <var-decl name='_gnutls_streebog512' type-id='type-id-1150' visibility='default'/>
+    <var-decl name='_gnutls_streebog256' type-id='type-id-1150' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/hmac-gosthash94.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/hmac-gosthash94.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='_gnutls_gosthash94cp_update' mangled-name='_gnutls_gosthash94cp_update' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/hmac-streebog.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/hmac-streebog.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='_gnutls_streebog512_update' mangled-name='_gnutls_streebog512_update' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/bignum-le.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/bignum-le.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='__gmpz_import' mangled-name='__gmpz_import' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19953,15 +20060,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/pbkdf2-hmac-gosthash94.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <function-decl name='_gnutls_hmac_gosthash94cp_set_key' mangled-name='_gnutls_hmac_gosthash94cp_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='nettle_pbkdf2' mangled-name='nettle_pbkdf2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/ecc-gostdsa-sign.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/ecc-gostdsa-sign.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='_gnutls_gost_hash' mangled-name='_gnutls_gost_hash' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19975,18 +20074,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-mask.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <function-decl name='__gmpz_roinit_n' mangled-name='__gmpz_roinit_n' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='__gmpz_tdiv_r_2exp' mangled-name='__gmpz_tdiv_r_2exp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='__gmpz_tdiv_q_2exp' mangled-name='__gmpz_tdiv_q_2exp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-sign.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-sign.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='_nettle_ecc_mod_random' mangled-name='_nettle_ecc_mod_random' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19994,7 +20082,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-verify.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-verify.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='_gnutls_ecc_gostdsa_verify_itch' mangled-name='_gnutls_ecc_gostdsa_verify_itch' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -20011,15 +20099,28 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-vko.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/ecc-gost-hash.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='_nettle_mpn_set_base256_le' mangled-name='_nettle_mpn_set_base256_le' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-mask.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='__gmpz_roinit_n' mangled-name='__gmpz_roinit_n' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpz_tdiv_r_2exp' mangled-name='__gmpz_tdiv_r_2exp' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpz_tdiv_q_2exp' mangled-name='__gmpz_tdiv_q_2exp' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-vko.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='_nettle_mpn_get_base256_le' mangled-name='_nettle_mpn_get_base256_le' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost_keywrap.c' comp-dir-path='/home/nmav/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost_keywrap.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
     <function-decl name='_gnutls_gost28147_key_unwrap_cryptopro' mangled-name='_gnutls_gost28147_key_unwrap_cryptopro' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -20027,4 +20128,380 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/gmp-glue.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='__gmp_get_memory_functions' mangled-name='__gmp_get_memory_functions' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpz_limbs_modify' mangled-name='__gmpz_limbs_modify' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/sha3.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='gnutls_nettle_curve448_sha3_permute' mangled-name='gnutls_nettle_curve448_sha3_permute' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/sha3-256.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='_nettle_sha3_pad' mangled-name='_nettle_sha3_pad' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_nettle_write_le64' mangled-name='_nettle_write_le64' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_nettle_sha3_update' mangled-name='_nettle_sha3_update' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/shake256.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='gnutls_nettle_curve448_sha3_256_init' mangled-name='gnutls_nettle_curve448_sha3_256_init' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/ecc-add-eh.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='_gnutls_nettle_curve448_ecc_mod_mul' mangled-name='_gnutls_nettle_curve448_ecc_mod_mul' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_nettle_curve448_ecc_mod_add' mangled-name='_gnutls_nettle_curve448_ecc_mod_add' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_nettle_curve448_ecc_mod_sub' mangled-name='_gnutls_nettle_curve448_ecc_mod_sub' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_nettle_curve448_ecc_mod_sqr' mangled-name='_gnutls_nettle_curve448_ecc_mod_sqr' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/ecc-eh-to-a.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='_gnutls_nettle_curve448_cnd_copy' mangled-name='_gnutls_nettle_curve448_cnd_copy' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/ecc-mul-a-eh.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='_gnutls_nettle_curve448_sec_tabselect' mangled-name='_gnutls_nettle_curve448_sec_tabselect' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_nettle_curve448_ecc_a_to_j' mangled-name='_gnutls_nettle_curve448_ecc_a_to_j' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/ecc-mul-m.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='_gnutls_nettle_curve448_cnd_swap' mangled-name='_gnutls_nettle_curve448_cnd_swap' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_nettle_curve448_ecc_mod_addmul_1' mangled-name='_gnutls_nettle_curve448_ecc_mod_addmul_1' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/ecc-mod.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='__gmpn_addmul_1' mangled-name='__gmpn_addmul_1' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpn_add_n' mangled-name='__gmpn_add_n' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_nettle_curve448_sec_add_1' mangled-name='_gnutls_nettle_curve448_sec_add_1' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/ecc-mod-arith.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='__gmpn_sqr' mangled-name='__gmpn_sqr' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpn_mul_n' mangled-name='__gmpn_mul_n' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpn_submul_1' mangled-name='__gmpn_submul_1' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpn_cnd_sub_n' mangled-name='__gmpn_cnd_sub_n' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpn_mul_1' mangled-name='__gmpn_mul_1' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/ecc-a-to-j.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='__gmpn_copyd' mangled-name='__gmpn_copyd' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/ecc-curve448.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <class-decl name='ecc_curve' size-in-bits='2240' is-struct='yes' visibility='default' id='type-id-1252'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='p' type-id='type-id-1253' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='q' type-id='type-id-1253' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1408'>
+        <var-decl name='use_redc' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1424'>
+        <var-decl name='pippenger_k' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1440'>
+        <var-decl name='pippenger_c' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1456'>
+        <var-decl name='add_hh_itch' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1472'>
+        <var-decl name='add_hhh_itch' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1488'>
+        <var-decl name='dup_itch' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1504'>
+        <var-decl name='mul_itch' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1520'>
+        <var-decl name='mul_g_itch' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1536'>
+        <var-decl name='h_to_a_itch' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1600'>
+        <var-decl name='add_hh' type-id='type-id-1254' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1664'>
+        <var-decl name='add_hhh' type-id='type-id-1254' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1728'>
+        <var-decl name='dup' type-id='type-id-1255' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1792'>
+        <var-decl name='mul' type-id='type-id-1256' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1856'>
+        <var-decl name='mul_g' type-id='type-id-1257' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1920'>
+        <var-decl name='h_to_a' type-id='type-id-1258' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1984'>
+        <var-decl name='b' type-id='type-id-1259' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2048'>
+        <var-decl name='g' type-id='type-id-1259' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2112'>
+        <var-decl name='unit' type-id='type-id-1259' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='2176'>
+        <var-decl name='pippenger_table' type-id='type-id-1259' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='ecc_modulo' size-in-bits='704' is-struct='yes' visibility='default' id='type-id-1253'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='bit_size' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='16'>
+        <var-decl name='size' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='B_size' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='48'>
+        <var-decl name='redc_size' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='invert_itch' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='80'>
+        <var-decl name='sqrt_itch' type-id='type-id-24' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='m' type-id='type-id-1259' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='B' type-id='type-id-1259' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='B_shifted' type-id='type-id-1259' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='redc_mpm1' type-id='type-id-1259' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='mp1h' type-id='type-id-1259' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='mod' type-id='type-id-1260' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='reduce' type-id='type-id-1260' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='invert' type-id='type-id-1261' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='sqrt' type-id='type-id-1262' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <qualified-type-def type-id='type-id-1227' const='yes' id='type-id-1263'/>
+    <pointer-type-def type-id='type-id-1263' size-in-bits='64' id='type-id-1259'/>
+    <qualified-type-def type-id='type-id-1253' const='yes' id='type-id-1264'/>
+    <pointer-type-def type-id='type-id-1264' size-in-bits='64' id='type-id-1265'/>
+    <typedef-decl name='ecc_mod_func' type-id='type-id-1266' id='type-id-1267'/>
+    <pointer-type-def type-id='type-id-1267' size-in-bits='64' id='type-id-1260'/>
+    <typedef-decl name='ecc_mod_inv_func' type-id='type-id-1268' id='type-id-1269'/>
+    <pointer-type-def type-id='type-id-1269' size-in-bits='64' id='type-id-1261'/>
+    <typedef-decl name='ecc_mod_sqrt_func' type-id='type-id-1270' id='type-id-1271'/>
+    <pointer-type-def type-id='type-id-1271' size-in-bits='64' id='type-id-1262'/>
+    <qualified-type-def type-id='type-id-1252' const='yes' id='type-id-1272'/>
+    <pointer-type-def type-id='type-id-1272' size-in-bits='64' id='type-id-1273'/>
+    <typedef-decl name='ecc_add_func' type-id='type-id-1274' id='type-id-1275'/>
+    <pointer-type-def type-id='type-id-1275' size-in-bits='64' id='type-id-1254'/>
+    <typedef-decl name='ecc_dup_func' type-id='type-id-1276' id='type-id-1277'/>
+    <pointer-type-def type-id='type-id-1277' size-in-bits='64' id='type-id-1255'/>
+    <typedef-decl name='ecc_mul_func' type-id='type-id-1274' id='type-id-1278'/>
+    <pointer-type-def type-id='type-id-1278' size-in-bits='64' id='type-id-1256'/>
+    <typedef-decl name='ecc_mul_g_func' type-id='type-id-1276' id='type-id-1279'/>
+    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-1257'/>
+    <typedef-decl name='ecc_h_to_a_func' type-id='type-id-1280' id='type-id-1281'/>
+    <pointer-type-def type-id='type-id-1281' size-in-bits='64' id='type-id-1258'/>
+    <var-decl name='_nettle_curve448' type-id='type-id-1272' visibility='default'/>
+    <function-type size-in-bits='64' id='type-id-1270'>
+      <parameter type-id='type-id-1265'/>
+      <parameter type-id='type-id-1226'/>
+      <parameter type-id='type-id-1259'/>
+      <parameter type-id='type-id-1259'/>
+      <parameter type-id='type-id-1226'/>
+      <return type-id='type-id-22'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1280'>
+      <parameter type-id='type-id-1273'/>
+      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-1226'/>
+      <parameter type-id='type-id-1259'/>
+      <parameter type-id='type-id-1226'/>
+      <return type-id='type-id-111'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1274'>
+      <parameter type-id='type-id-1273'/>
+      <parameter type-id='type-id-1226'/>
+      <parameter type-id='type-id-1259'/>
+      <parameter type-id='type-id-1259'/>
+      <parameter type-id='type-id-1226'/>
+      <return type-id='type-id-111'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1276'>
+      <parameter type-id='type-id-1273'/>
+      <parameter type-id='type-id-1226'/>
+      <parameter type-id='type-id-1259'/>
+      <parameter type-id='type-id-1226'/>
+      <return type-id='type-id-111'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1266'>
+      <parameter type-id='type-id-1265'/>
+      <parameter type-id='type-id-1226'/>
+      <return type-id='type-id-111'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1268'>
+      <parameter type-id='type-id-1265'/>
+      <parameter type-id='type-id-1226'/>
+      <parameter type-id='type-id-1259'/>
+      <parameter type-id='type-id-1226'/>
+      <return type-id='type-id-111'/>
+    </function-type>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/curve448-mul.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='_gnutls_nettle_curve448_gmp_alloc_limbs' mangled-name='_gnutls_nettle_curve448_gmp_alloc_limbs' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_nettle_curve448_mpn_set_base256_le' mangled-name='_gnutls_nettle_curve448_mpn_set_base256_le' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_nettle_curve448_ecc_mul_m' mangled-name='_gnutls_nettle_curve448_ecc_mul_m' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_nettle_curve448_mpn_get_base256_le' mangled-name='_gnutls_nettle_curve448_mpn_get_base256_le' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_nettle_curve448_gmp_free_limbs' mangled-name='_gnutls_nettle_curve448_gmp_free_limbs' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/curve448-mul-g.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='_gnutls_nettle_curve448_ecc_mul_g_eh' mangled-name='_gnutls_nettle_curve448_ecc_mul_g_eh' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_nettle_curve448_curve448_eh_to_x' mangled-name='_gnutls_nettle_curve448_curve448_eh_to_x' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/eddsa-pubkey.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='_nettle_eddsa_compress' mangled-name='_nettle_eddsa_compress' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_nettle_eddsa_compress_itch' mangled-name='_nettle_eddsa_compress_itch' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/eddsa-sign.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='_nettle_eddsa_hash' mangled-name='_nettle_eddsa_hash' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/eddsa-verify.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='_nettle_eddsa_decompress' mangled-name='_nettle_eddsa_decompress' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_nettle_eddsa_decompress_itch' mangled-name='_nettle_eddsa_decompress_itch' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/ed448-shake256.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <class-decl name='ecc_eddsa' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-1282'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='update' type-id='type-id-1143' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='digest' type-id='type-id-1144' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='dom' type-id='type-id-1283' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='low_mask' type-id='type-id-1227' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='high_bit' type-id='type-id-1227' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='nettle_eddsa_dom_func' type-id='type-id-120' id='type-id-1284'/>
+    <pointer-type-def type-id='type-id-1284' size-in-bits='64' id='type-id-1283'/>
+    <qualified-type-def type-id='type-id-1282' const='yes' id='type-id-1285'/>
+    <var-decl name='_nettle_ed448_shake256' type-id='type-id-1285' visibility='default'/>
+    <function-decl name='gnutls_nettle_curve448_sha3_256_update' mangled-name='gnutls_nettle_curve448_sha3_256_update' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/ed448-shake256-pubkey.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='_nettle_eddsa_public_key_itch' mangled-name='_nettle_eddsa_public_key_itch' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_nettle_eddsa_expand_key' mangled-name='_nettle_eddsa_expand_key' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_nettle_eddsa_public_key' mangled-name='_nettle_eddsa_public_key' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/ed448-shake256-sign.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='_nettle_eddsa_sign_itch' mangled-name='_nettle_eddsa_sign_itch' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_nettle_eddsa_sign' mangled-name='_nettle_eddsa_sign' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='curve448/ed448-shake256-verify.c' comp-dir-path='/root/gnutls/lib/nettle' language='LANG_C99'>
+    <function-decl name='_nettle_eddsa_verify_itch' mangled-name='_nettle_eddsa_verify_itch' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_nettle_eddsa_verify' mangled-name='_nettle_eddsa_verify' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+  </abi-instr>
 </abi-corpus>