abi: updated to latest const changes and added NEWS entrytmp-more-const-1

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
author: Nikos Mavrogiannopoulos <nmav@gnutls.org> 2019-12-07 21:30:17 +0100
committer: Nikos Mavrogiannopoulos <nmav@redhat.com> 2019-12-10 11:50:54 +0100
commit: e48290a51da19288986bd7aaca265ea62b054dc8 (patch)
tree: b42cf124be667faa7d7b89cae57e0356d5c3c999
parent: 26c410bc6ac144d8300d53b1a3f39ffd4f75c6ac (diff)
download: gnutls-tmp-more-const-1.tar.gz
7 files changed, 10692 insertions, 10002 deletions
diff --git a/NEWS b/NEWS
index 38dcba2d14..85398a7f69 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,15 @@ Copyright (C) 2000-2016 Free Software Foundation, Inc.
 Copyright (C) 2013-2019 Nikos Mavrogiannopoulos
 See the end for copying conditions.
 
+* Version 3.6.12 (unreleased)
+
+** libgnutls: Introduced the gnutls_ocsp_req_const_t which is compatible
+   with gnutls_ocsp_req_t but const.
+
+** API and ABI modifications:
+gnutls_ocsp_req_const_t: Added
+
+
 * Version 3.6.11 (released 2019-12-01)
 
 ** libgnutls: Use KERN_ARND for the system random number generator on NetBSD.
diff --git a/configure.ac b/configure.ac
index db1ce841f3..aaeb6bfb58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.63)
 
 dnl when updating version also update LT_REVISION in m4/hooks.m4
-AC_INIT([GnuTLS], [3.6.11], [bugs@gnutls.org])
+AC_INIT([GnuTLS], [3.6.12], [bugs@gnutls.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIRS([m4 src/gl/m4 src/libopts/m4 lib/unistring/m4])
 AC_CANONICAL_HOST
diff --git a/devel/libdane-3.6.7-x86_64.abi b/devel/libdane-3.6.12-x86_64.abi
index 80492aa6ef..903a3b1d22 100644
--- a/devel/libdane-3.6.7-x86_64.abi
+++ b/devel/libdane-3.6.12-x86_64.abi
@@ -6,8 +6,8 @@
     <dependency name='libunistring.so.2'/>
     <dependency name='libdl.so.2'/>
     <dependency name='libtasn1.so.6'/>
-    <dependency name='libnettle.so.6'/>
-    <dependency name='libhogweed.so.4'/>
+    <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'/>
@@ -32,7 +32,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/nmavrogi/cvs/gnutls-nmav/libdane' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dane.c' comp-dir-path='/home/nmavrogi/cvs/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 +65,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='52288' is-struct='yes' visibility='default' id='type-id-13'>
+    <class-decl name='gnutls_session_int' size-in-bits='52736' 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 +75,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='29952'>
+      <data-member access='public' layout-offset-in-bits='30080'>
         <var-decl name='key' type-id='type-id-17' visibility='default'/>
       </data-member>
     </class-decl>
@@ -128,13 +128,19 @@
       <data-member access='public' layout-offset-in-bits='1568'>
         <var-decl name='max_record_recv_size' type-id='type-id-19' visibility='default'/>
       </data-member>
+      <data-member access='public' layout-offset-in-bits='1584'>
+        <var-decl name='max_user_record_send_size' type-id='type-id-19' visibility='default'/>
+      </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='max_early_data_size' type-id='type-id-26' visibility='default'/>
+        <var-decl name='max_user_record_recv_size' type-id='type-id-19' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1632'>
-        <var-decl name='client_ctype' type-id='type-id-27' visibility='default'/>
+        <var-decl name='max_early_data_size' type-id='type-id-26' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
+        <var-decl name='client_ctype' type-id='type-id-27' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1696'>
         <var-decl name='server_ctype' type-id='type-id-27' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
@@ -253,6 +259,7 @@
       <enumerator name='GNUTLS_CIPHER_AES_256_CFB8' value='31'/>
       <enumerator name='GNUTLS_CIPHER_AES_128_XTS' value='32'/>
       <enumerator name='GNUTLS_CIPHER_AES_256_XTS' value='33'/>
+      <enumerator name='GNUTLS_CIPHER_GOST28147_TC26Z_CNT' value='34'/>
       <enumerator name='GNUTLS_CIPHER_IDEA_PGP_CFB' value='200'/>
       <enumerator name='GNUTLS_CIPHER_3DES_PGP_CFB' value='201'/>
       <enumerator name='GNUTLS_CIPHER_CAST5_PGP_CFB' value='202'/>
@@ -282,6 +289,7 @@
       <enumerator name='GNUTLS_KX_ECDHE_ECDSA' value='13'/>
       <enumerator name='GNUTLS_KX_ECDHE_PSK' value='14'/>
       <enumerator name='GNUTLS_KX_RSA_PSK' value='15'/>
+      <enumerator name='GNUTLS_KX_VKO_GOST_12' value='16'/>
     </enum-decl>
     <typedef-decl name='gnutls_kx_algorithm_t' type-id='type-id-49' id='type-id-37'/>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-50'>
@@ -309,6 +317,10 @@
       <enumerator name='GNUTLS_MAC_UMAC_128' value='202'/>
       <enumerator name='GNUTLS_MAC_AES_CMAC_128' value='203'/>
       <enumerator name='GNUTLS_MAC_AES_CMAC_256' value='204'/>
+      <enumerator name='GNUTLS_MAC_AES_GMAC_128' value='205'/>
+      <enumerator name='GNUTLS_MAC_AES_GMAC_192' value='206'/>
+      <enumerator name='GNUTLS_MAC_AES_GMAC_256' value='207'/>
+      <enumerator name='GNUTLS_MAC_GOST28147_TC26Z_IMIT' value='208'/>
     </enum-decl>
     <typedef-decl name='gnutls_mac_algorithm_t' type-id='type-id-50' id='type-id-38'/>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-51'>
@@ -359,7 +371,7 @@
         <var-decl name='block_size' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='preimage_insecure' type-id='type-id-2' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
     <typedef-decl name='mac_entry_st' type-id='type-id-53' id='type-id-54'/>
@@ -389,7 +401,7 @@
       <enumerator name='GNUTLS_CRT_MAX' value='3'/>
     </enum-decl>
     <typedef-decl name='gnutls_certificate_type_t' type-id='type-id-61' id='type-id-27'/>
-    <class-decl name='gnutls_group_entry_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-62'>
+    <class-decl name='gnutls_group_entry_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-62'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-34' visibility='default'/>
       </data-member>
@@ -400,18 +412,21 @@
         <var-decl name='prime' type-id='type-id-64' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='generator' type-id='type-id-64' visibility='default'/>
+        <var-decl name='q' type-id='type-id-64' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='q_bits' type-id='type-id-65' visibility='default'/>
+        <var-decl name='generator' type-id='type-id-64' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='q_bits' type-id='type-id-65' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='curve' type-id='type-id-66' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='352'>
+      <data-member access='public' layout-offset-in-bits='416'>
         <var-decl name='pk' type-id='type-id-67' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
+      <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='tls_id' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
@@ -424,6 +439,13 @@
       <enumerator name='GNUTLS_GROUP_SECP384R1' value='3'/>
       <enumerator name='GNUTLS_GROUP_SECP521R1' value='4'/>
       <enumerator name='GNUTLS_GROUP_X25519' value='6'/>
+      <enumerator name='GNUTLS_GROUP_GC256A' value='16'/>
+      <enumerator name='GNUTLS_GROUP_GC256B' value='17'/>
+      <enumerator name='GNUTLS_GROUP_GC256C' value='18'/>
+      <enumerator name='GNUTLS_GROUP_GC256D' value='19'/>
+      <enumerator name='GNUTLS_GROUP_GC512A' value='13'/>
+      <enumerator name='GNUTLS_GROUP_GC512B' value='14'/>
+      <enumerator name='GNUTLS_GROUP_GC512C' value='15'/>
       <enumerator name='GNUTLS_GROUP_FFDHE2048' value='256'/>
       <enumerator name='GNUTLS_GROUP_FFDHE3072' value='257'/>
       <enumerator name='GNUTLS_GROUP_FFDHE4096' value='258'/>
@@ -453,7 +475,12 @@
       <enumerator name='GNUTLS_ECC_CURVE_GOST256CPXB' value='12'/>
       <enumerator name='GNUTLS_ECC_CURVE_GOST512A' value='13'/>
       <enumerator name='GNUTLS_ECC_CURVE_GOST512B' value='14'/>
-      <enumerator name='GNUTLS_ECC_CURVE_MAX' value='14'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST512C' value='15'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST256A' value='16'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST256B' value='17'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST256C' value='18'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST256D' value='19'/>
+      <enumerator name='GNUTLS_ECC_CURVE_MAX' value='19'/>
     </enum-decl>
     <typedef-decl name='gnutls_ecc_curve_t' type-id='type-id-71' id='type-id-66'/>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-72'>
@@ -594,7 +621,7 @@
     <qualified-type-def type-id='type-id-76' const='yes' id='type-id-81'/>
     <pointer-type-def type-id='type-id-81' size-in-bits='64' id='type-id-30'/>
     <typedef-decl name='security_parameters_st' type-id='type-id-18' id='type-id-14'/>
-    <class-decl name='record_parameters_st' size-in-bits='5248' is-struct='yes' visibility='default' id='type-id-82'>
+    <class-decl name='record_parameters_st' size-in-bits='5504' is-struct='yes' visibility='default' id='type-id-82'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='epoch' type-id='type-id-19' visibility='default'/>
       </data-member>
@@ -622,10 +649,10 @@
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='read' type-id='type-id-85' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2816'>
+      <data-member access='public' layout-offset-in-bits='2944'>
         <var-decl name='write' type-id='type-id-85' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='5184'>
+      <data-member access='public' layout-offset-in-bits='5440'>
         <var-decl name='usage_cnt' type-id='type-id-1' visibility='default'/>
       </data-member>
     </class-decl>
@@ -658,13 +685,7 @@
         <var-decl name='tagsize' type-id='type-id-19' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='xor_nonce' type-id='type-id-79' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='232'>
-        <var-decl name='only_aead' type-id='type-id-79' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='240'>
-        <var-decl name='no_rekey' type-id='type-id-79' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-88'>
@@ -679,7 +700,7 @@
     <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-83'/>
     <typedef-decl name='__uint64_t' type-id='type-id-44' id='type-id-91'/>
     <typedef-decl name='uint64_t' type-id='type-id-91' id='type-id-84'/>
-    <class-decl name='record_state_st' size-in-bits='2368' is-struct='yes' visibility='default' id='type-id-92'>
+    <class-decl name='record_state_st' size-in-bits='2496' is-struct='yes' visibility='default' id='type-id-92'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='mac_key' type-id='type-id-93' visibility='default'/>
       </data-member>
@@ -701,104 +722,111 @@
       <data-member access='public' layout-offset-in-bits='1024'>
         <var-decl name='ctx' type-id='type-id-95' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2240'>
+      <data-member access='public' layout-offset-in-bits='2368'>
         <var-decl name='aead_tag_size' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2272'>
+      <data-member access='public' layout-offset-in-bits='2400'>
         <var-decl name='is_aead' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='sequence_number' type-id='type-id-96' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='2432'>
+        <var-decl name='sequence_number' type-id='type-id-84' visibility='default'/>
       </data-member>
     </class-decl>
 
     <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='512' id='type-id-93'>
-      <subrange length='64' type-id='type-id-44' id='type-id-97'/>
+      <subrange length='64' type-id='type-id-44' id='type-id-96'/>
 
     </array-type-def>
 
     <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='128' id='type-id-94'>
-      <subrange length='16' type-id='type-id-44' id='type-id-98'/>
+      <subrange length='16' type-id='type-id-44' id='type-id-97'/>
 
     </array-type-def>
-    <union-decl name='__anonymous_union__' size-in-bits='1216' is-anonymous='yes' visibility='default' id='type-id-95'>
+    <union-decl name='__anonymous_union__' size-in-bits='1344' is-anonymous='yes' visibility='default' id='type-id-95'>
       <data-member access='private'>
-        <var-decl name='tls12' type-id='type-id-99' visibility='default'/>
+        <var-decl name='tls12' type-id='type-id-98' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='aead' type-id='type-id-100' visibility='default'/>
+        <var-decl name='aead' type-id='type-id-99' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='1216' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-99' visibility='default' id='type-id-101'>
+    <class-decl name='__anonymous_struct__' size-in-bits='1344' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-98' visibility='default' id='type-id-100'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cipher' type-id='type-id-102' visibility='default'/>
+        <var-decl name='cipher' type-id='type-id-101' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='mac' type-id='type-id-103' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='mac' type-id='type-id-102' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='is_mac' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='30'>
-        <var-decl name='non_null' type-id='type-id-2' visibility='default'/>
+        <var-decl name='continuous_mac' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='29'>
+        <var-decl name='non_null' type-id='type-id-2' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='28'>
         <var-decl name='etm' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='tag_size' type-id='type-id-104' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='1280'>
+        <var-decl name='tag_size' type-id='type-id-103' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='640' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-102' visibility='default' id='type-id-105'>
+    <class-decl name='__anonymous_struct__' size-in-bits='704' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-101' visibility='default' id='type-id-104'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='handle' type-id='type-id-106' visibility='default'/>
+        <var-decl name='handle' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='e' type-id='type-id-83' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='encrypt' type-id='type-id-107' visibility='default'/>
+        <var-decl name='encrypt' type-id='type-id-106' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='decrypt' type-id='type-id-108' visibility='default'/>
+        <var-decl name='decrypt' type-id='type-id-107' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='aead_encrypt' type-id='type-id-109' visibility='default'/>
+        <var-decl name='aead_encrypt' type-id='type-id-108' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='aead_decrypt' type-id='type-id-110' visibility='default'/>
+        <var-decl name='aead_decrypt' type-id='type-id-109' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='auth' type-id='type-id-111' visibility='default'/>
+        <var-decl name='auth' type-id='type-id-110' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='tag' type-id='type-id-112' visibility='default'/>
+        <var-decl name='tag' type-id='type-id-111' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='setiv' type-id='type-id-113' visibility='default'/>
+        <var-decl name='setiv' type-id='type-id-112' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='getiv' type-id='type-id-113' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='deinit' type-id='type-id-114' visibility='default'/>
       </data-member>
     </class-decl>
     <type-decl name='void' id='type-id-115'/>
-    <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-106'/>
-    <typedef-decl name='size_t' type-id='type-id-44' id='type-id-104'/>
+    <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-105'/>
+    <typedef-decl name='size_t' type-id='type-id-44' id='type-id-103'/>
     <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-117'/>
-    <typedef-decl name='cipher_encrypt_func' type-id='type-id-117' id='type-id-107'/>
-    <typedef-decl name='cipher_decrypt_func' type-id='type-id-117' id='type-id-108'/>
+    <typedef-decl name='cipher_encrypt_func' type-id='type-id-117' id='type-id-106'/>
+    <typedef-decl name='cipher_decrypt_func' type-id='type-id-117' id='type-id-107'/>
     <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-119'/>
-    <typedef-decl name='aead_cipher_encrypt_func' type-id='type-id-119' id='type-id-109'/>
-    <typedef-decl name='aead_cipher_decrypt_func' type-id='type-id-119' id='type-id-110'/>
+    <typedef-decl name='aead_cipher_encrypt_func' type-id='type-id-119' id='type-id-108'/>
+    <typedef-decl name='aead_cipher_decrypt_func' type-id='type-id-119' id='type-id-109'/>
     <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-121'/>
-    <typedef-decl name='cipher_auth_func' type-id='type-id-121' id='type-id-111'/>
+    <typedef-decl name='cipher_auth_func' type-id='type-id-121' id='type-id-110'/>
     <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-123'/>
-    <typedef-decl name='cipher_tag_func' type-id='type-id-123' id='type-id-112'/>
-    <typedef-decl name='cipher_setiv_func' type-id='type-id-121' id='type-id-113'/>
+    <typedef-decl name='cipher_tag_func' type-id='type-id-123' id='type-id-111'/>
+    <typedef-decl name='cipher_setiv_func' type-id='type-id-121' id='type-id-112'/>
+    <typedef-decl name='cipher_getiv_func' type-id='type-id-121' id='type-id-113'/>
     <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-125'/>
     <typedef-decl name='cipher_deinit_func' type-id='type-id-125' id='type-id-114'/>
-    <typedef-decl name='cipher_hd_st' type-id='type-id-105' id='type-id-102'/>
-    <union-decl name='__anonymous_union__' size-in-bits='448' is-anonymous='yes' visibility='default' id='type-id-103'>
+    <typedef-decl name='cipher_hd_st' type-id='type-id-104' id='type-id-101'/>
+    <union-decl name='__anonymous_union__' size-in-bits='512' is-anonymous='yes' visibility='default' id='type-id-102'>
       <data-member access='private'>
         <var-decl name='dig' type-id='type-id-126' visibility='default'/>
       </data-member>
@@ -806,7 +834,7 @@
         <var-decl name='mac' type-id='type-id-127' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='448' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-126' visibility='default' id='type-id-128'>
+    <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-126' visibility='default' id='type-id-128'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='e' type-id='type-id-21' visibility='default'/>
       </data-member>
@@ -820,20 +848,25 @@
         <var-decl name='deinit' type-id='type-id-131' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='key' type-id='type-id-106' visibility='default'/>
+        <var-decl name='copy' type-id='type-id-132' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='keysize' type-id='type-id-1' visibility='default'/>
+        <var-decl name='key' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='handle' type-id='type-id-106' visibility='default'/>
+        <var-decl name='keysize' type-id='type-id-1' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='handle' type-id='type-id-105' visibility='default'/>
       </data-member>
     </class-decl>
     <typedef-decl name='hash_func' type-id='type-id-121' id='type-id-129'/>
     <typedef-decl name='output_func' type-id='type-id-121' id='type-id-130'/>
     <typedef-decl name='hash_deinit_func' type-id='type-id-125' id='type-id-131'/>
+    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-134'/>
+    <typedef-decl name='copy_func' type-id='type-id-134' id='type-id-132'/>
     <typedef-decl name='digest_hd_st' type-id='type-id-128' id='type-id-126'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='448' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-127' visibility='default' id='type-id-132'>
+    <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-127' visibility='default' id='type-id-135'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='e' type-id='type-id-21' visibility='default'/>
       </data-member>
@@ -844,7 +877,7 @@
         <var-decl name='hash' type-id='type-id-129' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='setnonce' type-id='type-id-133' visibility='default'/>
+        <var-decl name='setnonce' type-id='type-id-136' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='output' type-id='type-id-130' visibility='default'/>
@@ -853,29 +886,21 @@
         <var-decl name='deinit' type-id='type-id-131' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='handle' type-id='type-id-106' visibility='default'/>
+        <var-decl name='copy' type-id='type-id-132' visibility='default'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='nonce_func' type-id='type-id-121' id='type-id-133'/>
-    <typedef-decl name='mac_hd_st' type-id='type-id-132' id='type-id-127'/>
-    <typedef-decl name='auth_cipher_hd_st' type-id='type-id-101' id='type-id-99'/>
-    <class-decl name='api_aead_cipher_hd_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-134'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ctx_enc' type-id='type-id-102' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='handle' type-id='type-id-105' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='api_aead_cipher_hd_st' type-id='type-id-134' id='type-id-100'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-96' visibility='default' id='type-id-135'>
+    <typedef-decl name='nonce_func' type-id='type-id-121' id='type-id-136'/>
+    <typedef-decl name='mac_hd_st' type-id='type-id-135' id='type-id-127'/>
+    <typedef-decl name='auth_cipher_hd_st' type-id='type-id-100' id='type-id-98'/>
+    <class-decl name='api_aead_cipher_hd_st' size-in-bits='704' is-struct='yes' visibility='default' id='type-id-137'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='i' type-id='type-id-136' visibility='default'/>
+        <var-decl name='ctx_enc' type-id='type-id-101' visibility='default'/>
       </data-member>
     </class-decl>
-
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='64' id='type-id-136'>
-      <subrange length='8' type-id='type-id-44' id='type-id-137'/>
-
-    </array-type-def>
-    <typedef-decl name='gnutls_uint64' type-id='type-id-135' id='type-id-96'/>
+    <typedef-decl name='api_aead_cipher_hd_st' type-id='type-id-137' id='type-id-99'/>
     <typedef-decl name='record_state_st' type-id='type-id-92' id='type-id-85'/>
     <typedef-decl name='record_parameters_st' type-id='type-id-82' id='type-id-138'/>
     <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-139'/>
@@ -884,7 +909,7 @@
       <subrange length='4' type-id='type-id-44' id='type-id-140'/>
 
     </array-type-def>
-    <class-decl name='__anonymous_struct__' size-in-bits='27648' 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='27776' 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>
@@ -952,27 +977,30 @@
         <var-decl name='allow_large_records' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1096'>
-        <var-decl name='no_etm' type-id='type-id-79' visibility='default'/>
+        <var-decl name='allow_small_records' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1104'>
-        <var-decl name='no_ext_master_secret' type-id='type-id-79' visibility='default'/>
+        <var-decl name='no_etm' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1112'>
-        <var-decl name='allow_key_usage_violation' type-id='type-id-79' visibility='default'/>
+        <var-decl name='no_ext_master_secret' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1120'>
-        <var-decl name='allow_wrong_pms' type-id='type-id-79' visibility='default'/>
+        <var-decl name='allow_key_usage_violation' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1128'>
-        <var-decl name='dumbfw' type-id='type-id-79' visibility='default'/>
+        <var-decl name='allow_wrong_pms' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1136'>
-        <var-decl name='dh_prime_bits' type-id='type-id-19' visibility='default'/>
+        <var-decl name='dumbfw' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
+        <var-decl name='dh_prime_bits' type-id='type-id-19' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1168'>
         <var-decl name='resumed' type-id='type-id-79' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1160'>
+      <data-member access='public' layout-offset-in-bits='1176'>
         <var-decl name='resumption_requested' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
@@ -1000,7 +1028,7 @@
         <var-decl name='record_send_buffer' type-id='type-id-142' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7936'>
-        <var-decl name='record_send_buffer_user_size' type-id='type-id-104' visibility='default'/>
+        <var-decl name='record_send_buffer_user_size' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8000'>
         <var-decl name='early_data_recv_buffer' type-id='type-id-142' visibility='default'/>
@@ -1036,7 +1064,7 @@
         <var-decl name='send_cert_req' type-id='type-id-152' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9536'>
-        <var-decl name='max_handshake_data_buffer_size' type-id='type-id-104' visibility='default'/>
+        <var-decl name='max_handshake_data_buffer_size' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9600'>
         <var-decl name='pull_timeout_func' type-id='type-id-153' visibility='default'/>
@@ -1069,7 +1097,7 @@
         <var-decl name='db_remove_func' type-id='type-id-161' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
-        <var-decl name='db_ptr' type-id='type-id-106' visibility='default'/>
+        <var-decl name='db_ptr' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
         <var-decl name='user_hello_func' type-id='type-id-162' visibility='default'/>
@@ -1102,7 +1130,7 @@
         <var-decl name='selected_ocsp_func' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10880'>
-        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-106' visibility='default'/>
+        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10944'>
         <var-decl name='selected_need_free' type-id='type-id-79' visibility='default'/>
@@ -1114,7 +1142,7 @@
         <var-decl name='default_hello_version' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11008'>
-        <var-decl name='user_ptr' type-id='type-id-106' visibility='default'/>
+        <var-decl name='user_ptr' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11072'>
         <var-decl name='direction' type-id='type-id-79' visibility='default'/>
@@ -1132,7 +1160,7 @@
         <var-decl name='initial_negotiation_completed' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11200'>
-        <var-decl name='post_negotiation_lock' type-id='type-id-106' visibility='default'/>
+        <var-decl name='post_negotiation_lock' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11264'>
         <var-decl name='transport' type-id='type-id-78' visibility='default'/>
@@ -1180,133 +1208,136 @@
         <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-25' visibility='default'/>
+        <var-decl name='last_key_update' type-id='type-id-172' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='13248'>
+        <var-decl name='key_update_count' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13184'>
+      <data-member access='public' layout-offset-in-bits='13312'>
         <var-decl name='full_client_hello' type-id='type-id-143' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13440'>
+      <data-member access='public' layout-offset-in-bits='13568'>
         <var-decl name='extensions_offset' type-id='type-id-1' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13504'>
+      <data-member access='public' layout-offset-in-bits='13632'>
         <var-decl name='hb_local_data' type-id='type-id-143' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13760'>
+      <data-member access='public' layout-offset-in-bits='13888'>
         <var-decl name='hb_remote_data' type-id='type-id-143' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14016'>
+      <data-member access='public' layout-offset-in-bits='14144'>
         <var-decl name='hb_ping_start' type-id='type-id-172' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14144'>
+      <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='14272'>
+      <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='14304'>
+      <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>
-      <data-member access='public' layout-offset-in-bits='14336'>
+      <data-member access='public' layout-offset-in-bits='14464'>
         <var-decl name='hb_total_timeout_ms' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14368'>
+      <data-member access='public' layout-offset-in-bits='14496'>
         <var-decl name='ocsp_check_ok' type-id='type-id-79' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14400'>
+      <data-member access='public' layout-offset-in-bits='14528'>
         <var-decl name='hb_state' type-id='type-id-173' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14432'>
+      <data-member access='public' layout-offset-in-bits='14560'>
         <var-decl name='recv_state' type-id='type-id-174' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14464'>
+      <data-member access='public' layout-offset-in-bits='14592'>
         <var-decl name='sc_random_set' type-id='type-id-79' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14528'>
+      <data-member access='public' layout-offset-in-bits='14656'>
         <var-decl name='flags' type-id='type-id-84' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14592'>
+      <data-member access='public' layout-offset-in-bits='14720'>
         <var-decl name='verify_callback' type-id='type-id-175' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14656'>
+      <data-member access='public' layout-offset-in-bits='14784'>
         <var-decl name='vc_data' type-id='type-id-176' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14720'>
+      <data-member access='public' layout-offset-in-bits='14848'>
         <var-decl name='vc_sdata' type-id='type-id-177' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14912'>
+      <data-member access='public' layout-offset-in-bits='15040'>
         <var-decl name='vc_elements' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14944'>
+      <data-member access='public' layout-offset-in-bits='15072'>
         <var-decl name='vc_status' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14976'>
+      <data-member access='public' layout-offset-in-bits='15104'>
         <var-decl name='additional_verify_flags' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15008'>
+      <data-member access='public' layout-offset-in-bits='15136'>
         <var-decl name='cert_hash' type-id='type-id-23' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15264'>
+      <data-member access='public' layout-offset-in-bits='15392'>
         <var-decl name='cert_hash_set' type-id='type-id-79' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15272'>
+      <data-member access='public' layout-offset-in-bits='15400'>
         <var-decl name='saved_username' type-id='type-id-178' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16304'>
+      <data-member access='public' layout-offset-in-bits='16432'>
         <var-decl name='saved_username_set' type-id='type-id-79' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16320'>
+      <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='17536'>
+      <data-member access='public' layout-offset-in-bits='17664'>
         <var-decl name='rsup' type-id='type-id-180' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17600'>
+      <data-member access='public' layout-offset-in-bits='17728'>
         <var-decl name='rsup_size' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17664'>
+      <data-member access='public' layout-offset-in-bits='17792'>
         <var-decl name='rexts' type-id='type-id-181' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17728'>
+      <data-member access='public' layout-offset-in-bits='17856'>
         <var-decl name='rexts_size' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17792'>
+      <data-member access='public' layout-offset-in-bits='17920'>
         <var-decl name='ext_data' type-id='type-id-182' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='23936'>
+      <data-member access='public' layout-offset-in-bits='24064'>
         <var-decl name='used_exts' type-id='type-id-26' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='23968'>
+      <data-member access='public' layout-offset-in-bits='24096'>
         <var-decl name='ext_msg' type-id='type-id-183' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24000'>
+      <data-member access='public' layout-offset-in-bits='24128'>
         <var-decl name='max_recv_size' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24064'>
+      <data-member access='public' layout-offset-in-bits='24192'>
         <var-decl name='cand_ec_group' type-id='type-id-28' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24128'>
+      <data-member access='public' layout-offset-in-bits='24256'>
         <var-decl name='cand_dh_group' type-id='type-id-28' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24192'>
+      <data-member access='public' layout-offset-in-bits='24320'>
         <var-decl name='cand_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='24384'>
         <var-decl name='hrr_cs' type-id='type-id-169' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24288'>
+      <data-member access='public' layout-offset-in-bits='24416'>
         <var-decl name='session_ticket_renew' type-id='type-id-1' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24320'>
+      <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='27456'>
+      <data-member access='public' layout-offset-in-bits='27584'>
         <var-decl name='early_data_received' type-id='type-id-26' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='27520'>
+      <data-member access='public' layout-offset-in-bits='27648'>
         <var-decl name='anti_replay' type-id='type-id-185' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='27584'>
-        <var-decl name='epoch_lock' type-id='type-id-106' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='27712'>
+        <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'>
@@ -1320,7 +1351,7 @@
         <var-decl name='length' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='byte_length' type-id='type-id-104' visibility='default'/>
+        <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'>
@@ -1331,13 +1362,13 @@
         <var-decl name='prev' type-id='type-id-187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='mark' type-id='type-id-104' visibility='default'/>
+        <var-decl name='mark' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='msg' type-id='type-id-3' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='maximum_size' type-id='type-id-104' visibility='default'/>
+        <var-decl name='maximum_size' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='uhead_mark' type-id='type-id-2' visibility='default'/>
@@ -1346,7 +1377,7 @@
         <var-decl name='type' type-id='type-id-189' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='record_sequence' type-id='type-id-96' visibility='default'/>
+        <var-decl name='record_sequence' type-id='type-id-84' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='epoch' type-id='type-id-19' visibility='default'/>
@@ -1402,10 +1433,10 @@
         <var-decl name='data' type-id='type-id-195' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='max_length' type-id='type-id-104' visibility='default'/>
+        <var-decl name='max_length' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='length' type-id='type-id-104' visibility='default'/>
+        <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'/>
@@ -1562,18 +1593,21 @@
         <var-decl name='_allow_large_records' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41640'>
-        <var-decl name='_no_etm' type-id='type-id-79' visibility='default'/>
+        <var-decl name='_allow_small_records' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41648'>
-        <var-decl name='_no_ext_master_secret' type-id='type-id-79' visibility='default'/>
+        <var-decl name='_no_etm' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41656'>
-        <var-decl name='_allow_key_usage_violation' type-id='type-id-79' visibility='default'/>
+        <var-decl name='_no_ext_master_secret' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41664'>
-        <var-decl name='_allow_wrong_pms' type-id='type-id-79' visibility='default'/>
+        <var-decl name='_allow_key_usage_violation' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41672'>
+        <var-decl name='_allow_wrong_pms' type-id='type-id-79' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='41680'>
         <var-decl name='_dumbfw' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41696'>
@@ -1593,7 +1627,7 @@
     </class-decl>
 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='2048' id='type-id-209'>
-      <subrange length='64' type-id='type-id-44' id='type-id-97'/>
+      <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'/>
@@ -1610,7 +1644,7 @@
     </class-decl>
 
     <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='4096' id='type-id-211'>
-      <subrange length='64' type-id='type-id-44' id='type-id-97'/>
+      <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'/>
@@ -1645,7 +1679,7 @@
         <var-decl name='cert_pk' type-id='type-id-67' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='tls13_ok' type-id='type-id-2' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='curve' type-id='type-id-66' visibility='default'/>
@@ -1705,7 +1739,7 @@
     <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-223'/>
 
     <array-type-def dimensions='1' type-id='type-id-223' size-in-bits='4096' id='type-id-213'>
-      <subrange length='64' type-id='type-id-44' id='type-id-97'/>
+      <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'/>
@@ -1855,7 +1889,7 @@
       <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_transport_ptr_t' type-id='type-id-106' id='type-id-158'/>
+    <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'/>
@@ -1865,10 +1899,10 @@
     <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='iov_base' type-id='type-id-106' visibility='default'/>
+        <var-decl name='iov_base' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='iov_len' type-id='type-id-104' visibility='default'/>
+        <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'/>
@@ -2089,7 +2123,7 @@
         <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-106' id='type-id-303'/>
+    <typedef-decl name='gnutls_ext_priv_data_t' type-id='type-id-105' id='type-id-303'/>
 
     <array-type-def dimensions='1' type-id='type-id-302' size-in-bits='6144' id='type-id-182'>
       <subrange length='32' type-id='type-id-44' id='type-id-57'/>
@@ -2125,7 +2159,7 @@
         <var-decl name='nonce' type-id='type-id-306' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='nonce_size' type-id='type-id-104' visibility='default'/>
+        <var-decl name='nonce_size' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
         <var-decl name='prf' type-id='type-id-21' visibility='default'/>
@@ -2147,56 +2181,56 @@
     <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='internals_st' type-id='type-id-141' id='type-id-16'/>
-    <class-decl name='gnutls_key_st' size-in-bits='22336' 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-310'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='kshare' type-id='type-id-311' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11328'>
+      <data-member access='public' layout-offset-in-bits='11520'>
         <var-decl name='proto' type-id='type-id-312' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='19776'>
+      <data-member access='public' layout-offset-in-bits='20096'>
         <var-decl name='binders' type-id='type-id-313' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='20288'>
+      <data-member access='public' layout-offset-in-bits='20608'>
         <var-decl name='key' type-id='type-id-3' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='20416'>
+      <data-member access='public' layout-offset-in-bits='20736'>
         <var-decl name='session_ticket_key' type-id='type-id-93' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='20928'>
+      <data-member access='public' layout-offset-in-bits='21248'>
         <var-decl name='previous_ticket_key' type-id='type-id-93' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='21440'>
+      <data-member access='public' layout-offset-in-bits='21760'>
         <var-decl name='initial_stek' type-id='type-id-93' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='21952'>
-        <var-decl name='auth_info' type-id='type-id-106' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='22272'>
+        <var-decl name='auth_info' type-id='type-id-105' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='22016'>
+      <data-member access='public' layout-offset-in-bits='22336'>
         <var-decl name='auth_info_type' type-id='type-id-314' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='22048'>
+      <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='22080'>
+      <data-member access='public' layout-offset-in-bits='22400'>
         <var-decl name='cred' type-id='type-id-315' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='22144'>
+      <data-member access='public' layout-offset-in-bits='22464'>
         <var-decl name='totp' type-id='type-id-316' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='11328' 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-311'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='ecdh_params' type-id='type-id-317' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3776'>
+      <data-member access='public' layout-offset-in-bits='3840'>
         <var-decl name='ecdhx_params' type-id='type-id-317' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='7552'>
+      <data-member access='public' layout-offset-in-bits='7680'>
         <var-decl name='dh_params' type-id='type-id-317' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='3776' 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-317' visibility='default' id='type-id-318'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='params' type-id='type-id-319' visibility='default'/>
       </data-member>
@@ -2236,14 +2270,14 @@
       <data-member access='public' layout-offset-in-bits='3584'>
         <var-decl name='spki' type-id='type-id-322' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3712'>
+      <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-106' id='type-id-323'/>
+    <typedef-decl name='bigint_t' type-id='type-id-105' id='type-id-323'/>
 
     <array-type-def dimensions='1' type-id='type-id-323' size-in-bits='1024' id='type-id-319'>
-      <subrange length='16' type-id='type-id-44' id='type-id-98'/>
+      <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'>
@@ -2261,7 +2295,7 @@
       <subrange length='256' type-id='type-id-44' id='type-id-227'/>
 
     </array-type-def>
-    <class-decl name='gnutls_x509_spki_st' size-in-bits='128' 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-325'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pk' type-id='type-id-67' visibility='default'/>
       </data-member>
@@ -2274,10 +2308,16 @@
       <data-member access='public' layout-offset-in-bits='96'>
         <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'/>
+      </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='8448' is-anonymous='yes' visibility='default' id='type-id-312'>
+    <union-decl name='__anonymous_union__' size-in-bits='8576' is-anonymous='yes' visibility='default' id='type-id-312'>
       <data-member access='private'>
         <var-decl name='tls13' type-id='type-id-326' visibility='default'/>
       </data-member>
@@ -2314,36 +2354,36 @@
         <var-decl name='ap_rms' type-id='type-id-93' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='8448' 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-327'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='ecdh' type-id='type-id-328' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='4032'>
+      <data-member access='public' layout-offset-in-bits='4096'>
         <var-decl name='dh' type-id='type-id-329' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='7872'>
+      <data-member access='public' layout-offset-in-bits='8000'>
         <var-decl name='srp' type-id='type-id-330' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='4032' 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-328'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='params' type-id='type-id-317' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3776'>
+      <data-member access='public' layout-offset-in-bits='3840'>
         <var-decl name='x' type-id='type-id-323' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3840'>
+      <data-member access='public' layout-offset-in-bits='3904'>
         <var-decl name='y' type-id='type-id-323' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3904'>
+      <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='3840' 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-329'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='params' type-id='type-id-317' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3776'>
+      <data-member access='public' layout-offset-in-bits='3840'>
         <var-decl name='client_Y' type-id='type-id-323' visibility='default'/>
       </data-member>
     </class-decl>
@@ -2409,7 +2449,7 @@
         <var-decl name='algorithm' type-id='type-id-314' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='credentials' type-id='type-id-106' visibility='default'/>
+        <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'/>
@@ -2505,7 +2545,7 @@
         <var-decl name='rcode' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='answer_packet' type-id='type-id-106' visibility='default'/>
+        <var-decl name='answer_packet' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='answer_len' type-id='type-id-1' visibility='default'/>
@@ -2778,7 +2818,7 @@
     <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-104'/>
+      <parameter type-id='type-id-103'/>
       <return type-id='type-id-1'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-268'>
@@ -2791,7 +2831,7 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-281'>
       <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-106'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-7'/>
       <return type-id='type-id-1'/>
     </function-type>
@@ -2805,45 +2845,45 @@
       <return type-id='type-id-1'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-264'>
-      <parameter type-id='type-id-106'/>
+      <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'>
-      <parameter type-id='type-id-106'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-1'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-120'>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
       <return type-id='type-id-1'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-116'>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
       <return type-id='type-id-1'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-118'>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
       <return type-id='type-id-1'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-262'>
-      <parameter type-id='type-id-106'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-3'/>
     </function-type>
@@ -2855,8 +2895,8 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-250'>
       <parameter type-id='type-id-158'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
       <return type-id='type-id-249'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-336'>
@@ -2866,17 +2906,21 @@
       <return type-id='type-id-115'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-124'>
-      <parameter type-id='type-id-106'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-115'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-122'>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
       <return type-id='type-id-115'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-133'>
+      <parameter type-id='type-id-105'/>
+      <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/nmavrogi/cvs/gnutls-nmav/libdane' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dane-params.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <return type-id='type-id-34'/>
@@ -2890,13 +2934,13 @@
       <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/nmavrogi/cvs/gnutls-nmav/libdane' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='errors.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='read-file.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -2928,12 +2972,12 @@
       <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/nmavrogi/cvs/gnutls-nmav/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='asnprintf.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='vasnprintf.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/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>
diff --git a/devel/libdane-latest-x86_64.abi b/devel/libdane-latest-x86_64.abi
index b6c986b43a..903a3b1d22 100644
--- a/devel/libdane-latest-x86_64.abi
+++ b/devel/libdane-latest-x86_64.abi
@@ -6,8 +6,8 @@
     <dependency name='libunistring.so.2'/>
     <dependency name='libdl.so.2'/>
     <dependency name='libtasn1.so.6'/>
-    <dependency name='libnettle.so.6'/>
-    <dependency name='libhogweed.so.4'/>
+    <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'/>
@@ -32,7 +32,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/nmavrogi/cvs/gnutls-mine/libdane' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dane.c' comp-dir-path='/home/nmavrogi/cvs/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 +65,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='52416' is-struct='yes' visibility='default' id='type-id-13'>
+    <class-decl name='gnutls_session_int' size-in-bits='52736' 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>
@@ -259,6 +259,7 @@
       <enumerator name='GNUTLS_CIPHER_AES_256_CFB8' value='31'/>
       <enumerator name='GNUTLS_CIPHER_AES_128_XTS' value='32'/>
       <enumerator name='GNUTLS_CIPHER_AES_256_XTS' value='33'/>
+      <enumerator name='GNUTLS_CIPHER_GOST28147_TC26Z_CNT' value='34'/>
       <enumerator name='GNUTLS_CIPHER_IDEA_PGP_CFB' value='200'/>
       <enumerator name='GNUTLS_CIPHER_3DES_PGP_CFB' value='201'/>
       <enumerator name='GNUTLS_CIPHER_CAST5_PGP_CFB' value='202'/>
@@ -288,6 +289,7 @@
       <enumerator name='GNUTLS_KX_ECDHE_ECDSA' value='13'/>
       <enumerator name='GNUTLS_KX_ECDHE_PSK' value='14'/>
       <enumerator name='GNUTLS_KX_RSA_PSK' value='15'/>
+      <enumerator name='GNUTLS_KX_VKO_GOST_12' value='16'/>
     </enum-decl>
     <typedef-decl name='gnutls_kx_algorithm_t' type-id='type-id-49' id='type-id-37'/>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-50'>
@@ -315,6 +317,10 @@
       <enumerator name='GNUTLS_MAC_UMAC_128' value='202'/>
       <enumerator name='GNUTLS_MAC_AES_CMAC_128' value='203'/>
       <enumerator name='GNUTLS_MAC_AES_CMAC_256' value='204'/>
+      <enumerator name='GNUTLS_MAC_AES_GMAC_128' value='205'/>
+      <enumerator name='GNUTLS_MAC_AES_GMAC_192' value='206'/>
+      <enumerator name='GNUTLS_MAC_AES_GMAC_256' value='207'/>
+      <enumerator name='GNUTLS_MAC_GOST28147_TC26Z_IMIT' value='208'/>
     </enum-decl>
     <typedef-decl name='gnutls_mac_algorithm_t' type-id='type-id-50' id='type-id-38'/>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-51'>
@@ -365,7 +371,7 @@
         <var-decl name='block_size' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='preimage_insecure' type-id='type-id-2' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
     <typedef-decl name='mac_entry_st' type-id='type-id-53' id='type-id-54'/>
@@ -433,6 +439,13 @@
       <enumerator name='GNUTLS_GROUP_SECP384R1' value='3'/>
       <enumerator name='GNUTLS_GROUP_SECP521R1' value='4'/>
       <enumerator name='GNUTLS_GROUP_X25519' value='6'/>
+      <enumerator name='GNUTLS_GROUP_GC256A' value='16'/>
+      <enumerator name='GNUTLS_GROUP_GC256B' value='17'/>
+      <enumerator name='GNUTLS_GROUP_GC256C' value='18'/>
+      <enumerator name='GNUTLS_GROUP_GC256D' value='19'/>
+      <enumerator name='GNUTLS_GROUP_GC512A' value='13'/>
+      <enumerator name='GNUTLS_GROUP_GC512B' value='14'/>
+      <enumerator name='GNUTLS_GROUP_GC512C' value='15'/>
       <enumerator name='GNUTLS_GROUP_FFDHE2048' value='256'/>
       <enumerator name='GNUTLS_GROUP_FFDHE3072' value='257'/>
       <enumerator name='GNUTLS_GROUP_FFDHE4096' value='258'/>
@@ -462,7 +475,12 @@
       <enumerator name='GNUTLS_ECC_CURVE_GOST256CPXB' value='12'/>
       <enumerator name='GNUTLS_ECC_CURVE_GOST512A' value='13'/>
       <enumerator name='GNUTLS_ECC_CURVE_GOST512B' value='14'/>
-      <enumerator name='GNUTLS_ECC_CURVE_MAX' value='14'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST512C' value='15'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST256A' value='16'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST256B' value='17'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST256C' value='18'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST256D' value='19'/>
+      <enumerator name='GNUTLS_ECC_CURVE_MAX' value='19'/>
     </enum-decl>
     <typedef-decl name='gnutls_ecc_curve_t' type-id='type-id-71' id='type-id-66'/>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-72'>
@@ -603,7 +621,7 @@
     <qualified-type-def type-id='type-id-76' const='yes' id='type-id-81'/>
     <pointer-type-def type-id='type-id-81' size-in-bits='64' id='type-id-30'/>
     <typedef-decl name='security_parameters_st' type-id='type-id-18' id='type-id-14'/>
-    <class-decl name='record_parameters_st' size-in-bits='5376' is-struct='yes' visibility='default' id='type-id-82'>
+    <class-decl name='record_parameters_st' size-in-bits='5504' is-struct='yes' visibility='default' id='type-id-82'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='epoch' type-id='type-id-19' visibility='default'/>
       </data-member>
@@ -631,10 +649,10 @@
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='read' type-id='type-id-85' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2880'>
+      <data-member access='public' layout-offset-in-bits='2944'>
         <var-decl name='write' type-id='type-id-85' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='5312'>
+      <data-member access='public' layout-offset-in-bits='5440'>
         <var-decl name='usage_cnt' type-id='type-id-1' visibility='default'/>
       </data-member>
     </class-decl>
@@ -667,13 +685,7 @@
         <var-decl name='tagsize' type-id='type-id-19' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='xor_nonce' type-id='type-id-79' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='232'>
-        <var-decl name='only_aead' type-id='type-id-79' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='240'>
-        <var-decl name='no_rekey' type-id='type-id-79' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-2' visibility='default'/>
       </data-member>
     </class-decl>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-88'>
@@ -688,7 +700,7 @@
     <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-83'/>
     <typedef-decl name='__uint64_t' type-id='type-id-44' id='type-id-91'/>
     <typedef-decl name='uint64_t' type-id='type-id-91' id='type-id-84'/>
-    <class-decl name='record_state_st' size-in-bits='2432' is-struct='yes' visibility='default' id='type-id-92'>
+    <class-decl name='record_state_st' size-in-bits='2496' is-struct='yes' visibility='default' id='type-id-92'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='mac_key' type-id='type-id-93' visibility='default'/>
       </data-member>
@@ -710,143 +722,151 @@
       <data-member access='public' layout-offset-in-bits='1024'>
         <var-decl name='ctx' type-id='type-id-95' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2304'>
+      <data-member access='public' layout-offset-in-bits='2368'>
         <var-decl name='aead_tag_size' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2336'>
+      <data-member access='public' layout-offset-in-bits='2400'>
         <var-decl name='is_aead' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='sequence_number' type-id='type-id-96' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='2432'>
+        <var-decl name='sequence_number' type-id='type-id-84' visibility='default'/>
       </data-member>
     </class-decl>
 
     <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='512' id='type-id-93'>
-      <subrange length='64' type-id='type-id-44' id='type-id-97'/>
+      <subrange length='64' type-id='type-id-44' id='type-id-96'/>
 
     </array-type-def>
 
     <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='128' id='type-id-94'>
-      <subrange length='16' type-id='type-id-44' id='type-id-98'/>
+      <subrange length='16' type-id='type-id-44' id='type-id-97'/>
 
     </array-type-def>
-    <union-decl name='__anonymous_union__' size-in-bits='1280' is-anonymous='yes' visibility='default' id='type-id-95'>
+    <union-decl name='__anonymous_union__' size-in-bits='1344' is-anonymous='yes' visibility='default' id='type-id-95'>
       <data-member access='private'>
-        <var-decl name='tls12' type-id='type-id-99' visibility='default'/>
+        <var-decl name='tls12' type-id='type-id-98' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='aead' type-id='type-id-100' visibility='default'/>
+        <var-decl name='aead' type-id='type-id-99' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='1280' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-99' visibility='default' id='type-id-101'>
+    <class-decl name='__anonymous_struct__' size-in-bits='1344' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-98' visibility='default' id='type-id-100'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cipher' type-id='type-id-102' visibility='default'/>
+        <var-decl name='cipher' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='mac' type-id='type-id-103' visibility='default'/>
+        <var-decl name='mac' type-id='type-id-102' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='is_mac' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='30'>
-        <var-decl name='non_null' type-id='type-id-2' visibility='default'/>
+        <var-decl name='continuous_mac' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='29'>
+        <var-decl name='non_null' type-id='type-id-2' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='28'>
         <var-decl name='etm' type-id='type-id-2' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='tag_size' type-id='type-id-104' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='1280'>
+        <var-decl name='tag_size' type-id='type-id-103' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='704' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-102' visibility='default' id='type-id-105'>
+    <class-decl name='__anonymous_struct__' size-in-bits='704' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-101' visibility='default' id='type-id-104'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='handle' type-id='type-id-106' visibility='default'/>
+        <var-decl name='handle' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='e' type-id='type-id-83' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='encrypt' type-id='type-id-107' visibility='default'/>
+        <var-decl name='encrypt' type-id='type-id-106' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='decrypt' type-id='type-id-108' visibility='default'/>
+        <var-decl name='decrypt' type-id='type-id-107' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='aead_encrypt' type-id='type-id-109' visibility='default'/>
+        <var-decl name='aead_encrypt' type-id='type-id-108' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='aead_decrypt' type-id='type-id-110' visibility='default'/>
+        <var-decl name='aead_decrypt' type-id='type-id-109' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='auth' type-id='type-id-111' visibility='default'/>
+        <var-decl name='auth' type-id='type-id-110' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='tag' type-id='type-id-112' visibility='default'/>
+        <var-decl name='tag' type-id='type-id-111' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='setiv' type-id='type-id-113' visibility='default'/>
+        <var-decl name='setiv' type-id='type-id-112' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='getiv' type-id='type-id-114' visibility='default'/>
+        <var-decl name='getiv' type-id='type-id-113' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='deinit' type-id='type-id-115' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-114' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='void' id='type-id-116'/>
-    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-106'/>
-    <typedef-decl name='size_t' type-id='type-id-44' id='type-id-104'/>
-    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-118'/>
-    <typedef-decl name='cipher_encrypt_func' type-id='type-id-118' id='type-id-107'/>
-    <typedef-decl name='cipher_decrypt_func' type-id='type-id-118' id='type-id-108'/>
-    <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-120'/>
-    <typedef-decl name='aead_cipher_encrypt_func' type-id='type-id-120' id='type-id-109'/>
-    <typedef-decl name='aead_cipher_decrypt_func' type-id='type-id-120' id='type-id-110'/>
-    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-122'/>
-    <typedef-decl name='cipher_auth_func' type-id='type-id-122' id='type-id-111'/>
-    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-124'/>
-    <typedef-decl name='cipher_tag_func' type-id='type-id-124' id='type-id-112'/>
-    <typedef-decl name='cipher_setiv_func' type-id='type-id-122' id='type-id-113'/>
-    <typedef-decl name='cipher_getiv_func' type-id='type-id-122' id='type-id-114'/>
-    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-126'/>
-    <typedef-decl name='cipher_deinit_func' type-id='type-id-126' id='type-id-115'/>
-    <typedef-decl name='cipher_hd_st' type-id='type-id-105' id='type-id-102'/>
-    <union-decl name='__anonymous_union__' size-in-bits='448' is-anonymous='yes' visibility='default' id='type-id-103'>
+    <type-decl name='void' id='type-id-115'/>
+    <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-105'/>
+    <typedef-decl name='size_t' type-id='type-id-44' id='type-id-103'/>
+    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-117'/>
+    <typedef-decl name='cipher_encrypt_func' type-id='type-id-117' id='type-id-106'/>
+    <typedef-decl name='cipher_decrypt_func' type-id='type-id-117' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-119'/>
+    <typedef-decl name='aead_cipher_encrypt_func' type-id='type-id-119' id='type-id-108'/>
+    <typedef-decl name='aead_cipher_decrypt_func' type-id='type-id-119' id='type-id-109'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-121'/>
+    <typedef-decl name='cipher_auth_func' type-id='type-id-121' id='type-id-110'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-123'/>
+    <typedef-decl name='cipher_tag_func' type-id='type-id-123' id='type-id-111'/>
+    <typedef-decl name='cipher_setiv_func' type-id='type-id-121' id='type-id-112'/>
+    <typedef-decl name='cipher_getiv_func' type-id='type-id-121' id='type-id-113'/>
+    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-125'/>
+    <typedef-decl name='cipher_deinit_func' type-id='type-id-125' id='type-id-114'/>
+    <typedef-decl name='cipher_hd_st' type-id='type-id-104' id='type-id-101'/>
+    <union-decl name='__anonymous_union__' size-in-bits='512' is-anonymous='yes' visibility='default' id='type-id-102'>
       <data-member access='private'>
-        <var-decl name='dig' type-id='type-id-127' visibility='default'/>
+        <var-decl name='dig' type-id='type-id-126' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='mac' type-id='type-id-128' visibility='default'/>
+        <var-decl name='mac' type-id='type-id-127' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='448' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-127' visibility='default' id='type-id-129'>
+    <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-126' visibility='default' id='type-id-128'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='e' type-id='type-id-21' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='hash' type-id='type-id-130' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-129' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='output' type-id='type-id-131' visibility='default'/>
+        <var-decl name='output' type-id='type-id-130' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='deinit' type-id='type-id-132' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-131' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='key' type-id='type-id-106' visibility='default'/>
+        <var-decl name='copy' type-id='type-id-132' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='keysize' type-id='type-id-1' visibility='default'/>
+        <var-decl name='key' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='handle' type-id='type-id-106' visibility='default'/>
+        <var-decl name='keysize' type-id='type-id-1' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='handle' type-id='type-id-105' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='hash_func' type-id='type-id-122' id='type-id-130'/>
-    <typedef-decl name='output_func' type-id='type-id-122' id='type-id-131'/>
-    <typedef-decl name='hash_deinit_func' type-id='type-id-126' id='type-id-132'/>
-    <typedef-decl name='digest_hd_st' type-id='type-id-129' id='type-id-127'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='448' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-128' visibility='default' id='type-id-133'>
+    <typedef-decl name='hash_func' type-id='type-id-121' id='type-id-129'/>
+    <typedef-decl name='output_func' type-id='type-id-121' id='type-id-130'/>
+    <typedef-decl name='hash_deinit_func' type-id='type-id-125' id='type-id-131'/>
+    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-134'/>
+    <typedef-decl name='copy_func' type-id='type-id-134' id='type-id-132'/>
+    <typedef-decl name='digest_hd_st' type-id='type-id-128' id='type-id-126'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-127' visibility='default' id='type-id-135'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='e' type-id='type-id-21' visibility='default'/>
       </data-member>
@@ -854,52 +874,44 @@
         <var-decl name='mac_len' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='hash' type-id='type-id-130' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-129' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='setnonce' type-id='type-id-134' visibility='default'/>
+        <var-decl name='setnonce' type-id='type-id-136' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='output' type-id='type-id-131' visibility='default'/>
+        <var-decl name='output' type-id='type-id-130' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='deinit' type-id='type-id-132' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-131' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='handle' type-id='type-id-106' visibility='default'/>
+        <var-decl name='copy' type-id='type-id-132' visibility='default'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='nonce_func' type-id='type-id-122' id='type-id-134'/>
-    <typedef-decl name='mac_hd_st' type-id='type-id-133' id='type-id-128'/>
-    <typedef-decl name='auth_cipher_hd_st' type-id='type-id-101' id='type-id-99'/>
-    <class-decl name='api_aead_cipher_hd_st' size-in-bits='704' is-struct='yes' visibility='default' id='type-id-135'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ctx_enc' type-id='type-id-102' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='handle' type-id='type-id-105' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='api_aead_cipher_hd_st' type-id='type-id-135' id='type-id-100'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-96' visibility='default' id='type-id-136'>
+    <typedef-decl name='nonce_func' type-id='type-id-121' id='type-id-136'/>
+    <typedef-decl name='mac_hd_st' type-id='type-id-135' id='type-id-127'/>
+    <typedef-decl name='auth_cipher_hd_st' type-id='type-id-100' id='type-id-98'/>
+    <class-decl name='api_aead_cipher_hd_st' size-in-bits='704' is-struct='yes' visibility='default' id='type-id-137'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='i' type-id='type-id-137' visibility='default'/>
+        <var-decl name='ctx_enc' type-id='type-id-101' visibility='default'/>
       </data-member>
     </class-decl>
-
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='64' id='type-id-137'>
-      <subrange length='8' type-id='type-id-44' id='type-id-138'/>
-
-    </array-type-def>
-    <typedef-decl name='gnutls_uint64' type-id='type-id-136' id='type-id-96'/>
+    <typedef-decl name='api_aead_cipher_hd_st' type-id='type-id-137' id='type-id-99'/>
     <typedef-decl name='record_state_st' type-id='type-id-92' id='type-id-85'/>
-    <typedef-decl name='record_parameters_st' type-id='type-id-82' id='type-id-139'/>
-    <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-140'/>
+    <typedef-decl name='record_parameters_st' type-id='type-id-82' id='type-id-138'/>
+    <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-139'/>
 
-    <array-type-def dimensions='1' type-id='type-id-140' size-in-bits='256' id='type-id-15'>
-      <subrange length='4' type-id='type-id-44' id='type-id-141'/>
+    <array-type-def dimensions='1' type-id='type-id-139' size-in-bits='256' id='type-id-15'>
+      <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-142'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='record_buffer' type-id='type-id-143' visibility='default'/>
+        <var-decl name='record_buffer' type-id='type-id-142' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='handshake_hash_buffer_prev_len' type-id='type-id-1' visibility='default'/>
@@ -917,25 +929,25 @@
         <var-decl name='handshake_hash_buffer_client_finished_len' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='handshake_hash_buffer' type-id='type-id-144' visibility='default'/>
+        <var-decl name='handshake_hash_buffer' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <var-decl name='resumable' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='736'>
-        <var-decl name='ticket_state' type-id='type-id-145' visibility='default'/>
+        <var-decl name='ticket_state' type-id='type-id-144' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='bye_state' type-id='type-id-146' visibility='default'/>
+        <var-decl name='bye_state' type-id='type-id-145' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='reauth_state' type-id='type-id-147' visibility='default'/>
+        <var-decl name='reauth_state' type-id='type-id-146' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='handshake_final_state' type-id='type-id-148' visibility='default'/>
+        <var-decl name='handshake_final_state' type-id='type-id-147' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='864'>
-        <var-decl name='handshake_state' type-id='type-id-148' visibility='default'/>
+        <var-decl name='handshake_state' type-id='type-id-147' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <var-decl name='invalid_connection' type-id='type-id-79' visibility='default'/>
@@ -959,7 +971,7 @@
         <var-decl name='last_handshake_out' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='priorities' type-id='type-id-149' visibility='default'/>
+        <var-decl name='priorities' type-id='type-id-148' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <var-decl name='allow_large_records' type-id='type-id-79' visibility='default'/>
@@ -998,49 +1010,49 @@
         <var-decl name='resumption_data' type-id='type-id-3' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
-        <var-decl name='handshake_send_buffer' type-id='type-id-143' visibility='default'/>
+        <var-decl name='handshake_send_buffer' type-id='type-id-142' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3648'>
-        <var-decl name='handshake_header_recv_buffer' type-id='type-id-143' visibility='default'/>
+        <var-decl name='handshake_header_recv_buffer' type-id='type-id-142' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='handshake_recv_buffer' type-id='type-id-150' visibility='default'/>
+        <var-decl name='handshake_recv_buffer' type-id='type-id-149' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7360'>
         <var-decl name='handshake_recv_buffer_size' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7424'>
-        <var-decl name='record_recv_buffer' type-id='type-id-143' visibility='default'/>
+        <var-decl name='record_recv_buffer' type-id='type-id-142' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7680'>
-        <var-decl name='record_send_buffer' type-id='type-id-143' visibility='default'/>
+        <var-decl name='record_send_buffer' type-id='type-id-142' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7936'>
-        <var-decl name='record_send_buffer_user_size' type-id='type-id-104' visibility='default'/>
+        <var-decl name='record_send_buffer_user_size' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8000'>
-        <var-decl name='early_data_recv_buffer' type-id='type-id-143' visibility='default'/>
+        <var-decl name='early_data_recv_buffer' type-id='type-id-142' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
-        <var-decl name='early_data_presend_buffer' type-id='type-id-144' visibility='default'/>
+        <var-decl name='early_data_presend_buffer' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8512'>
-        <var-decl name='rsend_state' type-id='type-id-151' visibility='default'/>
+        <var-decl name='rsend_state' type-id='type-id-150' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8576'>
-        <var-decl name='record_key_update_buffer' type-id='type-id-144' visibility='default'/>
+        <var-decl name='record_key_update_buffer' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8832'>
-        <var-decl name='record_presend_buffer' type-id='type-id-144' visibility='default'/>
+        <var-decl name='record_presend_buffer' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9088'>
-        <var-decl name='reauth_buffer' type-id='type-id-144' visibility='default'/>
+        <var-decl name='reauth_buffer' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9344'>
         <var-decl name='expire_time' type-id='type-id-25' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9408'>
-        <var-decl name='auth_struct' type-id='type-id-152' visibility='default'/>
+        <var-decl name='auth_struct' type-id='type-id-151' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9472'>
         <var-decl name='adv_version_major' type-id='type-id-24' visibility='default'/>
@@ -1049,88 +1061,88 @@
         <var-decl name='adv_version_minor' type-id='type-id-24' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9504'>
-        <var-decl name='send_cert_req' type-id='type-id-153' visibility='default'/>
+        <var-decl name='send_cert_req' type-id='type-id-152' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9536'>
-        <var-decl name='max_handshake_data_buffer_size' type-id='type-id-104' visibility='default'/>
+        <var-decl name='max_handshake_data_buffer_size' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9600'>
-        <var-decl name='pull_timeout_func' type-id='type-id-154' visibility='default'/>
+        <var-decl name='pull_timeout_func' type-id='type-id-153' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
-        <var-decl name='pull_func' type-id='type-id-155' visibility='default'/>
+        <var-decl name='pull_func' type-id='type-id-154' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
-        <var-decl name='push_func' type-id='type-id-156' visibility='default'/>
+        <var-decl name='push_func' type-id='type-id-155' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9792'>
-        <var-decl name='vec_push_func' type-id='type-id-157' visibility='default'/>
+        <var-decl name='vec_push_func' type-id='type-id-156' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9856'>
-        <var-decl name='errno_func' type-id='type-id-158' visibility='default'/>
+        <var-decl name='errno_func' type-id='type-id-157' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9920'>
-        <var-decl name='transport_recv_ptr' type-id='type-id-159' visibility='default'/>
+        <var-decl name='transport_recv_ptr' type-id='type-id-158' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
-        <var-decl name='transport_send_ptr' type-id='type-id-159' visibility='default'/>
+        <var-decl name='transport_send_ptr' type-id='type-id-158' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10048'>
-        <var-decl name='db_store_func' type-id='type-id-160' visibility='default'/>
+        <var-decl name='db_store_func' type-id='type-id-159' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10112'>
-        <var-decl name='db_retrieve_func' type-id='type-id-161' visibility='default'/>
+        <var-decl name='db_retrieve_func' type-id='type-id-160' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
-        <var-decl name='db_remove_func' type-id='type-id-162' visibility='default'/>
+        <var-decl name='db_remove_func' type-id='type-id-161' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
-        <var-decl name='db_ptr' type-id='type-id-106' visibility='default'/>
+        <var-decl name='db_ptr' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
-        <var-decl name='user_hello_func' type-id='type-id-163' visibility='default'/>
+        <var-decl name='user_hello_func' type-id='type-id-162' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10368'>
-        <var-decl name='h_hook' type-id='type-id-164' visibility='default'/>
+        <var-decl name='h_hook' type-id='type-id-163' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10432'>
         <var-decl name='h_type' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10464'>
-        <var-decl name='h_post' type-id='type-id-165' visibility='default'/>
+        <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-166' visibility='default'/>
+        <var-decl name='selected_cert_list' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10624'>
-        <var-decl name='selected_key' type-id='type-id-167' visibility='default'/>
+        <var-decl name='selected_key' type-id='type-id-166' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10688'>
-        <var-decl name='selected_ocsp' type-id='type-id-168' visibility='default'/>
+        <var-decl name='selected_ocsp' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10816'>
-        <var-decl name='selected_ocsp_func' type-id='type-id-169' visibility='default'/>
+        <var-decl name='selected_ocsp_func' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10880'>
-        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-106' visibility='default'/>
+        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10944'>
         <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-170' visibility='default'/>
+        <var-decl name='default_record_version' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10968'>
-        <var-decl name='default_hello_version' type-id='type-id-170' visibility='default'/>
+        <var-decl name='default_hello_version' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11008'>
-        <var-decl name='user_ptr' type-id='type-id-106' visibility='default'/>
+        <var-decl name='user_ptr' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11072'>
         <var-decl name='direction' type-id='type-id-79' visibility='default'/>
@@ -1139,7 +1151,7 @@
         <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-170' visibility='default'/>
+        <var-decl name='rsa_pms_version' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11104'>
         <var-decl name='errnum' type-id='type-id-1' visibility='default'/>
@@ -1148,13 +1160,13 @@
         <var-decl name='initial_negotiation_completed' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11200'>
-        <var-decl name='post_negotiation_lock' type-id='type-id-106' visibility='default'/>
+        <var-decl name='post_negotiation_lock' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11264'>
         <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-171' visibility='default'/>
+        <var-decl name='dtls' type-id='type-id-170' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11904'>
         <var-decl name='handshake_suspicious_loops' type-id='type-id-2' visibility='default'/>
@@ -1169,13 +1181,13 @@
         <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-172' visibility='default'/>
+        <var-decl name='cb_tls_unique' type-id='type-id-171' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12288'>
-        <var-decl name='handshake_start_time' type-id='type-id-173' visibility='default'/>
+        <var-decl name='handshake_start_time' type-id='type-id-172' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12416'>
-        <var-decl name='handshake_abs_timeout' type-id='type-id-173' visibility='default'/>
+        <var-decl name='handshake_abs_timeout' type-id='type-id-172' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12544'>
         <var-decl name='ertt' type-id='type-id-2' visibility='default'/>
@@ -1190,34 +1202,34 @@
         <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'>
-        <var-decl name='post_handshake_hash_buffer' type-id='type-id-144' visibility='default'/>
+        <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'>
         <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-173' visibility='default'/>
+        <var-decl name='last_key_update' type-id='type-id-172' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13248'>
         <var-decl name='key_update_count' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13312'>
-        <var-decl name='full_client_hello' type-id='type-id-144' visibility='default'/>
+        <var-decl name='full_client_hello' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13568'>
         <var-decl name='extensions_offset' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13632'>
-        <var-decl name='hb_local_data' type-id='type-id-144' visibility='default'/>
+        <var-decl name='hb_local_data' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13888'>
-        <var-decl name='hb_remote_data' type-id='type-id-144' visibility='default'/>
+        <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-173' visibility='default'/>
+        <var-decl name='hb_ping_start' type-id='type-id-172' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14272'>
-        <var-decl name='hb_ping_sent' type-id='type-id-173' visibility='default'/>
+        <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'/>
@@ -1232,10 +1244,10 @@
         <var-decl name='ocsp_check_ok' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14528'>
-        <var-decl name='hb_state' type-id='type-id-174' visibility='default'/>
+        <var-decl name='hb_state' type-id='type-id-173' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14560'>
-        <var-decl name='recv_state' type-id='type-id-175' visibility='default'/>
+        <var-decl name='recv_state' type-id='type-id-174' 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'/>
@@ -1244,13 +1256,13 @@
         <var-decl name='flags' type-id='type-id-84' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14720'>
-        <var-decl name='verify_callback' type-id='type-id-176' visibility='default'/>
+        <var-decl name='verify_callback' type-id='type-id-175' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14784'>
-        <var-decl name='vc_data' type-id='type-id-177' visibility='default'/>
+        <var-decl name='vc_data' 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-178' visibility='default'/>
+        <var-decl name='vc_sdata' type-id='type-id-177' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='15040'>
         <var-decl name='vc_elements' type-id='type-id-2' visibility='default'/>
@@ -1268,34 +1280,34 @@
         <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-179' visibility='default'/>
+        <var-decl name='saved_username' type-id='type-id-178' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16432'>
         <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-180' visibility='default'/>
+        <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-181' visibility='default'/>
+        <var-decl name='rsup' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17792'>
-        <var-decl name='rexts' type-id='type-id-182' visibility='default'/>
+        <var-decl name='rexts' type-id='type-id-181' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17920'>
-        <var-decl name='ext_data' type-id='type-id-183' visibility='default'/>
+        <var-decl name='ext_data' type-id='type-id-182' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24064'>
         <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-184' visibility='default'/>
+        <var-decl name='ext_msg' type-id='type-id-183' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24128'>
         <var-decl name='max_recv_size' type-id='type-id-2' visibility='default'/>
@@ -1310,75 +1322,75 @@
         <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-170' visibility='default'/>
+        <var-decl name='hrr_cs' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24416'>
         <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-185' visibility='default'/>
+        <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>
       <data-member access='public' layout-offset-in-bits='27648'>
-        <var-decl name='anti_replay' type-id='type-id-186' visibility='default'/>
+        <var-decl name='anti_replay' type-id='type-id-185' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27712'>
-        <var-decl name='epoch_lock' type-id='type-id-106' visibility='default'/>
+        <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-187'>
+    <class-decl name='mbuffer_head_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-186'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-188' visibility='default'/>
+        <var-decl name='head' type-id='type-id-187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tail' type-id='type-id-188' visibility='default'/>
+        <var-decl name='tail' type-id='type-id-187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='length' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='byte_length' type-id='type-id-104' visibility='default'/>
+        <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-189'>
+    <class-decl name='mbuffer_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-188'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-188' visibility='default'/>
+        <var-decl name='next' type-id='type-id-187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-188' visibility='default'/>
+        <var-decl name='prev' type-id='type-id-187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='mark' type-id='type-id-104' visibility='default'/>
+        <var-decl name='mark' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='msg' type-id='type-id-3' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='maximum_size' type-id='type-id-104' visibility='default'/>
+        <var-decl name='maximum_size' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <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-190' visibility='default'/>
+        <var-decl name='type' type-id='type-id-189' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='record_sequence' type-id='type-id-96' visibility='default'/>
+        <var-decl name='record_sequence' type-id='type-id-84' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <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-191' visibility='default'/>
+        <var-decl name='htype' type-id='type-id-190' 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-189' size-in-bits='64' id='type-id-188'/>
-    <enum-decl name='content_type_t' id='type-id-192'>
+    <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'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_CHANGE_CIPHER_SPEC' value='20'/>
       <enumerator name='GNUTLS_ALERT' value='21'/>
@@ -1386,8 +1398,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-192' id='type-id-190'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-193'>
+    <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'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_HANDSHAKE_HELLO_REQUEST' value='0'/>
       <enumerator name='GNUTLS_HANDSHAKE_CLIENT_HELLO' value='1'/>
@@ -1410,39 +1422,39 @@
       <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-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-143'/>
-    <class-decl name='gnutls_buffer_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-195'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='allocd' type-id='type-id-196' visibility='default'/>
+        <var-decl name='allocd' type-id='type-id-195' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='data' type-id='type-id-196' visibility='default'/>
+        <var-decl name='data' type-id='type-id-195' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='max_length' type-id='type-id-104' visibility='default'/>
+        <var-decl name='max_length' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='length' type-id='type-id-104' visibility='default'/>
+        <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-196'/>
-    <typedef-decl name='gnutls_buffer_st' type-id='type-id-195' id='type-id-144'/>
-    <enum-decl name='send_ticket_state_t' id='type-id-197'>
+    <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'>
       <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-197' id='type-id-145'/>
-    <enum-decl name='bye_state_t' id='type-id-198'>
+    <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'>
       <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-198' id='type-id-146'/>
-    <enum-decl name='reauth_state_t' id='type-id-199'>
+    <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'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='REAUTH_STATE0' value='0'/>
       <enumerator name='REAUTH_STATE1' value='1'/>
@@ -1451,8 +1463,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-199' id='type-id-147'/>
-    <enum-decl name='handshake_state_t' id='type-id-200'>
+    <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'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='STATE0' value='0'/>
       <enumerator name='STATE1' value='1'/>
@@ -1506,46 +1518,46 @@
       <enumerator name='STATE115' value='115'/>
       <enumerator name='STATE150' value='116'/>
     </enum-decl>
-    <typedef-decl name='handshake_state_t' type-id='type-id-200' id='type-id-148'/>
-    <class-decl name='gnutls_priority_st' size-in-bits='41792' is-struct='yes' visibility='default' id='type-id-201'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='protocol' type-id='type-id-202' visibility='default'/>
+        <var-decl name='protocol' type-id='type-id-201' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2080'>
-        <var-decl name='client_ctype' type-id='type-id-202' visibility='default'/>
+        <var-decl name='client_ctype' type-id='type-id-201' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4160'>
-        <var-decl name='server_ctype' type-id='type-id-202' visibility='default'/>
+        <var-decl name='server_ctype' type-id='type-id-201' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6240'>
-        <var-decl name='_cipher' type-id='type-id-202' visibility='default'/>
+        <var-decl name='_cipher' type-id='type-id-201' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
-        <var-decl name='_mac' type-id='type-id-202' visibility='default'/>
+        <var-decl name='_mac' type-id='type-id-201' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10400'>
-        <var-decl name='_kx' type-id='type-id-202' visibility='default'/>
+        <var-decl name='_kx' type-id='type-id-201' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12480'>
-        <var-decl name='_sign_algo' type-id='type-id-202' visibility='default'/>
+        <var-decl name='_sign_algo' type-id='type-id-201' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14560'>
-        <var-decl name='_supported_ecc' type-id='type-id-202' visibility='default'/>
+        <var-decl name='_supported_ecc' type-id='type-id-201' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16640'>
-        <var-decl name='groups' type-id='type-id-203' visibility='default'/>
+        <var-decl name='groups' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='20800'>
-        <var-decl name='sigalg' type-id='type-id-204' visibility='default'/>
+        <var-decl name='sigalg' type-id='type-id-203' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24960'>
-        <var-decl name='cs' type-id='type-id-205' visibility='default'/>
+        <var-decl name='cs' type-id='type-id-204' 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-206' visibility='default'/>
+        <var-decl name='sr' type-id='type-id-205' 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'/>
@@ -1575,7 +1587,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-207' visibility='default'/>
+        <var-decl name='level' type-id='type-id-206' 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'/>
@@ -1602,26 +1614,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-208' visibility='default'/>
+        <var-decl name='usage_cnt' type-id='type-id-207' 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-202' visibility='default' id='type-id-209'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='priorities' type-id='type-id-210' visibility='default'/>
+        <var-decl name='priorities' type-id='type-id-209' 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-210'>
-      <subrange length='64' type-id='type-id-44' id='type-id-97'/>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='2048' id='type-id-209'>
+      <subrange length='64' type-id='type-id-44' id='type-id-96'/>
 
     </array-type-def>
-    <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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-212' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-211' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
         <var-decl name='size' type-id='type-id-2' visibility='default'/>
@@ -1631,20 +1643,20 @@
       </data-member>
     </class-decl>
 
-    <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-97'/>
+    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='4096' id='type-id-211'>
+      <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-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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-214' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-213' 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-215'>
+    <class-decl name='gnutls_sign_entry_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-214'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-34' visibility='default'/>
       </data-member>
@@ -1658,7 +1670,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-216' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-215' 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'/>
@@ -1667,19 +1679,19 @@
         <var-decl name='cert_pk' type-id='type-id-67' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='tls13_ok' type-id='type-id-2' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-2' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <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-217' visibility='default'/>
+        <var-decl name='aid' type-id='type-id-216' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='slevel' type-id='type-id-218' visibility='default'/>
+        <var-decl name='slevel' type-id='type-id-217' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-219'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-218'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_DIG_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_DIG_NULL' value='1'/>
@@ -1700,61 +1712,61 @@
       <enumerator name='GNUTLS_DIG_STREEBOG_256' value='16'/>
       <enumerator name='GNUTLS_DIG_STREEBOG_512' value='17'/>
     </enum-decl>
-    <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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='id' type-id='type-id-170' visibility='default'/>
+        <var-decl name='id' type-id='type-id-169' 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-170'>
+    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='16' id='type-id-169'>
       <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-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'>
+    <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'>
       <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-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'/>
+    <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'/>
 
-    <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-97'/>
+    <array-type-def dimensions='1' type-id='type-id-223' size-in-bits='4096' id='type-id-213'>
+      <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-213' id='type-id-204'/>
-    <class-decl name='ciphersuite_list_st' size-in-bits='16448' is-struct='yes' visibility='default' id='type-id-225'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-226' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-225' 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-227'/>
+    <typedef-decl name='gnutls_cipher_suite_entry_st' type-id='type-id-33' id='type-id-226'/>
 
-    <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 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>
-    <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'>
+    <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'>
       <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-229' id='type-id-206'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-230'>
+    <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'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_SEC_PARAM_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_SEC_PARAM_INSECURE' value='5'/>
@@ -1769,15 +1781,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-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-149'/>
-    <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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='htype' type-id='type-id-191' visibility='default'/>
+        <var-decl name='htype' type-id='type-id-190' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='rtype' type-id='type-id-191' visibility='default'/>
+        <var-decl name='rtype' type-id='type-id-190' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='length' type-id='type-id-26' visibility='default'/>
@@ -1792,27 +1804,27 @@
         <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-233' visibility='default'/>
+        <var-decl name='header' type-id='type-id-232' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='data' type-id='type-id-144' visibility='default'/>
+        <var-decl name='data' type-id='type-id-143' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <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 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>
-    <typedef-decl name='handshake_buffer_st' type-id='type-id-232' id='type-id-231'/>
+    <typedef-decl name='handshake_buffer_st' type-id='type-id-231' id='type-id-230'/>
 
-    <array-type-def dimensions='1' type-id='type-id-231' size-in-bits='3456' id='type-id-150'>
-      <subrange length='6' type-id='type-id-44' id='type-id-235'/>
+    <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>
-    <enum-decl name='record_send_state_t' id='type-id-236'>
+    <enum-decl name='record_send_state_t' id='type-id-235'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='RECORD_SEND_NORMAL' value='0'/>
       <enumerator name='RECORD_SEND_CORKED' value='1'/>
@@ -1821,101 +1833,101 @@
       <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-236' id='type-id-151'/>
-    <class-decl name='mod_auth_st_int' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-237'>
+    <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'>
       <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-238' visibility='default'/>
+        <var-decl name='gnutls_generate_server_certificate' type-id='type-id-237' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='gnutls_generate_client_certificate' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_generate_client_certificate' type-id='type-id-237' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='gnutls_generate_server_kx' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_generate_server_kx' type-id='type-id-237' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='gnutls_generate_client_kx' type-id='type-id-238' visibility='default'/>
+        <var-decl name='gnutls_generate_client_kx' type-id='type-id-237' 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-238' visibility='default'/>
+        <var-decl name='gnutls_generate_client_crt_vrfy' type-id='type-id-237' 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-238' visibility='default'/>
+        <var-decl name='gnutls_generate_server_crt_request' type-id='type-id-237' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='gnutls_process_server_certificate' type-id='type-id-239' visibility='default'/>
+        <var-decl name='gnutls_process_server_certificate' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='gnutls_process_client_certificate' type-id='type-id-239' visibility='default'/>
+        <var-decl name='gnutls_process_client_certificate' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='gnutls_process_server_kx' type-id='type-id-239' visibility='default'/>
+        <var-decl name='gnutls_process_server_kx' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='gnutls_process_client_kx' type-id='type-id-239' visibility='default'/>
+        <var-decl name='gnutls_process_client_kx' type-id='type-id-238' 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-239' visibility='default'/>
+        <var-decl name='gnutls_process_client_crt_vrfy' type-id='type-id-238' 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-239' visibility='default'/>
+        <var-decl name='gnutls_process_server_crt_request' type-id='type-id-238' visibility='default'/>
       </data-member>
     </class-decl>
-    <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-144' size-in-bits='64' id='type-id-242'/>
+    <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-243' size-in-bits='64' id='type-id-238'/>
-    <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-152'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-246'>
+    <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'>
       <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-246' id='type-id-153'/>
-    <typedef-decl name='gnutls_transport_ptr_t' type-id='type-id-106' id='type-id-159'/>
-    <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-154'/>
-    <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-155'/>
-    <typedef-decl name='gnutls_push_func' type-id='type-id-252' id='type-id-156'/>
-    <class-decl name='iovec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-253'>
+    <typedef-decl name='gnutls_certificate_request_t' type-id='type-id-245' 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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='iov_base' type-id='type-id-106' visibility='default'/>
+        <var-decl name='iov_base' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='iov_len' type-id='type-id-104' visibility='default'/>
+        <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-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-157'/>
-    <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-158'/>
-    <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-160'/>
-    <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-161'/>
-    <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-162'/>
-    <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-163'/>
-    <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-164'/>
-    <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-165'/>
-    <class-decl name='gnutls_pcert_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-273'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pubkey' type-id='type-id-274' visibility='default'/>
+        <var-decl name='pubkey' type-id='type-id-273' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cert' type-id='type-id-3' visibility='default'/>
@@ -1924,14 +1936,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-275'/>
-    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-276'/>
-    <typedef-decl name='gnutls_pubkey_t' type-id='type-id-276' id='type-id-274'/>
-    <typedef-decl name='gnutls_pcert_st' type-id='type-id-273' id='type-id-277'/>
+    <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_privkey_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-278'/>
-    <pointer-type-def type-id='type-id-278' 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-279'>
+    <class-decl name='gnutls_ocsp_data_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-278'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='version' type-id='type-id-2' visibility='default'/>
       </data-member>
@@ -1942,19 +1954,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-280' visibility='default'/>
+        <var-decl name='padding' type-id='type-id-279' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='256' id='type-id-280'>
+    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='256' id='type-id-279'>
       <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-279' id='type-id-281'/>
-    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-168'/>
-    <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-283'/>
-    <typedef-decl name='gnutls_status_request_ocsp_func' type-id='type-id-283' 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-284'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='dcookie' type-id='type-id-3' visibility='default'/>
       </data-member>
@@ -1986,35 +1998,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-173' visibility='default'/>
+        <var-decl name='last_retransmit' type-id='type-id-172' 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-173'>
+    <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-172'>
       <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-285' visibility='default'/>
+        <var-decl name='tv_nsec' type-id='type-id-284' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__syscall_slong_t' type-id='type-id-58' id='type-id-285'/>
-    <typedef-decl name='dtls_st' type-id='type-id-284' id='type-id-171'/>
+    <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'/>
 
-    <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-286'/>
+    <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>
-    <enum-decl name='heartbeat_state_t' id='type-id-287'>
+    <enum-decl name='heartbeat_state_t' id='type-id-286'>
       <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-287' id='type-id-174'/>
-    <enum-decl name='recv_state_t' id='type-id-288'>
+    <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'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='RECV_STATE_0' value='0'/>
       <enumerator name='RECV_STATE_DTLS_RETRANSMIT' value='1'/>
@@ -2026,12 +2038,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-288' id='type-id-175'/>
-    <typedef-decl name='gnutls_certificate_verify_function' type-id='type-id-267' id='type-id-289'/>
-    <pointer-type-def type-id='type-id-289' 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-290'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-291' visibility='default'/>
+        <var-decl name='type' type-id='type-id-290' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data' type-id='type-id-5' visibility='default'/>
@@ -2040,7 +2052,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-292'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-291'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_DT_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_DT_DNS_HOSTNAME' value='1'/>
@@ -2048,15 +2060,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-292' id='type-id-291'/>
-    <typedef-decl name='gnutls_typed_vdata_st' type-id='type-id-290' id='type-id-178'/>
-    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-177'/>
+    <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'/>
 
-    <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-293'/>
+    <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>
-    <class-decl name='tfo_st' size-in-bits='1216' is-struct='yes' visibility='default' id='type-id-294'>
+    <class-decl name='tfo_st' size-in-bits='1216' is-struct='yes' visibility='default' id='type-id-293'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fd' type-id='type-id-1' visibility='default'/>
       </data-member>
@@ -2067,42 +2079,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-295' visibility='default'/>
+        <var-decl name='connect_addr' type-id='type-id-294' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='connect_addrlen' type-id='type-id-296' visibility='default'/>
+        <var-decl name='connect_addrlen' type-id='type-id-295' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='sockaddr_storage' size-in-bits='1024' is-struct='yes' visibility='default' id='type-id-295'>
+    <class-decl name='sockaddr_storage' size-in-bits='1024' is-struct='yes' visibility='default' id='type-id-294'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ss_family' type-id='type-id-297' visibility='default'/>
+        <var-decl name='ss_family' type-id='type-id-296' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='__ss_padding' type-id='type-id-298' visibility='default'/>
+        <var-decl name='__ss_padding' type-id='type-id-297' 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-297'/>
+    <typedef-decl name='sa_family_t' type-id='type-id-31' id='type-id-296'/>
 
-    <array-type-def dimensions='1' type-id='type-id-40' size-in-bits='944' id='type-id-298'>
-      <subrange length='118' type-id='type-id-44' 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>
-    <typedef-decl name='__socklen_t' type-id='type-id-2' id='type-id-300'/>
-    <typedef-decl name='socklen_t' type-id='type-id-300' id='type-id-296'/>
-    <typedef-decl name='tfo_st' type-id='type-id-294' id='type-id-180'/>
-    <class-decl name='gnutls_supplemental_entry_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-301'/>
+    <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='hello_ext_entry_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-302'/>
-    <pointer-type-def type-id='type-id-302' 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-303'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-302'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='priv' type-id='type-id-304' visibility='default'/>
+        <var-decl name='priv' type-id='type-id-303' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='resumed_priv' type-id='type-id-304' visibility='default'/>
+        <var-decl name='resumed_priv' type-id='type-id-303' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='set' type-id='type-id-24' visibility='default'/>
@@ -2111,13 +2123,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-106' id='type-id-304'/>
+    <typedef-decl name='gnutls_ext_priv_data_t' type-id='type-id-105' id='type-id-303'/>
 
-    <array-type-def dimensions='1' type-id='type-id-303' size-in-bits='6144' id='type-id-183'>
+    <array-type-def dimensions='1' type-id='type-id-302' size-in-bits='6144' id='type-id-182'>
       <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-305'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-304'>
       <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'/>
@@ -2129,13 +2141,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-305' 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-306'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='arrival_time' type-id='type-id-173' visibility='default'/>
+        <var-decl name='arrival_time' type-id='type-id-172' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='creation_time' type-id='type-id-173' visibility='default'/>
+        <var-decl name='creation_time' type-id='type-id-172' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='lifetime' type-id='type-id-26' visibility='default'/>
@@ -2144,10 +2156,10 @@
         <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-307' visibility='default'/>
+        <var-decl name='nonce' type-id='type-id-306' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='nonce_size' type-id='type-id-104' visibility='default'/>
+        <var-decl name='nonce_size' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
         <var-decl name='prf' type-id='type-id-21' visibility='default'/>
@@ -2160,67 +2172,67 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='2040' id='type-id-307'>
-      <subrange length='255' type-id='type-id-44' id='type-id-308'/>
+    <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>
-    <typedef-decl name='tls13_ticket_st' type-id='type-id-306' id='type-id-185'/>
-    <class-decl name='gnutls_anti_replay_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-309'/>
-    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-310'/>
-    <typedef-decl name='gnutls_anti_replay_t' type-id='type-id-310' id='type-id-186'/>
-    <typedef-decl name='internals_st' type-id='type-id-142' id='type-id-16'/>
-    <class-decl name='gnutls_key_st' size-in-bits='22336' is-struct='yes' visibility='default' id='type-id-311'>
+    <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='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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='kshare' type-id='type-id-312' visibility='default'/>
+        <var-decl name='kshare' type-id='type-id-311' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11328'>
-        <var-decl name='proto' type-id='type-id-313' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='11520'>
+        <var-decl name='proto' type-id='type-id-312' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='19776'>
-        <var-decl name='binders' type-id='type-id-314' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='20096'>
+        <var-decl name='binders' type-id='type-id-313' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='20288'>
+      <data-member access='public' layout-offset-in-bits='20608'>
         <var-decl name='key' type-id='type-id-3' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='20416'>
+      <data-member access='public' layout-offset-in-bits='20736'>
         <var-decl name='session_ticket_key' type-id='type-id-93' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='20928'>
+      <data-member access='public' layout-offset-in-bits='21248'>
         <var-decl name='previous_ticket_key' type-id='type-id-93' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='21440'>
+      <data-member access='public' layout-offset-in-bits='21760'>
         <var-decl name='initial_stek' type-id='type-id-93' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='21952'>
-        <var-decl name='auth_info' type-id='type-id-106' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='22272'>
+        <var-decl name='auth_info' type-id='type-id-105' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='22016'>
-        <var-decl name='auth_info_type' type-id='type-id-315' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='22336'>
+        <var-decl name='auth_info_type' type-id='type-id-314' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='22048'>
+      <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='22080'>
-        <var-decl name='cred' type-id='type-id-316' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='22400'>
+        <var-decl name='cred' type-id='type-id-315' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='22144'>
-        <var-decl name='totp' type-id='type-id-317' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='22464'>
+        <var-decl name='totp' type-id='type-id-316' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='11328' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-312'>
+    <class-decl name='__anonymous_struct__' size-in-bits='11520' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-311'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ecdh_params' type-id='type-id-318' visibility='default'/>
+        <var-decl name='ecdh_params' type-id='type-id-317' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='ecdhx_params' type-id='type-id-318' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='3840'>
+        <var-decl name='ecdhx_params' type-id='type-id-317' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='7552'>
-        <var-decl name='dh_params' type-id='type-id-318' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='7680'>
+        <var-decl name='dh_params' type-id='type-id-317' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='3776' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-318' visibility='default' id='type-id-319'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-320' visibility='default'/>
+        <var-decl name='params' type-id='type-id-319' 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'/>
@@ -2238,7 +2250,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-321' visibility='default'/>
+        <var-decl name='gost_params' type-id='type-id-320' 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'/>
@@ -2250,25 +2262,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-322' visibility='default'/>
+        <var-decl name='seed' type-id='type-id-321' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3552'>
-        <var-decl name='palgo' type-id='type-id-216' visibility='default'/>
+        <var-decl name='palgo' type-id='type-id-215' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3584'>
-        <var-decl name='spki' type-id='type-id-323' visibility='default'/>
+        <var-decl name='spki' type-id='type-id-322' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3712'>
+      <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-106' id='type-id-324'/>
+    <typedef-decl name='bigint_t' type-id='type-id-105' id='type-id-323'/>
 
-    <array-type-def dimensions='1' type-id='type-id-324' size-in-bits='1024' id='type-id-320'>
-      <subrange length='16' type-id='type-id-44' id='type-id-98'/>
+    <array-type-def dimensions='1' type-id='type-id-323' size-in-bits='1024' id='type-id-319'>
+      <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-325'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-324'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_TC26_Z' value='1'/>
@@ -2277,18 +2289,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-325' id='type-id-321'/>
+    <typedef-decl name='gnutls_gost_paramset_t' type-id='type-id-324' id='type-id-320'/>
 
-    <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='2048' id='type-id-322'>
-      <subrange length='256' type-id='type-id-44' id='type-id-228'/>
+    <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>
-    <class-decl name='gnutls_x509_spki_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-326'>
+    <class-decl name='gnutls_x509_spki_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-325'>
       <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-216' visibility='default'/>
+        <var-decl name='rsa_pss_dig' type-id='type-id-215' 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'/>
@@ -2296,18 +2308,24 @@
       <data-member access='public' layout-offset-in-bits='96'>
         <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'/>
+      </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-326' id='type-id-323'/>
-    <typedef-decl name='gnutls_pk_params_st' type-id='type-id-319' id='type-id-318'/>
-    <union-decl name='__anonymous_union__' size-in-bits='8448' is-anonymous='yes' visibility='default' id='type-id-313'>
+    <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'>
       <data-member access='private'>
-        <var-decl name='tls13' type-id='type-id-327' visibility='default'/>
+        <var-decl name='tls13' type-id='type-id-326' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='tls12' type-id='type-id-328' visibility='default'/>
+        <var-decl name='tls12' type-id='type-id-327' 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-327'>
+    <class-decl name='__anonymous_struct__' size-in-bits='4128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-326'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='temp_secret' type-id='type-id-93' visibility='default'/>
       </data-member>
@@ -2336,69 +2354,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='8448' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-328'>
+    <class-decl name='__anonymous_struct__' size-in-bits='8576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-327'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ecdh' type-id='type-id-329' visibility='default'/>
+        <var-decl name='ecdh' type-id='type-id-328' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='dh' type-id='type-id-330' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='4096'>
+        <var-decl name='dh' type-id='type-id-329' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='7872'>
-        <var-decl name='srp' type-id='type-id-331' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='8000'>
+        <var-decl name='srp' type-id='type-id-330' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='4032' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-329'>
+    <class-decl name='__anonymous_struct__' size-in-bits='4096' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-328'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-318' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='x' type-id='type-id-324' visibility='default'/>
+        <var-decl name='params' type-id='type-id-317' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='y' type-id='type-id-324' visibility='default'/>
+        <var-decl name='x' type-id='type-id-323' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
+        <var-decl name='y' type-id='type-id-323' 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='3840' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-330'>
+    <class-decl name='__anonymous_struct__' size-in-bits='3904' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-329'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-318' visibility='default'/>
+        <var-decl name='params' type-id='type-id-317' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='client_Y' type-id='type-id-324' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='3840'>
+        <var-decl name='client_Y' type-id='type-id-323' 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-331'>
+    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-330'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='srp_key' type-id='type-id-324' visibility='default'/>
+        <var-decl name='srp_key' type-id='type-id-323' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='srp_g' type-id='type-id-324' visibility='default'/>
+        <var-decl name='srp_g' type-id='type-id-323' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='srp_p' type-id='type-id-324' visibility='default'/>
+        <var-decl name='srp_p' type-id='type-id-323' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='A' type-id='type-id-324' visibility='default'/>
+        <var-decl name='A' type-id='type-id-323' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='B' type-id='type-id-324' visibility='default'/>
+        <var-decl name='B' type-id='type-id-323' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='u' type-id='type-id-324' visibility='default'/>
+        <var-decl name='u' type-id='type-id-323' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='b' type-id='type-id-324' visibility='default'/>
+        <var-decl name='b' type-id='type-id-323' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='a' type-id='type-id-324' visibility='default'/>
+        <var-decl name='a' type-id='type-id-323' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='x' type-id='type-id-324' visibility='default'/>
+        <var-decl name='x' type-id='type-id-323' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='binder_data_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-332'>
+    <class-decl name='binder_data_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-331'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='prf' type-id='type-id-21' visibility='default'/>
       </data-member>
@@ -2413,11 +2431,11 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-332' size-in-bits='512' id='type-id-314'>
+    <array-type-def dimensions='1' type-id='type-id-331' size-in-bits='512' id='type-id-313'>
       <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-333'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-332'>
       <underlying-type type-id='type-id-47'/>
       <enumerator name='GNUTLS_CRD_CERTIFICATE' value='1'/>
       <enumerator name='GNUTLS_CRD_ANON' value='2'/>
@@ -2425,21 +2443,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-333' id='type-id-315'/>
-    <class-decl name='auth_cred_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-334'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='algorithm' type-id='type-id-315' visibility='default'/>
+        <var-decl name='algorithm' type-id='type-id-314' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='credentials' type-id='type-id-106' visibility='default'/>
+        <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-316' visibility='default'/>
+        <var-decl name='next' type-id='type-id-315' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-334' size-in-bits='64' id='type-id-316'/>
-    <typedef-decl name='auth_cred_st' type-id='type-id-334' id='type-id-335'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-317'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='last_result' type-id='type-id-84' visibility='default'/>
       </data-member>
@@ -2447,22 +2465,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-336' visibility='default'/>
+        <var-decl name='cb' type-id='type-id-335' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-338'/>
-    <typedef-decl name='gnutls_stek_rotation_callback_t' type-id='type-id-338' id='type-id-336'/>
-    <typedef-decl name='gnutls_key_st' type-id='type-id-311' id='type-id-17'/>
-    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-339'/>
+    <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'/>
     <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-241' name='session'/>
+      <parameter type-id='type-id-240' 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-339' name='verify'/>
+      <parameter type-id='type-id-338' 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'>
@@ -2475,38 +2493,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-339' name='verify'/>
+      <parameter type-id='type-id-338' 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-340'>
+    <class-decl name='dane_query_st' size-in-bits='22592' is-struct='yes' visibility='default' id='type-id-339'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='result' type-id='type-id-341' visibility='default'/>
+        <var-decl name='result' type-id='type-id-340' 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-342' visibility='default'/>
+        <var-decl name='usage' type-id='type-id-341' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3296'>
-        <var-decl name='type' type-id='type-id-343' visibility='default'/>
+        <var-decl name='type' type-id='type-id-342' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6496'>
-        <var-decl name='match' type-id='type-id-344' visibility='default'/>
+        <var-decl name='match' type-id='type-id-343' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
-        <var-decl name='data' type-id='type-id-345' visibility='default'/>
+        <var-decl name='data' type-id='type-id-344' 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-346' visibility='default'/>
+        <var-decl name='status' type-id='type-id-345' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='ub_result' size-in-bits='768' is-struct='yes' visibility='default' id='type-id-347'>
+    <class-decl name='ub_result' size-in-bits='768' is-struct='yes' visibility='default' id='type-id-346'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='qname' type-id='type-id-348' visibility='default'/>
+        <var-decl name='qname' type-id='type-id-347' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='qtype' type-id='type-id-1' visibility='default'/>
@@ -2515,19 +2533,19 @@
         <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-349' visibility='default'/>
+        <var-decl name='data' type-id='type-id-348' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='len' type-id='type-id-350' visibility='default'/>
+        <var-decl name='len' type-id='type-id-349' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='canonname' type-id='type-id-348' visibility='default'/>
+        <var-decl name='canonname' type-id='type-id-347' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='rcode' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='answer_packet' type-id='type-id-106' visibility='default'/>
+        <var-decl name='answer_packet' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='answer_len' type-id='type-id-1' visibility='default'/>
@@ -2545,7 +2563,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-348' visibility='default'/>
+        <var-decl name='why_bogus' type-id='type-id-347' 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'/>
@@ -2554,86 +2572,86 @@
         <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-348'/>
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-349'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-350'/>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-341'/>
-    <enum-decl name='dane_cert_usage_t' id='type-id-351'>
+    <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'>
       <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-351' id='type-id-352'/>
+    <typedef-decl name='dane_cert_usage_t' type-id='type-id-350' id='type-id-351'/>
 
-    <array-type-def dimensions='1' type-id='type-id-352' size-in-bits='3200' alignment-in-bits='32' id='type-id-342'>
-      <subrange length='100' type-id='type-id-44' id='type-id-353'/>
+    <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>
-    <enum-decl name='dane_cert_type_t' id='type-id-354'>
+    <enum-decl name='dane_cert_type_t' id='type-id-353'>
       <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-354' id='type-id-355'/>
+    <typedef-decl name='dane_cert_type_t' type-id='type-id-353' id='type-id-354'/>
 
-    <array-type-def dimensions='1' type-id='type-id-355' size-in-bits='3200' alignment-in-bits='32' id='type-id-343'>
-      <subrange length='100' type-id='type-id-44' id='type-id-353'/>
+    <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>
-    <enum-decl name='dane_match_type_t' id='type-id-356'>
+    <enum-decl name='dane_match_type_t' id='type-id-355'>
       <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-356' id='type-id-357'/>
+    <typedef-decl name='dane_match_type_t' type-id='type-id-355' id='type-id-356'/>
 
-    <array-type-def dimensions='1' type-id='type-id-357' size-in-bits='3200' alignment-in-bits='32' id='type-id-344'>
-      <subrange length='100' type-id='type-id-44' id='type-id-353'/>
+    <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>
 
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='12800' id='type-id-345'>
-      <subrange length='100' type-id='type-id-44' id='type-id-353'/>
+    <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>
-    <enum-decl name='dane_query_status_t' id='type-id-358'>
+    <enum-decl name='dane_query_status_t' id='type-id-357'>
       <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-358' id='type-id-346'/>
-    <pointer-type-def type-id='type-id-340' size-in-bits='64' id='type-id-359'/>
-    <typedef-decl name='dane_query_t' type-id='type-id-359' id='type-id-360'/>
-    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-361'/>
+    <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'/>
     <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-361' name='r'/>
+      <parameter type-id='type-id-360' 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-348' const='yes' id='type-id-362'/>
-    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-363'/>
-    <qualified-type-def type-id='type-id-1' 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-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'/>
     <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-361' name='r'/>
-      <parameter type-id='type-id-363' name='dane_data'/>
-      <parameter type-id='type-id-365' name='dane_data_len'/>
+      <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-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-360' name='q'/>
-      <return type-id='type-id-116'/>
+      <parameter type-id='type-id-359' 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'>
       <parameter type-id='type-id-12' name='s'/>
@@ -2642,328 +2660,332 @@
     </function-decl>
     <function-decl name='dane_state_deinit' mangled-name='dane_state_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dane_state_deinit@@DANE_0_0'>
       <parameter type-id='type-id-12' name='s'/>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-366'/>
+    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-365'/>
     <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-366' name='s'/>
+      <parameter type-id='type-id-365' 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-350' size-in-bits='64' id='type-id-368'/>
     <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-360' name='q'/>
-      <parameter type-id='type-id-339' name='data_entries'/>
-      <parameter type-id='type-id-367' name='dane_data'/>
-      <parameter type-id='type-id-368' name='dane_data_len'/>
-      <parameter type-id='type-id-350' name='secure'/>
-      <parameter type-id='type-id-350' name='bogus'/>
+      <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'/>
       <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-360' name='q'/>
+      <parameter type-id='type-id-359' name='q'/>
       <parameter type-id='type-id-2' name='idx'/>
-      <parameter type-id='type-id-339' name='usage'/>
-      <parameter type-id='type-id-339' name='type'/>
-      <parameter type-id='type-id-339' name='match'/>
+      <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-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-360' name='q'/>
+      <parameter type-id='type-id-359' 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-360' name='q'/>
-      <return type-id='type-id-346'/>
+      <parameter type-id='type-id-359' name='q'/>
+      <return type-id='type-id-345'/>
     </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-360' name='r'/>
+      <parameter type-id='type-id-359' name='r'/>
       <parameter type-id='type-id-2' name='sflags'/>
       <parameter type-id='type-id-2' name='vflags'/>
-      <parameter type-id='type-id-339' name='verify'/>
+      <parameter type-id='type-id-338' 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'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='dcgettext' mangled-name='dcgettext' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_append_str' mangled-name='_gnutls_buffer_append_str' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <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-116'/>
+      <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-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_import' mangled-name='gnutls_x509_crt_import' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </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'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='gnutls_credentials_get' mangled-name='gnutls_credentials_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <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-116'/>
+      <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-116'/>
+      <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-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='free' mangled-name='free' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_deinit' mangled-name='gnutls_x509_crt_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='gnutls_certificate_get_peers' mangled-name='gnutls_certificate_get_peers' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='gnutls_certificate_type_get' mangled-name='gnutls_certificate_type_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_init' mangled-name='gnutls_pubkey_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_x509' mangled-name='gnutls_pubkey_import_x509' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export2' mangled-name='gnutls_pubkey_export2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_deinit' mangled-name='gnutls_pubkey_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='snprintf' mangled-name='snprintf' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <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'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='ub_resolve_free' mangled-name='ub_resolve_free' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='calloc' mangled-name='calloc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='ub_ctx_set_option' mangled-name='ub_ctx_set_option' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='ub_ctx_delete' mangled-name='ub_ctx_delete' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='ub_ctx_create' mangled-name='ub_ctx_create' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='ub_ctx_debugout' mangled-name='ub_ctx_debugout' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='ub_ctx_resolvconf' mangled-name='ub_ctx_resolvconf' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='ub_ctx_hosts' mangled-name='ub_ctx_hosts' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='ub_ctx_add_ta_file' mangled-name='ub_ctx_add_ta_file' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='gnutls_hash_fast' mangled-name='gnutls_hash_fast' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='__builtin_memcmp' mangled-name='memcmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <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-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-267'>
-      <parameter type-id='type-id-241'/>
+    <function-type size-in-bits='64' id='type-id-266'>
+      <parameter type-id='type-id-240'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-243'>
+    <function-type size-in-bits='64' id='type-id-242'>
+      <parameter type-id='type-id-240'/>
       <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-104'/>
+    <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-103'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-269'>
-      <parameter type-id='type-id-241'/>
+    <function-type size-in-bits='64' id='type-id-268'>
+      <parameter type-id='type-id-240'/>
       <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-282'>
-      <parameter type-id='type-id-241'/>
-      <parameter type-id='type-id-106'/>
+    <function-type size-in-bits='64' id='type-id-281'>
+      <parameter type-id='type-id-240'/>
+      <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-259'>
-      <parameter type-id='type-id-159'/>
+    <function-type size-in-bits='64' id='type-id-258'>
+      <parameter type-id='type-id-158'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-247'>
-      <parameter type-id='type-id-159'/>
+    <function-type size-in-bits='64' id='type-id-246'>
+      <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-265'>
-      <parameter type-id='type-id-106'/>
+    <function-type size-in-bits='64' id='type-id-264'>
+      <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-261'>
-      <parameter type-id='type-id-106'/>
+    <function-type size-in-bits='64' id='type-id-260'>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-121'>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
+    <function-type size-in-bits='64' id='type-id-120'>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-117'>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
+    <function-type size-in-bits='64' id='type-id-116'>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-119'>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
+    <function-type size-in-bits='64' id='type-id-118'>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-263'>
-      <parameter type-id='type-id-106'/>
+    <function-type size-in-bits='64' id='type-id-262'>
+      <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-257'>
-      <parameter type-id='type-id-159'/>
-      <parameter type-id='type-id-256'/>
+    <function-type size-in-bits='64' id='type-id-256'>
+      <parameter type-id='type-id-158'/>
+      <parameter type-id='type-id-255'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-250'/>
+      <return type-id='type-id-249'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-251'>
-      <parameter type-id='type-id-159'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
-      <return type-id='type-id-250'/>
+    <function-type size-in-bits='64' id='type-id-250'>
+      <parameter type-id='type-id-158'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
+      <return type-id='type-id-249'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-337'>
+    <function-type size-in-bits='64' id='type-id-336'>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-84'/>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-124'>
+      <parameter type-id='type-id-105'/>
+      <return type-id='type-id-115'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-125'>
-      <parameter type-id='type-id-106'/>
-      <return type-id='type-id-116'/>
+    <function-type size-in-bits='64' id='type-id-122'>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
+      <return type-id='type-id-115'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-123'>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-104'/>
-      <return type-id='type-id-116'/>
+    <function-type size-in-bits='64' id='type-id-133'>
+      <parameter type-id='type-id-105'/>
+      <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/nmavrogi/cvs/gnutls-mine/libdane' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dane-params.c' comp-dir-path='/home/nmavrogi/cvs/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-352' name='usage'/>
+      <parameter type-id='type-id-351' 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-357' name='type'/>
+      <parameter type-id='type-id-356' 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-355' name='type'/>
+      <parameter type-id='type-id-354' 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/nmavrogi/cvs/gnutls-mine/libdane' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='errors.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-mine/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='read-file.c' comp-dir-path='/home/nmavrogi/cvs/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-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='__errno_location' mangled-name='__errno_location' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='fclose' mangled-name='fclose' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='ftello' mangled-name='ftello' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='__fxstat' mangled-name='__fxstat' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='fileno' mangled-name='fileno' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='realloc' mangled-name='realloc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='fread' mangled-name='fread' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <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-116'/>
+      <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-116'/>
+      <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/nmavrogi/cvs/gnutls-mine/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='asnprintf.c' comp-dir-path='/home/nmavrogi/cvs/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-116'/>
+      <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/nmavrogi/cvs/gnutls-mine/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='vasnprintf.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/gl' language='LANG_C99'>
     <function-decl name='abort' mangled-name='abort' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='printf_parse' mangled-name='printf_parse' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
     <function-decl name='printf_fetchargs' mangled-name='printf_fetchargs' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-116'/>
+      <return type-id='type-id-115'/>
     </function-decl>
   </abi-instr>
 </abi-corpus>
diff --git a/devel/libgnutls-3.6.7-x86_64.abi b/devel/libgnutls-3.6.12-x86_64.abi
index 9e23e0221c..3e0142397c 100644
--- a/devel/libgnutls-3.6.7-x86_64.abi
+++ b/devel/libgnutls-3.6.12-x86_64.abi
@@ -5,8 +5,8 @@
     <dependency name='libunistring.so.2'/>
     <dependency name='libdl.so.2'/>
     <dependency name='libtasn1.so.6'/>
-    <dependency name='libnettle.so.6'/>
-    <dependency name='libhogweed.so.4'/>
+    <dependency name='libnettle.so.7'/>
+    <dependency name='libhogweed.so.5'/>
     <dependency name='libgmp.so.10'/>
     <dependency name='libc.so.6'/>
     <dependency name='ld-linux-x86-64.so.2'/>
@@ -22,16 +22,24 @@
     <elf-symbol name='_gnutls_anti_replay_check' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_bin2hex' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_buffer_append_str' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_buffer_clear' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_buffer_init' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_buffer_pop_datum' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_buffer_to_datum' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_buffer_unescape' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_cidr_to_string' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_cipher_get_iv' version='GNUTLS_FIPS140_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_cipher_to_entry' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_decode_ber_rs_raw' version='GNUTLS_FIPS140_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_digest_exists' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_ecc_curve_is_supported' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_encode_ber_rs_raw' version='GNUTLS_FIPS140_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_global_init_skip' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_global_set_gettime_function' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_hello_set_default_version' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_iov_iter_init' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_iov_iter_next' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_iov_iter_sync' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_ip_to_string' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_lib_force_operational' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_lib_simulate_error' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -49,14 +57,18 @@
     <elf-symbol name='_gnutls_set_session_ticket_key_rotation_callback' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_supplemental_deinit' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_ucs2_to_utf8' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_utcTime2gtime' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_utf8_to_ucs2' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_version_to_entry' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_x509_generalTime2gtime' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_x509_name_constraints_merge' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_rsa_generate_fips186_4_keypair' version='GNUTLS_FIPS140_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='dsa_generate_dss_keypair' version='GNUTLS_FIPS140_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_aead_cipher_decrypt' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_aead_cipher_decryptv2' version='GNUTLS_3_6_10' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_aead_cipher_deinit' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_aead_cipher_encrypt' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_aead_cipher_encryptv2' version='GNUTLS_3_6_10' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_aead_cipher_encryptv' version='GNUTLS_3_6_3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_aead_cipher_init' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_alert_get' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -222,6 +234,7 @@
     <elf-symbol name='gnutls_dh_params_import_dsa' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_dh_params_import_pkcs3' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_dh_params_import_raw2' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_dh_params_import_raw3' version='GNUTLS_3_6_8' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_dh_params_import_raw' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_dh_params_init' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_dh_set_prime_bits' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -261,6 +274,7 @@
     <elf-symbol name='gnutls_fingerprint' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_fips140_mode_enabled' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_fips140_set_mode' version='GNUTLS_3_6_3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_get_system_config_file' version='GNUTLS_3_6_9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_global_deinit' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_global_init' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_global_set_audit_log_function' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -286,6 +300,7 @@
     <elf-symbol name='gnutls_handshake_set_random' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_handshake_set_timeout' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_hash' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_hash_copy' version='GNUTLS_3_6_9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_hash_deinit' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_hash_fast' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_hash_get_len' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -303,6 +318,7 @@
     <elf-symbol name='gnutls_hex_encode2' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_hex_encode' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_hmac' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_hmac_copy' version='GNUTLS_3_6_9' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_hmac_deinit' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_hmac_fast' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_hmac_get_len' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -587,6 +603,7 @@
     <elf-symbol name='gnutls_pkcs_schema_get_name' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_pkcs_schema_get_oid' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_prf' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_prf_early' version='GNUTLS_3_6_8' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_prf_raw' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_prf_rfc5705' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_priority_certificate_type_list2' version='GNUTLS_3_6_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -737,6 +754,7 @@
     <elf-symbol name='gnutls_record_send_early_data' version='GNUTLS_3_6_5' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_record_send_range' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_record_set_max_early_data_size' version='GNUTLS_3_6_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_record_set_max_recv_size' version='GNUTLS_3_6_8' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_record_set_max_size' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_record_set_state' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_record_set_timeout' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -1238,23 +1256,29 @@
   </elf-function-symbols>
   <elf-variable-symbols>
     <elf-symbol name='_gnutls_default_priority_string' size='8' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_global_version' size='4' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_log_level' size='4' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_mpi_ops' size='200' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_calloc' size='8' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_2048_group_generator' size='16' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_2048_group_prime' size='16' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_ffdhe_2048_group_q' size='16' version='GNUTLS_3_6_8' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_2048_key_bits' size='4' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_3072_group_generator' size='16' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_3072_group_prime' size='16' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_ffdhe_3072_group_q' size='16' version='GNUTLS_3_6_8' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_3072_key_bits' size='4' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_4096_group_generator' size='16' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_4096_group_prime' size='16' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_ffdhe_4096_group_q' size='16' version='GNUTLS_3_6_8' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_4096_key_bits' size='4' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_6144_group_generator' size='16' version='GNUTLS_3_6_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_6144_group_prime' size='16' version='GNUTLS_3_6_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_ffdhe_6144_group_q' size='16' version='GNUTLS_3_6_8' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_6144_key_bits' size='4' version='GNUTLS_3_6_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_8192_group_generator' size='16' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_8192_group_prime' size='16' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_ffdhe_8192_group_q' size='16' version='GNUTLS_3_6_8' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_ffdhe_8192_key_bits' size='4' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_free' size='8' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_malloc' size='8' version='GNUTLS_3_4' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -1274,11 +1298,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='range.c' comp-dir-path='/home/nmavrogi/cvs/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='52288' is-struct='yes' visibility='default' id='type-id-4'>
+    <class-decl name='gnutls_session_int' size-in-bits='52736' 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>
@@ -1288,7 +1312,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='29952'>
+      <data-member access='public' layout-offset-in-bits='30080'>
         <var-decl name='key' type-id='type-id-8' visibility='default'/>
       </data-member>
     </class-decl>
@@ -1341,13 +1365,19 @@
       <data-member access='public' layout-offset-in-bits='1568'>
         <var-decl name='max_record_recv_size' type-id='type-id-11' visibility='default'/>
       </data-member>
+      <data-member access='public' layout-offset-in-bits='1584'>
+        <var-decl name='max_user_record_send_size' type-id='type-id-11' visibility='default'/>
+      </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='max_early_data_size' type-id='type-id-18' visibility='default'/>
+        <var-decl name='max_user_record_recv_size' type-id='type-id-11' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1632'>
-        <var-decl name='client_ctype' type-id='type-id-19' visibility='default'/>
+        <var-decl name='max_early_data_size' type-id='type-id-18' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
+        <var-decl name='client_ctype' type-id='type-id-19' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1696'>
         <var-decl name='server_ctype' type-id='type-id-19' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
@@ -1468,6 +1498,7 @@
       <enumerator name='GNUTLS_CIPHER_AES_256_CFB8' value='31'/>
       <enumerator name='GNUTLS_CIPHER_AES_128_XTS' value='32'/>
       <enumerator name='GNUTLS_CIPHER_AES_256_XTS' value='33'/>
+      <enumerator name='GNUTLS_CIPHER_GOST28147_TC26Z_CNT' value='34'/>
       <enumerator name='GNUTLS_CIPHER_IDEA_PGP_CFB' value='200'/>
       <enumerator name='GNUTLS_CIPHER_3DES_PGP_CFB' value='201'/>
       <enumerator name='GNUTLS_CIPHER_CAST5_PGP_CFB' value='202'/>
@@ -1497,6 +1528,7 @@
       <enumerator name='GNUTLS_KX_ECDHE_ECDSA' value='13'/>
       <enumerator name='GNUTLS_KX_ECDHE_PSK' value='14'/>
       <enumerator name='GNUTLS_KX_RSA_PSK' value='15'/>
+      <enumerator name='GNUTLS_KX_VKO_GOST_12' value='16'/>
     </enum-decl>
     <typedef-decl name='gnutls_kx_algorithm_t' type-id='type-id-43' id='type-id-30'/>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-44'>
@@ -1524,6 +1556,10 @@
       <enumerator name='GNUTLS_MAC_UMAC_128' value='202'/>
       <enumerator name='GNUTLS_MAC_AES_CMAC_128' value='203'/>
       <enumerator name='GNUTLS_MAC_AES_CMAC_256' value='204'/>
+      <enumerator name='GNUTLS_MAC_AES_GMAC_128' value='205'/>
+      <enumerator name='GNUTLS_MAC_AES_GMAC_192' value='206'/>
+      <enumerator name='GNUTLS_MAC_AES_GMAC_256' value='207'/>
+      <enumerator name='GNUTLS_MAC_GOST28147_TC26Z_IMIT' value='208'/>
     </enum-decl>
     <typedef-decl name='gnutls_mac_algorithm_t' type-id='type-id-44' id='type-id-31'/>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-45'>
@@ -1574,7 +1610,7 @@
         <var-decl name='block_size' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='preimage_insecure' type-id='type-id-10' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
     <typedef-decl name='mac_entry_st' type-id='type-id-47' id='type-id-48'/>
@@ -1603,7 +1639,7 @@
       <enumerator name='GNUTLS_CRT_MAX' value='3'/>
     </enum-decl>
     <typedef-decl name='gnutls_certificate_type_t' type-id='type-id-54' id='type-id-19'/>
-    <class-decl name='gnutls_group_entry_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-55'>
+    <class-decl name='gnutls_group_entry_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-55'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
@@ -1614,18 +1650,21 @@
         <var-decl name='prime' type-id='type-id-57' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='generator' type-id='type-id-57' visibility='default'/>
+        <var-decl name='q' type-id='type-id-57' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='q_bits' type-id='type-id-58' visibility='default'/>
+        <var-decl name='generator' type-id='type-id-57' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='q_bits' type-id='type-id-58' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='curve' type-id='type-id-59' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='352'>
+      <data-member access='public' layout-offset-in-bits='416'>
         <var-decl name='pk' type-id='type-id-60' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
+      <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='tls_id' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
@@ -1638,6 +1677,13 @@
       <enumerator name='GNUTLS_GROUP_SECP384R1' value='3'/>
       <enumerator name='GNUTLS_GROUP_SECP521R1' value='4'/>
       <enumerator name='GNUTLS_GROUP_X25519' value='6'/>
+      <enumerator name='GNUTLS_GROUP_GC256A' value='16'/>
+      <enumerator name='GNUTLS_GROUP_GC256B' value='17'/>
+      <enumerator name='GNUTLS_GROUP_GC256C' value='18'/>
+      <enumerator name='GNUTLS_GROUP_GC256D' value='19'/>
+      <enumerator name='GNUTLS_GROUP_GC512A' value='13'/>
+      <enumerator name='GNUTLS_GROUP_GC512B' value='14'/>
+      <enumerator name='GNUTLS_GROUP_GC512C' value='15'/>
       <enumerator name='GNUTLS_GROUP_FFDHE2048' value='256'/>
       <enumerator name='GNUTLS_GROUP_FFDHE3072' value='257'/>
       <enumerator name='GNUTLS_GROUP_FFDHE4096' value='258'/>
@@ -1677,7 +1723,12 @@
       <enumerator name='GNUTLS_ECC_CURVE_GOST256CPXB' value='12'/>
       <enumerator name='GNUTLS_ECC_CURVE_GOST512A' value='13'/>
       <enumerator name='GNUTLS_ECC_CURVE_GOST512B' value='14'/>
-      <enumerator name='GNUTLS_ECC_CURVE_MAX' value='14'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST512C' value='15'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST256A' value='16'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST256B' value='17'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST256C' value='18'/>
+      <enumerator name='GNUTLS_ECC_CURVE_GOST256D' value='19'/>
+      <enumerator name='GNUTLS_ECC_CURVE_MAX' value='19'/>
     </enum-decl>
     <typedef-decl name='gnutls_ecc_curve_t' type-id='type-id-67' id='type-id-59'/>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-68'>
@@ -1819,7 +1870,7 @@
     <qualified-type-def type-id='type-id-72' const='yes' id='type-id-77'/>
     <pointer-type-def type-id='type-id-77' size-in-bits='64' id='type-id-23'/>
     <typedef-decl name='security_parameters_st' type-id='type-id-9' id='type-id-5'/>
-    <class-decl name='record_parameters_st' size-in-bits='5248' is-struct='yes' visibility='default' id='type-id-78'>
+    <class-decl name='record_parameters_st' size-in-bits='5504' is-struct='yes' visibility='default' id='type-id-78'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='epoch' type-id='type-id-11' visibility='default'/>
       </data-member>
@@ -1847,10 +1898,10 @@
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='read' type-id='type-id-81' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2816'>
+      <data-member access='public' layout-offset-in-bits='2944'>
         <var-decl name='write' type-id='type-id-81' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='5184'>
+      <data-member access='public' layout-offset-in-bits='5440'>
         <var-decl name='usage_cnt' type-id='type-id-22' visibility='default'/>
       </data-member>
     </class-decl>
@@ -1883,13 +1934,7 @@
         <var-decl name='tagsize' type-id='type-id-11' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='xor_nonce' type-id='type-id-75' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='232'>
-        <var-decl name='only_aead' type-id='type-id-75' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='240'>
-        <var-decl name='no_rekey' type-id='type-id-75' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-84'>
@@ -1904,7 +1949,7 @@
     <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-79'/>
     <typedef-decl name='__uint64_t' type-id='type-id-38' id='type-id-87'/>
     <typedef-decl name='uint64_t' type-id='type-id-87' id='type-id-80'/>
-    <class-decl name='record_state_st' size-in-bits='2368' is-struct='yes' visibility='default' id='type-id-88'>
+    <class-decl name='record_state_st' size-in-bits='2496' is-struct='yes' visibility='default' id='type-id-88'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='mac_key' type-id='type-id-89' visibility='default'/>
       </data-member>
@@ -1926,104 +1971,111 @@
       <data-member access='public' layout-offset-in-bits='1024'>
         <var-decl name='ctx' type-id='type-id-91' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2240'>
+      <data-member access='public' layout-offset-in-bits='2368'>
         <var-decl name='aead_tag_size' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2272'>
+      <data-member access='public' layout-offset-in-bits='2400'>
         <var-decl name='is_aead' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='sequence_number' type-id='type-id-92' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='2432'>
+        <var-decl name='sequence_number' type-id='type-id-80' visibility='default'/>
       </data-member>
     </class-decl>
 
     <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='512' id='type-id-89'>
-      <subrange length='64' type-id='type-id-38' id='type-id-93'/>
+      <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
 
     <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='128' id='type-id-90'>
-      <subrange length='16' type-id='type-id-38' id='type-id-94'/>
+      <subrange length='16' type-id='type-id-38' id='type-id-93'/>
 
     </array-type-def>
-    <union-decl name='__anonymous_union__' size-in-bits='1216' is-anonymous='yes' visibility='default' id='type-id-91'>
+    <union-decl name='__anonymous_union__' size-in-bits='1344' is-anonymous='yes' visibility='default' id='type-id-91'>
       <data-member access='private'>
-        <var-decl name='tls12' type-id='type-id-95' visibility='default'/>
+        <var-decl name='tls12' type-id='type-id-94' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='aead' type-id='type-id-96' visibility='default'/>
+        <var-decl name='aead' type-id='type-id-95' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='1216' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-95' visibility='default' id='type-id-97'>
+    <class-decl name='__anonymous_struct__' size-in-bits='1344' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-94' visibility='default' id='type-id-96'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cipher' type-id='type-id-98' visibility='default'/>
+        <var-decl name='cipher' type-id='type-id-97' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='mac' type-id='type-id-99' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='mac' type-id='type-id-98' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='is_mac' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='30'>
-        <var-decl name='non_null' type-id='type-id-10' visibility='default'/>
+        <var-decl name='continuous_mac' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='29'>
+        <var-decl name='non_null' type-id='type-id-10' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='28'>
         <var-decl name='etm' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='tag_size' type-id='type-id-100' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='1280'>
+        <var-decl name='tag_size' type-id='type-id-99' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='640' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-98' visibility='default' id='type-id-101'>
+    <class-decl name='__anonymous_struct__' size-in-bits='704' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-97' visibility='default' id='type-id-100'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='handle' type-id='type-id-102' visibility='default'/>
+        <var-decl name='handle' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='e' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='encrypt' type-id='type-id-103' visibility='default'/>
+        <var-decl name='encrypt' type-id='type-id-102' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='decrypt' type-id='type-id-104' visibility='default'/>
+        <var-decl name='decrypt' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='aead_encrypt' type-id='type-id-105' visibility='default'/>
+        <var-decl name='aead_encrypt' type-id='type-id-104' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='aead_decrypt' type-id='type-id-106' visibility='default'/>
+        <var-decl name='aead_decrypt' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='auth' type-id='type-id-107' visibility='default'/>
+        <var-decl name='auth' type-id='type-id-106' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='tag' type-id='type-id-108' visibility='default'/>
+        <var-decl name='tag' type-id='type-id-107' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='setiv' type-id='type-id-109' visibility='default'/>
+        <var-decl name='setiv' type-id='type-id-108' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='getiv' type-id='type-id-109' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='deinit' type-id='type-id-110' visibility='default'/>
       </data-member>
     </class-decl>
     <type-decl name='void' id='type-id-111'/>
-    <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-102'/>
-    <typedef-decl name='size_t' type-id='type-id-38' id='type-id-100'/>
+    <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-101'/>
+    <typedef-decl name='size_t' type-id='type-id-38' id='type-id-99'/>
     <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-113'/>
-    <typedef-decl name='cipher_encrypt_func' type-id='type-id-113' id='type-id-103'/>
-    <typedef-decl name='cipher_decrypt_func' type-id='type-id-113' id='type-id-104'/>
+    <typedef-decl name='cipher_encrypt_func' type-id='type-id-113' id='type-id-102'/>
+    <typedef-decl name='cipher_decrypt_func' type-id='type-id-113' id='type-id-103'/>
     <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-115'/>
-    <typedef-decl name='aead_cipher_encrypt_func' type-id='type-id-115' id='type-id-105'/>
-    <typedef-decl name='aead_cipher_decrypt_func' type-id='type-id-115' id='type-id-106'/>
+    <typedef-decl name='aead_cipher_encrypt_func' type-id='type-id-115' id='type-id-104'/>
+    <typedef-decl name='aead_cipher_decrypt_func' type-id='type-id-115' id='type-id-105'/>
     <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-117'/>
-    <typedef-decl name='cipher_auth_func' type-id='type-id-117' id='type-id-107'/>
+    <typedef-decl name='cipher_auth_func' type-id='type-id-117' id='type-id-106'/>
     <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-119'/>
-    <typedef-decl name='cipher_tag_func' type-id='type-id-119' id='type-id-108'/>
-    <typedef-decl name='cipher_setiv_func' type-id='type-id-117' id='type-id-109'/>
+    <typedef-decl name='cipher_tag_func' type-id='type-id-119' id='type-id-107'/>
+    <typedef-decl name='cipher_setiv_func' type-id='type-id-117' id='type-id-108'/>
+    <typedef-decl name='cipher_getiv_func' type-id='type-id-117' id='type-id-109'/>
     <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-121'/>
     <typedef-decl name='cipher_deinit_func' type-id='type-id-121' id='type-id-110'/>
-    <typedef-decl name='cipher_hd_st' type-id='type-id-101' id='type-id-98'/>
-    <union-decl name='__anonymous_union__' size-in-bits='448' is-anonymous='yes' visibility='default' id='type-id-99'>
+    <typedef-decl name='cipher_hd_st' type-id='type-id-100' id='type-id-97'/>
+    <union-decl name='__anonymous_union__' size-in-bits='512' is-anonymous='yes' visibility='default' id='type-id-98'>
       <data-member access='private'>
         <var-decl name='dig' type-id='type-id-122' visibility='default'/>
       </data-member>
@@ -2031,7 +2083,7 @@
         <var-decl name='mac' type-id='type-id-123' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='448' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-122' visibility='default' id='type-id-124'>
+    <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-122' visibility='default' id='type-id-124'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='e' type-id='type-id-13' visibility='default'/>
       </data-member>
@@ -2045,20 +2097,25 @@
         <var-decl name='deinit' type-id='type-id-127' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='key' type-id='type-id-102' visibility='default'/>
+        <var-decl name='copy' type-id='type-id-128' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='keysize' type-id='type-id-22' visibility='default'/>
+        <var-decl name='key' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='handle' type-id='type-id-102' visibility='default'/>
+        <var-decl name='keysize' type-id='type-id-22' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='handle' type-id='type-id-101' visibility='default'/>
       </data-member>
     </class-decl>
     <typedef-decl name='hash_func' type-id='type-id-117' id='type-id-125'/>
     <typedef-decl name='output_func' type-id='type-id-117' id='type-id-126'/>
     <typedef-decl name='hash_deinit_func' type-id='type-id-121' id='type-id-127'/>
+    <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-130'/>
+    <typedef-decl name='copy_func' type-id='type-id-130' id='type-id-128'/>
     <typedef-decl name='digest_hd_st' type-id='type-id-124' id='type-id-122'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='448' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-123' visibility='default' id='type-id-128'>
+    <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-123' visibility='default' id='type-id-131'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='e' type-id='type-id-13' visibility='default'/>
       </data-member>
@@ -2069,7 +2126,7 @@
         <var-decl name='hash' type-id='type-id-125' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='setnonce' type-id='type-id-129' visibility='default'/>
+        <var-decl name='setnonce' type-id='type-id-132' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='output' type-id='type-id-126' visibility='default'/>
@@ -2078,29 +2135,21 @@
         <var-decl name='deinit' type-id='type-id-127' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='handle' type-id='type-id-102' visibility='default'/>
+        <var-decl name='copy' type-id='type-id-128' visibility='default'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='nonce_func' type-id='type-id-117' id='type-id-129'/>
-    <typedef-decl name='mac_hd_st' type-id='type-id-128' id='type-id-123'/>
-    <typedef-decl name='auth_cipher_hd_st' type-id='type-id-97' id='type-id-95'/>
-    <class-decl name='api_aead_cipher_hd_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-130'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ctx_enc' type-id='type-id-98' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='handle' type-id='type-id-101' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='api_aead_cipher_hd_st' type-id='type-id-130' id='type-id-96'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-92' visibility='default' id='type-id-131'>
+    <typedef-decl name='nonce_func' type-id='type-id-117' id='type-id-132'/>
+    <typedef-decl name='mac_hd_st' type-id='type-id-131' id='type-id-123'/>
+    <typedef-decl name='auth_cipher_hd_st' type-id='type-id-96' id='type-id-94'/>
+    <class-decl name='api_aead_cipher_hd_st' size-in-bits='704' is-struct='yes' visibility='default' id='type-id-133'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='i' type-id='type-id-132' visibility='default'/>
+        <var-decl name='ctx_enc' type-id='type-id-97' visibility='default'/>
       </data-member>
     </class-decl>
-
-    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='64' id='type-id-132'>
-      <subrange length='8' type-id='type-id-38' id='type-id-133'/>
-
-    </array-type-def>
-    <typedef-decl name='gnutls_uint64' type-id='type-id-131' id='type-id-92'/>
+    <typedef-decl name='api_aead_cipher_hd_st' type-id='type-id-133' id='type-id-95'/>
     <typedef-decl name='record_state_st' type-id='type-id-88' id='type-id-81'/>
     <typedef-decl name='record_parameters_st' type-id='type-id-78' id='type-id-134'/>
     <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-135'/>
@@ -2109,7 +2158,7 @@
       <subrange length='4' type-id='type-id-38' id='type-id-136'/>
 
     </array-type-def>
-    <class-decl name='__anonymous_struct__' size-in-bits='27648' 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='27776' 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>
@@ -2177,27 +2226,30 @@
         <var-decl name='allow_large_records' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1096'>
-        <var-decl name='no_etm' type-id='type-id-75' visibility='default'/>
+        <var-decl name='allow_small_records' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1104'>
-        <var-decl name='no_ext_master_secret' type-id='type-id-75' visibility='default'/>
+        <var-decl name='no_etm' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1112'>
-        <var-decl name='allow_key_usage_violation' type-id='type-id-75' visibility='default'/>
+        <var-decl name='no_ext_master_secret' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1120'>
-        <var-decl name='allow_wrong_pms' type-id='type-id-75' visibility='default'/>
+        <var-decl name='allow_key_usage_violation' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1128'>
-        <var-decl name='dumbfw' type-id='type-id-75' visibility='default'/>
+        <var-decl name='allow_wrong_pms' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1136'>
-        <var-decl name='dh_prime_bits' type-id='type-id-11' visibility='default'/>
+        <var-decl name='dumbfw' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
+        <var-decl name='dh_prime_bits' type-id='type-id-11' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1168'>
         <var-decl name='resumed' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1160'>
+      <data-member access='public' layout-offset-in-bits='1176'>
         <var-decl name='resumption_requested' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
@@ -2225,7 +2277,7 @@
         <var-decl name='record_send_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7936'>
-        <var-decl name='record_send_buffer_user_size' type-id='type-id-100' visibility='default'/>
+        <var-decl name='record_send_buffer_user_size' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8000'>
         <var-decl name='early_data_recv_buffer' type-id='type-id-138' visibility='default'/>
@@ -2261,7 +2313,7 @@
         <var-decl name='send_cert_req' type-id='type-id-148' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9536'>
-        <var-decl name='max_handshake_data_buffer_size' type-id='type-id-100' visibility='default'/>
+        <var-decl name='max_handshake_data_buffer_size' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9600'>
         <var-decl name='pull_timeout_func' type-id='type-id-149' visibility='default'/>
@@ -2294,7 +2346,7 @@
         <var-decl name='db_remove_func' type-id='type-id-157' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
-        <var-decl name='db_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='db_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
         <var-decl name='user_hello_func' type-id='type-id-158' visibility='default'/>
@@ -2327,7 +2379,7 @@
         <var-decl name='selected_ocsp_func' type-id='type-id-164' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10880'>
-        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10944'>
         <var-decl name='selected_need_free' type-id='type-id-75' visibility='default'/>
@@ -2339,7 +2391,7 @@
         <var-decl name='default_hello_version' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11008'>
-        <var-decl name='user_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='user_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11072'>
         <var-decl name='direction' type-id='type-id-75' visibility='default'/>
@@ -2357,7 +2409,7 @@
         <var-decl name='initial_negotiation_completed' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11200'>
-        <var-decl name='post_negotiation_lock' type-id='type-id-102' visibility='default'/>
+        <var-decl name='post_negotiation_lock' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11264'>
         <var-decl name='transport' type-id='type-id-74' visibility='default'/>
@@ -2405,133 +2457,136 @@
         <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-17' visibility='default'/>
+        <var-decl name='last_key_update' type-id='type-id-168' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='13248'>
+        <var-decl name='key_update_count' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13184'>
+      <data-member access='public' layout-offset-in-bits='13312'>
         <var-decl name='full_client_hello' type-id='type-id-139' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13440'>
+      <data-member access='public' layout-offset-in-bits='13568'>
         <var-decl name='extensions_offset' type-id='type-id-22' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13504'>
+      <data-member access='public' layout-offset-in-bits='13632'>
         <var-decl name='hb_local_data' type-id='type-id-139' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13760'>
+      <data-member access='public' layout-offset-in-bits='13888'>
         <var-decl name='hb_remote_data' type-id='type-id-139' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14016'>
+      <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='14144'>
+      <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='14272'>
+      <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='14304'>
+      <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>
-      <data-member access='public' layout-offset-in-bits='14336'>
+      <data-member access='public' layout-offset-in-bits='14464'>
         <var-decl name='hb_total_timeout_ms' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14368'>
+      <data-member access='public' layout-offset-in-bits='14496'>
         <var-decl name='ocsp_check_ok' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14400'>
+      <data-member access='public' layout-offset-in-bits='14528'>
         <var-decl name='hb_state' type-id='type-id-169' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14432'>
+      <data-member access='public' layout-offset-in-bits='14560'>
         <var-decl name='recv_state' type-id='type-id-170' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14464'>
+      <data-member access='public' layout-offset-in-bits='14592'>
         <var-decl name='sc_random_set' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14528'>
+      <data-member access='public' layout-offset-in-bits='14656'>
         <var-decl name='flags' type-id='type-id-80' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14592'>
+      <data-member access='public' layout-offset-in-bits='14720'>
         <var-decl name='verify_callback' type-id='type-id-171' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14656'>
+      <data-member access='public' layout-offset-in-bits='14784'>
         <var-decl name='vc_data' type-id='type-id-172' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14720'>
+      <data-member access='public' layout-offset-in-bits='14848'>
         <var-decl name='vc_sdata' type-id='type-id-173' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14912'>
+      <data-member access='public' layout-offset-in-bits='15040'>
         <var-decl name='vc_elements' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14944'>
+      <data-member access='public' layout-offset-in-bits='15072'>
         <var-decl name='vc_status' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14976'>
+      <data-member access='public' layout-offset-in-bits='15104'>
         <var-decl name='additional_verify_flags' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15008'>
+      <data-member access='public' layout-offset-in-bits='15136'>
         <var-decl name='cert_hash' type-id='type-id-15' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15264'>
+      <data-member access='public' layout-offset-in-bits='15392'>
         <var-decl name='cert_hash_set' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15272'>
+      <data-member access='public' layout-offset-in-bits='15400'>
         <var-decl name='saved_username' type-id='type-id-174' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16304'>
+      <data-member access='public' layout-offset-in-bits='16432'>
         <var-decl name='saved_username_set' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16320'>
+      <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='17536'>
+      <data-member access='public' layout-offset-in-bits='17664'>
         <var-decl name='rsup' type-id='type-id-176' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17600'>
+      <data-member access='public' layout-offset-in-bits='17728'>
         <var-decl name='rsup_size' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17664'>
+      <data-member access='public' layout-offset-in-bits='17792'>
         <var-decl name='rexts' type-id='type-id-177' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17728'>
+      <data-member access='public' layout-offset-in-bits='17856'>
         <var-decl name='rexts_size' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17792'>
+      <data-member access='public' layout-offset-in-bits='17920'>
         <var-decl name='ext_data' type-id='type-id-178' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='23936'>
+      <data-member access='public' layout-offset-in-bits='24064'>
         <var-decl name='used_exts' type-id='type-id-18' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='23968'>
+      <data-member access='public' layout-offset-in-bits='24096'>
         <var-decl name='ext_msg' type-id='type-id-179' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24000'>
+      <data-member access='public' layout-offset-in-bits='24128'>
         <var-decl name='max_recv_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='24192'>
         <var-decl name='cand_ec_group' type-id='type-id-20' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24128'>
+      <data-member access='public' layout-offset-in-bits='24256'>
         <var-decl name='cand_dh_group' type-id='type-id-20' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24192'>
+      <data-member access='public' layout-offset-in-bits='24320'>
         <var-decl name='cand_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='24384'>
         <var-decl name='hrr_cs' type-id='type-id-165' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24288'>
+      <data-member access='public' layout-offset-in-bits='24416'>
         <var-decl name='session_ticket_renew' type-id='type-id-22' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24320'>
+      <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='27456'>
+      <data-member access='public' layout-offset-in-bits='27584'>
         <var-decl name='early_data_received' type-id='type-id-18' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='27520'>
+      <data-member access='public' layout-offset-in-bits='27648'>
         <var-decl name='anti_replay' type-id='type-id-181' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='27584'>
-        <var-decl name='epoch_lock' type-id='type-id-102' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='27712'>
+        <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'>
@@ -2545,7 +2600,7 @@
         <var-decl name='length' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='byte_length' type-id='type-id-100' visibility='default'/>
+        <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'>
@@ -2556,13 +2611,13 @@
         <var-decl name='prev' type-id='type-id-183' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='mark' type-id='type-id-100' visibility='default'/>
+        <var-decl name='mark' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='msg' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='maximum_size' type-id='type-id-100' visibility='default'/>
+        <var-decl name='maximum_size' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='uhead_mark' type-id='type-id-10' visibility='default'/>
@@ -2571,7 +2626,7 @@
         <var-decl name='type' type-id='type-id-185' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='record_sequence' type-id='type-id-92' visibility='default'/>
+        <var-decl name='record_sequence' type-id='type-id-80' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='epoch' type-id='type-id-11' visibility='default'/>
@@ -2627,10 +2682,10 @@
         <var-decl name='data' type-id='type-id-191' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='max_length' type-id='type-id-100' visibility='default'/>
+        <var-decl name='max_length' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='length' type-id='type-id-100' visibility='default'/>
+        <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'/>
@@ -2787,18 +2842,21 @@
         <var-decl name='_allow_large_records' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41640'>
-        <var-decl name='_no_etm' type-id='type-id-75' visibility='default'/>
+        <var-decl name='_allow_small_records' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41648'>
-        <var-decl name='_no_ext_master_secret' type-id='type-id-75' visibility='default'/>
+        <var-decl name='_no_etm' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41656'>
-        <var-decl name='_allow_key_usage_violation' type-id='type-id-75' visibility='default'/>
+        <var-decl name='_no_ext_master_secret' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41664'>
-        <var-decl name='_allow_wrong_pms' type-id='type-id-75' visibility='default'/>
+        <var-decl name='_allow_key_usage_violation' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41672'>
+        <var-decl name='_allow_wrong_pms' type-id='type-id-75' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='41680'>
         <var-decl name='_dumbfw' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='41696'>
@@ -2818,7 +2876,7 @@
     </class-decl>
 
     <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-205'>
-      <subrange length='64' type-id='type-id-38' id='type-id-93'/>
+      <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'/>
@@ -2835,7 +2893,7 @@
     </class-decl>
 
     <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='4096' id='type-id-207'>
-      <subrange length='64' type-id='type-id-38' id='type-id-93'/>
+      <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'/>
@@ -2870,7 +2928,7 @@
         <var-decl name='cert_pk' type-id='type-id-60' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='tls13_ok' type-id='type-id-10' visibility='default'/>
+        <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='curve' type-id='type-id-59' visibility='default'/>
@@ -2930,7 +2988,7 @@
     <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-219'/>
 
     <array-type-def dimensions='1' type-id='type-id-219' size-in-bits='4096' id='type-id-209'>
-      <subrange length='64' type-id='type-id-38' id='type-id-93'/>
+      <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'/>
@@ -3080,7 +3138,7 @@
       <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_transport_ptr_t' type-id='type-id-102' id='type-id-154'/>
+    <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'/>
@@ -3088,10 +3146,10 @@
     <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='iov_base' type-id='type-id-102' visibility='default'/>
+        <var-decl name='iov_base' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='iov_len' type-id='type-id-100' visibility='default'/>
+        <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'/>
@@ -3125,7 +3183,7 @@
         <var-decl name='type' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='gnutls_pubkey_st' size-in-bits='4032' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-268'/>
+    <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'/>
@@ -3313,7 +3371,7 @@
         <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-102' id='type-id-298'/>
+    <typedef-decl name='gnutls_ext_priv_data_t' type-id='type-id-101' id='type-id-298'/>
 
     <array-type-def dimensions='1' type-id='type-id-297' size-in-bits='6144' id='type-id-178'>
       <subrange length='32' type-id='type-id-38' id='type-id-51'/>
@@ -3349,7 +3407,7 @@
         <var-decl name='nonce' type-id='type-id-301' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='nonce_size' type-id='type-id-100' visibility='default'/>
+        <var-decl name='nonce_size' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
         <var-decl name='prf' type-id='type-id-13' visibility='default'/>
@@ -3371,56 +3429,56 @@
     <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='internals_st' type-id='type-id-137' id='type-id-7'/>
-    <class-decl name='gnutls_key_st' size-in-bits='22336' 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-305'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='kshare' type-id='type-id-306' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11328'>
+      <data-member access='public' layout-offset-in-bits='11520'>
         <var-decl name='proto' type-id='type-id-307' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='19776'>
+      <data-member access='public' layout-offset-in-bits='20096'>
         <var-decl name='binders' type-id='type-id-308' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='20288'>
+      <data-member access='public' layout-offset-in-bits='20608'>
         <var-decl name='key' type-id='type-id-62' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='20416'>
+      <data-member access='public' layout-offset-in-bits='20736'>
         <var-decl name='session_ticket_key' type-id='type-id-89' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='20928'>
+      <data-member access='public' layout-offset-in-bits='21248'>
         <var-decl name='previous_ticket_key' type-id='type-id-89' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='21440'>
+      <data-member access='public' layout-offset-in-bits='21760'>
         <var-decl name='initial_stek' type-id='type-id-89' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='21952'>
-        <var-decl name='auth_info' type-id='type-id-102' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='22272'>
+        <var-decl name='auth_info' type-id='type-id-101' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='22016'>
+      <data-member access='public' layout-offset-in-bits='22336'>
         <var-decl name='auth_info_type' type-id='type-id-309' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='22048'>
+      <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='22080'>
+      <data-member access='public' layout-offset-in-bits='22400'>
         <var-decl name='cred' type-id='type-id-310' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='22144'>
+      <data-member access='public' layout-offset-in-bits='22464'>
         <var-decl name='totp' type-id='type-id-311' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='11328' 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-306'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='ecdh_params' type-id='type-id-312' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3776'>
+      <data-member access='public' layout-offset-in-bits='3840'>
         <var-decl name='ecdhx_params' type-id='type-id-312' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='7552'>
+      <data-member access='public' layout-offset-in-bits='7680'>
         <var-decl name='dh_params' type-id='type-id-312' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='3776' 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-312' visibility='default' id='type-id-313'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='params' type-id='type-id-314' visibility='default'/>
       </data-member>
@@ -3460,14 +3518,14 @@
       <data-member access='public' layout-offset-in-bits='3584'>
         <var-decl name='spki' type-id='type-id-317' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3712'>
+      <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-102' id='type-id-318'/>
+    <typedef-decl name='bigint_t' type-id='type-id-101' id='type-id-318'/>
 
     <array-type-def dimensions='1' type-id='type-id-318' size-in-bits='1024' id='type-id-314'>
-      <subrange length='16' type-id='type-id-38' id='type-id-94'/>
+      <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'>
@@ -3485,7 +3543,7 @@
       <subrange length='256' type-id='type-id-38' id='type-id-223'/>
 
     </array-type-def>
-    <class-decl name='gnutls_x509_spki_st' size-in-bits='128' 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-320'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pk' type-id='type-id-60' visibility='default'/>
       </data-member>
@@ -3498,10 +3556,16 @@
       <data-member access='public' layout-offset-in-bits='96'>
         <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'/>
+      </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='8448' is-anonymous='yes' visibility='default' id='type-id-307'>
+    <union-decl name='__anonymous_union__' size-in-bits='8576' is-anonymous='yes' visibility='default' id='type-id-307'>
       <data-member access='private'>
         <var-decl name='tls13' type-id='type-id-321' visibility='default'/>
       </data-member>
@@ -3538,36 +3602,36 @@
         <var-decl name='ap_rms' type-id='type-id-89' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='8448' 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-322'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='ecdh' type-id='type-id-323' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='4032'>
+      <data-member access='public' layout-offset-in-bits='4096'>
         <var-decl name='dh' type-id='type-id-324' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='7872'>
+      <data-member access='public' layout-offset-in-bits='8000'>
         <var-decl name='srp' type-id='type-id-325' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='4032' 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-323'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='params' type-id='type-id-312' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3776'>
+      <data-member access='public' layout-offset-in-bits='3840'>
         <var-decl name='x' type-id='type-id-318' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3840'>
+      <data-member access='public' layout-offset-in-bits='3904'>
         <var-decl name='y' type-id='type-id-318' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3904'>
+      <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='3840' 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-324'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='params' type-id='type-id-312' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3776'>
+      <data-member access='public' layout-offset-in-bits='3840'>
         <var-decl name='client_Y' type-id='type-id-318' visibility='default'/>
       </data-member>
     </class-decl>
@@ -3633,7 +3697,7 @@
         <var-decl name='algorithm' type-id='type-id-309' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='credentials' type-id='type-id-102' visibility='default'/>
+        <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'/>
@@ -3657,10 +3721,10 @@
     <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='low' type-id='type-id-100' visibility='default'/>
+        <var-decl name='low' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='high' type-id='type-id-100' visibility='default'/>
+        <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'/>
@@ -3668,8 +3732,8 @@
     <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-336'/>
     <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-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <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'/>
       <return type-id='type-id-3'/>
     </function-decl>
@@ -3709,7 +3773,7 @@
     <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-100'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-262'>
@@ -3722,7 +3786,7 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-276'>
       <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-275'/>
       <return type-id='type-id-22'/>
     </function-type>
@@ -3736,45 +3800,45 @@
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-258'>
-      <parameter type-id='type-id-102'/>
+      <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'>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-62'/>
       <parameter type-id='type-id-62'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-116'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-112'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-114'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-256'>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-62'/>
       <return type-id='type-id-62'/>
     </function-type>
@@ -3786,8 +3850,8 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-244'>
       <parameter type-id='type-id-154'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
+      <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'>
@@ -3797,17 +3861,21 @@
       <return type-id='type-id-111'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-120'>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <return type-id='type-id-111'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-118'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-111'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-129'>
+      <parameter type-id='type-id-101'/>
+      <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='record.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <class-decl name='hello_ext_entry_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-296'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
@@ -3822,9 +3890,12 @@
         <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='parse_type' type-id='type-id-338' visibility='default'/>
+        <var-decl name='client_parse_point' type-id='type-id-338' 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'/>
+      </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'>
@@ -3878,15 +3949,15 @@
     </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-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <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-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <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'>
@@ -3900,28 +3971,28 @@
     </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-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <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-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <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-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
-      <parameter type-id='type-id-100' name='pad'/>
+      <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'/>
       <parameter type-id='type-id-10' name='flags'/>
       <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-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <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'/>
@@ -3933,7 +4004,7 @@
     </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'/>
-      <return type-id='type-id-100'/>
+      <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'/>
@@ -4029,12 +4100,6 @@
     <function-decl name='__assert_fail' mangled-name='__assert_fail' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_uint64pp' mangled-name='_gnutls_uint64pp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='_gnutls_uint48pp' mangled-name='_gnutls_uint48pp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
     <function-decl name='_mbuffer_enqueue' mangled-name='_mbuffer_enqueue' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -4113,10 +4178,10 @@
     <function-decl name='time' mangled-name='time' visibility='default' binding='global' size-in-bits='64'>
       <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'>
+    <function-decl name='gnutls_reauth' mangled-name='gnutls_reauth' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='gnutls_reauth' mangled-name='gnutls_reauth' visibility='default' binding='global' size-in-bits='64'>
+    <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'>
@@ -4132,7 +4197,7 @@
     <function-type size-in-bits='64' id='type-id-347'>
       <parameter type-id='type-id-236'/>
       <parameter type-id='type-id-346'/>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-351'>
@@ -4145,7 +4210,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='compress.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-366'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_COMP_UNKNOWN' value='0'/>
@@ -4171,13 +4236,13 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='debug.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cipher.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <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>
@@ -4196,6 +4261,9 @@
     <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'>
+      <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'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -4209,8 +4277,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <class-decl name='gnutls_session_int' size-in-bits='52288' is-struct='yes' visibility='default' id='type-id-370'>
+  <abi-instr version='1.0' address-size='64' path='handshake-tls13.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_session_int' size-in-bits='52736' is-struct='yes' visibility='default' id='type-id-370'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='security_parameters' type-id='type-id-5' visibility='default'/>
       </data-member>
@@ -4220,11 +4288,11 @@
       <data-member access='public' layout-offset-in-bits='2304'>
         <var-decl name='internals' type-id='type-id-371' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='29952'>
+      <data-member access='public' layout-offset-in-bits='30080'>
         <var-decl name='key' type-id='type-id-8' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='27648' 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='27776' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-371' visibility='default' id='type-id-372'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='record_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
@@ -4292,27 +4360,30 @@
         <var-decl name='allow_large_records' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1096'>
-        <var-decl name='no_etm' type-id='type-id-75' visibility='default'/>
+        <var-decl name='allow_small_records' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1104'>
-        <var-decl name='no_ext_master_secret' type-id='type-id-75' visibility='default'/>
+        <var-decl name='no_etm' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1112'>
-        <var-decl name='allow_key_usage_violation' type-id='type-id-75' visibility='default'/>
+        <var-decl name='no_ext_master_secret' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1120'>
-        <var-decl name='allow_wrong_pms' type-id='type-id-75' visibility='default'/>
+        <var-decl name='allow_key_usage_violation' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1128'>
-        <var-decl name='dumbfw' type-id='type-id-75' visibility='default'/>
+        <var-decl name='allow_wrong_pms' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1136'>
-        <var-decl name='dh_prime_bits' type-id='type-id-11' visibility='default'/>
+        <var-decl name='dumbfw' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
+        <var-decl name='dh_prime_bits' type-id='type-id-11' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1168'>
         <var-decl name='resumed' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1160'>
+      <data-member access='public' layout-offset-in-bits='1176'>
         <var-decl name='resumption_requested' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
@@ -4340,7 +4411,7 @@
         <var-decl name='record_send_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7936'>
-        <var-decl name='record_send_buffer_user_size' type-id='type-id-100' visibility='default'/>
+        <var-decl name='record_send_buffer_user_size' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8000'>
         <var-decl name='early_data_recv_buffer' type-id='type-id-138' visibility='default'/>
@@ -4376,7 +4447,7 @@
         <var-decl name='send_cert_req' type-id='type-id-148' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9536'>
-        <var-decl name='max_handshake_data_buffer_size' type-id='type-id-100' visibility='default'/>
+        <var-decl name='max_handshake_data_buffer_size' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9600'>
         <var-decl name='pull_timeout_func' type-id='type-id-149' visibility='default'/>
@@ -4409,7 +4480,7 @@
         <var-decl name='db_remove_func' type-id='type-id-157' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
-        <var-decl name='db_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='db_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
         <var-decl name='user_hello_func' type-id='type-id-158' visibility='default'/>
@@ -4442,7 +4513,7 @@
         <var-decl name='selected_ocsp_func' type-id='type-id-164' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10880'>
-        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10944'>
         <var-decl name='selected_need_free' type-id='type-id-75' visibility='default'/>
@@ -4454,7 +4525,7 @@
         <var-decl name='default_hello_version' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11008'>
-        <var-decl name='user_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='user_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11072'>
         <var-decl name='direction' type-id='type-id-75' visibility='default'/>
@@ -4472,7 +4543,7 @@
         <var-decl name='initial_negotiation_completed' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11200'>
-        <var-decl name='post_negotiation_lock' type-id='type-id-102' visibility='default'/>
+        <var-decl name='post_negotiation_lock' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11264'>
         <var-decl name='transport' type-id='type-id-74' visibility='default'/>
@@ -4520,146 +4591,149 @@
         <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-17' visibility='default'/>
+        <var-decl name='last_key_update' type-id='type-id-168' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13184'>
+      <data-member access='public' layout-offset-in-bits='13248'>
+        <var-decl name='key_update_count' type-id='type-id-10' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='13312'>
         <var-decl name='full_client_hello' type-id='type-id-139' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13440'>
+      <data-member access='public' layout-offset-in-bits='13568'>
         <var-decl name='extensions_offset' type-id='type-id-22' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13504'>
+      <data-member access='public' layout-offset-in-bits='13632'>
         <var-decl name='hb_local_data' type-id='type-id-139' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='13760'>
+      <data-member access='public' layout-offset-in-bits='13888'>
         <var-decl name='hb_remote_data' type-id='type-id-139' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14016'>
+      <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='14144'>
+      <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='14272'>
+      <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='14304'>
+      <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>
-      <data-member access='public' layout-offset-in-bits='14336'>
+      <data-member access='public' layout-offset-in-bits='14464'>
         <var-decl name='hb_total_timeout_ms' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14368'>
+      <data-member access='public' layout-offset-in-bits='14496'>
         <var-decl name='ocsp_check_ok' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14400'>
+      <data-member access='public' layout-offset-in-bits='14528'>
         <var-decl name='hb_state' type-id='type-id-169' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14432'>
+      <data-member access='public' layout-offset-in-bits='14560'>
         <var-decl name='recv_state' type-id='type-id-170' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14464'>
+      <data-member access='public' layout-offset-in-bits='14592'>
         <var-decl name='sc_random_set' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14528'>
+      <data-member access='public' layout-offset-in-bits='14656'>
         <var-decl name='flags' type-id='type-id-80' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14592'>
+      <data-member access='public' layout-offset-in-bits='14720'>
         <var-decl name='verify_callback' type-id='type-id-171' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14656'>
+      <data-member access='public' layout-offset-in-bits='14784'>
         <var-decl name='vc_data' type-id='type-id-172' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14720'>
+      <data-member access='public' layout-offset-in-bits='14848'>
         <var-decl name='vc_sdata' type-id='type-id-173' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14912'>
+      <data-member access='public' layout-offset-in-bits='15040'>
         <var-decl name='vc_elements' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14944'>
+      <data-member access='public' layout-offset-in-bits='15072'>
         <var-decl name='vc_status' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='14976'>
+      <data-member access='public' layout-offset-in-bits='15104'>
         <var-decl name='additional_verify_flags' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15008'>
+      <data-member access='public' layout-offset-in-bits='15136'>
         <var-decl name='cert_hash' type-id='type-id-15' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15264'>
+      <data-member access='public' layout-offset-in-bits='15392'>
         <var-decl name='cert_hash_set' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='15272'>
+      <data-member access='public' layout-offset-in-bits='15400'>
         <var-decl name='saved_username' type-id='type-id-174' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16304'>
+      <data-member access='public' layout-offset-in-bits='16432'>
         <var-decl name='saved_username_set' type-id='type-id-75' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='16320'>
+      <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='17536'>
+      <data-member access='public' layout-offset-in-bits='17664'>
         <var-decl name='rsup' type-id='type-id-176' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17600'>
+      <data-member access='public' layout-offset-in-bits='17728'>
         <var-decl name='rsup_size' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17664'>
+      <data-member access='public' layout-offset-in-bits='17792'>
         <var-decl name='rexts' type-id='type-id-177' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17728'>
+      <data-member access='public' layout-offset-in-bits='17856'>
         <var-decl name='rexts_size' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17792'>
+      <data-member access='public' layout-offset-in-bits='17920'>
         <var-decl name='ext_data' type-id='type-id-178' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='23936'>
+      <data-member access='public' layout-offset-in-bits='24064'>
         <var-decl name='used_exts' type-id='type-id-18' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='23968'>
+      <data-member access='public' layout-offset-in-bits='24096'>
         <var-decl name='ext_msg' type-id='type-id-179' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24000'>
+      <data-member access='public' layout-offset-in-bits='24128'>
         <var-decl name='max_recv_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='24192'>
         <var-decl name='cand_ec_group' type-id='type-id-20' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24128'>
+      <data-member access='public' layout-offset-in-bits='24256'>
         <var-decl name='cand_dh_group' type-id='type-id-20' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24192'>
+      <data-member access='public' layout-offset-in-bits='24320'>
         <var-decl name='cand_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='24384'>
         <var-decl name='hrr_cs' type-id='type-id-165' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24288'>
+      <data-member access='public' layout-offset-in-bits='24416'>
         <var-decl name='session_ticket_renew' type-id='type-id-22' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='24320'>
+      <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='27456'>
+      <data-member access='public' layout-offset-in-bits='27584'>
         <var-decl name='early_data_received' type-id='type-id-18' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='27520'>
+      <data-member access='public' layout-offset-in-bits='27648'>
         <var-decl name='anti_replay' type-id='type-id-181' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='27584'>
-        <var-decl name='epoch_lock' type-id='type-id-102' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='27712'>
+        <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='4032' 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-268'>
       <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'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3840'>
+      <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='3904'>
+      <data-member access='public' layout-offset-in-bits='3968'>
         <var-decl name='pin' type-id='type-id-374' visibility='default'/>
       </data-member>
     </class-decl>
@@ -4668,7 +4742,7 @@
         <var-decl name='cb' type-id='type-id-375' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='data' type-id='type-id-102' visibility='default'/>
+        <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'/>
@@ -4710,20 +4784,20 @@
         <var-decl name='ext' type-id='type-id-385' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='gnutls_x509_privkey_int' size-in-bits='4032' 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-386'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='params' type-id='type-id-312' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3776'>
+      <data-member access='public' layout-offset-in-bits='3840'>
         <var-decl name='expanded' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3808'>
+      <data-member access='public' layout-offset-in-bits='3872'>
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3840'>
+      <data-member access='public' layout-offset-in-bits='3904'>
         <var-decl name='key' type-id='type-id-387' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3904'>
+      <data-member access='public' layout-offset-in-bits='3968'>
         <var-decl name='pin' type-id='type-id-374' visibility='default'/>
       </data-member>
     </class-decl>
@@ -4759,7 +4833,7 @@
         <var-decl name='info_func' type-id='type-id-400' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='userdata' type-id='type-id-102' visibility='default'/>
+        <var-decl name='userdata' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='bits' type-id='type-id-10' visibility='default'/>
@@ -4818,10 +4892,10 @@
     <function-decl name='_tls13_read_connection_state_init' mangled-name='_tls13_read_connection_state_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_epoch_dup' mangled-name='_gnutls_epoch_dup' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_tls13_write_connection_state_init' mangled-name='_tls13_write_connection_state_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_tls13_write_connection_state_init' mangled-name='_tls13_write_connection_state_init' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_tls13_connection_state_init' mangled-name='_tls13_connection_state_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_send_encrypted_extensions' mangled-name='_gnutls13_send_encrypted_extensions' visibility='default' binding='global' size-in-bits='64'>
@@ -4857,25 +4931,22 @@
     <function-decl name='_gnutls_recv_handshake' mangled-name='_gnutls_recv_handshake' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_tls13_connection_state_init' mangled-name='_tls13_connection_state_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='_gnutls_send_change_cipher_spec' mangled-name='_gnutls_send_change_cipher_spec' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_handshake_hash_buffers_clear' mangled-name='_gnutls_handshake_hash_buffers_clear' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_handshake_hash_buffers_clear' mangled-name='_gnutls_handshake_hash_buffers_clear' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls13_handshake_hash_buffers_synth' mangled-name='_gnutls13_handshake_hash_buffers_synth' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_send_hello_retry_request' mangled-name='_gnutls13_send_hello_retry_request' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls13_handshake_hash_buffers_synth' mangled-name='_gnutls13_handshake_hash_buffers_synth' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_send_change_cipher_spec' mangled-name='_gnutls_send_change_cipher_spec' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_set_resumed_parameters' mangled-name='_gnutls_set_resumed_parameters' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_epoch_dup' mangled-name='_gnutls_epoch_dup' 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='_gnutls_set_resumed_parameters' mangled-name='_gnutls_set_resumed_parameters' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_tls13_update_secret' mangled-name='_tls13_update_secret' visibility='default' binding='global' size-in-bits='64'>
@@ -4899,7 +4970,7 @@
     <function-type size-in-bits='64' id='type-id-404'>
       <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-275'/>
@@ -4908,48 +4979,48 @@
     <function-type size-in-bits='64' id='type-id-410'>
       <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-102'/>
+      <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'/>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-275'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-406'>
       <parameter type-id='type-id-401'/>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-377'>
-      <parameter type-id='type-id-102'/>
+      <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-100'/>
+      <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'/>
-      <parameter type-id='type-id-102'/>
+      <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='buffers.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
-      <return type-id='type-id-100'/>
+      <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'/>
-      <return type-id='type-id-100'/>
+      <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'>
       <return type-id='type-id-111'/>
@@ -4979,7 +5050,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='handshake.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -4990,7 +5061,7 @@
     </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-100' name='max'/>
+      <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'>
@@ -5030,28 +5101,10 @@
     <function-decl name='_gnutls_write_connection_state_init' mangled-name='_gnutls_write_connection_state_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_version_to_entry' mangled-name='_gnutls_version_to_entry' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='_gnutls_version_lowest' mangled-name='_gnutls_version_lowest' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='_gnutls_version_max' mangled-name='_gnutls_version_max' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='_gnutls_buffer_append_data_prefix' mangled-name='_gnutls_buffer_append_data_prefix' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='_gnutls_get_client_ciphersuites' mangled-name='_gnutls_get_client_ciphersuites' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='_gnutls_gen_hello_extensions' mangled-name='_gnutls_gen_hello_extensions' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
-    <function-decl name='_gnutls_legacy_version_max' mangled-name='_gnutls_legacy_version_max' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='gnutls_dtls_set_timeouts' mangled-name='gnutls_dtls_set_timeouts' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_tls13_init_secret2' mangled-name='_tls13_init_secret2' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_epoch_setup_next' mangled-name='_gnutls_epoch_setup_next' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_kx_allows_false_start' mangled-name='_gnutls_kx_allows_false_start' visibility='default' binding='global' size-in-bits='64'>
@@ -5066,7 +5119,7 @@
     <function-decl name='_gnutls_send_client_certificate' mangled-name='_gnutls_send_client_certificate' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_send_client_kx_message' mangled-name='_gnutls_send_client_kx_message' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_recv_server_certificate_status' mangled-name='_gnutls_recv_server_certificate_status' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_recv_server_crt_request' mangled-name='_gnutls_recv_server_crt_request' visibility='default' binding='global' size-in-bits='64'>
@@ -5075,7 +5128,7 @@
     <function-decl name='_gnutls_send_client_certificate_verify' mangled-name='_gnutls_send_client_certificate_verify' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_recv_server_certificate_status' mangled-name='_gnutls_recv_server_certificate_status' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_send_client_kx_message' mangled-name='_gnutls_send_client_kx_message' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_recv_server_kx_message' mangled-name='_gnutls_recv_server_kx_message' visibility='default' binding='global' size-in-bits='64'>
@@ -5087,10 +5140,10 @@
     <function-decl name='_gnutls_ext_sr_verify' mangled-name='_gnutls_ext_sr_verify' visibility='default' binding='global' size-in-bits='64'>
       <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'>
+    <function-decl name='gnutls_alert_get' mangled-name='gnutls_alert_get' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_epoch_setup_next' mangled-name='_gnutls_epoch_setup_next' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls13_handshake_server' mangled-name='_gnutls13_handshake_server' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_send_new_session_ticket' mangled-name='_gnutls_send_new_session_ticket' visibility='default' binding='global' size-in-bits='64'>
@@ -5099,34 +5152,28 @@
     <function-decl name='_gnutls_server_register_current_session' mangled-name='_gnutls_server_register_current_session' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <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_check_id_for_change' mangled-name='_gnutls_check_id_for_change' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
     <function-decl name='_gnutls_recv_client_certificate' mangled-name='_gnutls_recv_client_certificate' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls13_handshake_server' mangled-name='_gnutls13_handshake_server' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_check_id_for_change' mangled-name='_gnutls_check_id_for_change' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_send_server_certificate' mangled-name='_gnutls_send_server_certificate' 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'>
+    <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_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_recv_client_kx_message' mangled-name='_gnutls_recv_client_kx_message' 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_send_server_certificate_status' mangled-name='_gnutls_send_server_certificate_status' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_send_server_kx_message' mangled-name='_gnutls_send_server_kx_message' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='gnutls_alert_get' mangled-name='gnutls_alert_get' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_recv_client_kx_message' mangled-name='_gnutls_recv_client_kx_message' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_dtls_reset_hsk_state' mangled-name='_dtls_reset_hsk_state' visibility='default' binding='global' size-in-bits='64'>
@@ -5144,16 +5191,31 @@
     <function-decl name='_gnutls_gen_supplemental' mangled-name='_gnutls_gen_supplemental' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='_gnutls_buffer_append_data_prefix' mangled-name='_gnutls_buffer_append_data_prefix' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_buffer_append_prefix' mangled-name='_gnutls_buffer_append_prefix' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_tls13_init_secret' mangled-name='_tls13_init_secret' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_gen_hello_extensions' mangled-name='_gnutls_gen_hello_extensions' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_bin2hex' mangled-name='_gnutls_bin2hex' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_tls13_derive_secret2' mangled-name='_tls13_derive_secret2' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_version_to_entry' mangled-name='_gnutls_version_to_entry' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_version_lowest' mangled-name='_gnutls_version_lowest' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_version_max' mangled-name='_gnutls_version_max' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_get_client_ciphersuites' mangled-name='_gnutls_get_client_ciphersuites' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_legacy_version_max' mangled-name='_gnutls_legacy_version_max' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_recv_hello_retry_request' mangled-name='_gnutls13_recv_hello_retry_request' visibility='default' binding='global' size-in-bits='64'>
@@ -5186,6 +5248,15 @@
     <function-decl name='_gnutls_nversion_is_supported' mangled-name='_gnutls_nversion_is_supported' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='gnutls_memset' mangled-name='gnutls_memset' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='reset_binders' mangled-name='reset_binders' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_tls13_init_secret' mangled-name='_tls13_init_secret' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_server_restore_session' mangled-name='_gnutls_server_restore_session' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -5201,6 +5272,9 @@
     <function-decl name='_gnutls_handshake_io_write_flush' mangled-name='_gnutls_handshake_io_write_flush' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='_gnutls_generate_early_secrets_for_psk' mangled-name='_gnutls_generate_early_secrets_for_psk' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='ciphersuite_to_entry' mangled-name='ciphersuite_to_entry' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -5241,7 +5315,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='errors.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -5282,89 +5356,96 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <class-decl name='gnutls_dh_params_int' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-414'>
+  <abi-instr version='1.0' address-size='64' path='dh.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_dh_params_int' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-414'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='params' type-id='type-id-415' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
+      <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='128' id='type-id-415'>
-      <subrange length='2' type-id='type-id-38' id='type-id-40'/>
+    <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>
-    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-416'/>
-    <typedef-decl name='gnutls_dh_params_t' type-id='type-id-416' id='type-id-417'/>
-    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-418'/>
+    <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'/>
     <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-417' name='params'/>
+      <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-418' name='bits'/>
+      <parameter type-id='type-id-419' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-419'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-420'>
       <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-419' id='type-id-420'/>
+    <typedef-decl name='gnutls_x509_crt_fmt_t' type-id='type-id-420' id='type-id-421'/>
     <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-417' name='params'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-418' name='params'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-275' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-421'/>
+    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-422'/>
     <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-417' name='params'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-418' name='params'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-64' name='params_data'/>
-      <parameter type-id='type-id-421' name='params_data_size'/>
+      <parameter type-id='type-id-422' 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-417' name='params'/>
+      <parameter type-id='type-id-418' name='params'/>
       <parameter type-id='type-id-57' name='pkcs3_params'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-417' name='dparams'/>
+      <parameter type-id='type-id-418' 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-417' name='dst'/>
-      <parameter type-id='type-id-417' name='src'/>
+      <parameter type-id='type-id-418' name='dst'/>
+      <parameter type-id='type-id-418' 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-417' name='dh_params'/>
+      <parameter type-id='type-id-418' name='dh_params'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-417' size-in-bits='64' id='type-id-422'/>
+    <pointer-type-def type-id='type-id-418' size-in-bits='64' id='type-id-423'/>
     <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-422' name='dh_params'/>
+      <parameter type-id='type-id-423' 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-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-417' name='dh_params'/>
+      <parameter type-id='type-id-418' 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-417' name='dh_params'/>
+      <parameter type-id='type-id-418' name='dh_params'/>
       <parameter type-id='type-id-383' 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-417' name='dh_params'/>
+      <parameter type-id='type-id-418' 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'/>
@@ -5424,7 +5505,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='kx.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <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>
@@ -5434,9 +5515,6 @@
     <function-decl name='_gnutls_handshake_get_session_hash' mangled-name='_gnutls_handshake_get_session_hash' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='gnutls_memset' mangled-name='gnutls_memset' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
     <function-decl name='fclose' mangled-name='fclose' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -5456,70 +5534,70 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cipher-cbc.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='priority.c' comp-dir-path='/home/nmavrogi/cvs/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-423'/>
-    <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-424'/>
+    <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'/>
     <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-423' name='pcache'/>
-      <parameter type-id='type-id-424' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-423' name='pcache'/>
-      <parameter type-id='type-id-424' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-423' name='pcache'/>
-      <parameter type-id='type-id-424' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-423' name='pcache'/>
-      <parameter type-id='type-id-424' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-423' name='pcache'/>
-      <parameter type-id='type-id-424' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-423' name='pcache'/>
-      <parameter type-id='type-id-424' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-423' name='pcache'/>
-      <parameter type-id='type-id-424' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-423' name='pcache'/>
-      <parameter type-id='type-id-424' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-423' name='pcache'/>
-      <parameter type-id='type-id-424' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-425'/>
+    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-426'/>
     <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-27' name='add_prio'/>
-      <parameter type-id='type-id-425' name='err_pos'/>
+      <parameter type-id='type-id-426' name='err_pos'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -5530,20 +5608,20 @@
     <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-27' name='priorities'/>
-      <parameter type-id='type-id-425' name='err_pos'/>
+      <parameter type-id='type-id-426' name='err_pos'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-426'/>
+    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-427'/>
     <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-426' name='priority_cache'/>
+      <parameter type-id='type-id-427' name='priority_cache'/>
       <parameter type-id='type-id-27' name='priorities'/>
-      <parameter type-id='type-id-425' name='err_pos'/>
+      <parameter type-id='type-id-426' 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-426' name='priority_cache'/>
+      <parameter type-id='type-id-427' name='priority_cache'/>
       <parameter type-id='type-id-27' name='priorities'/>
-      <parameter type-id='type-id-425' name='err_pos'/>
+      <parameter type-id='type-id-426' name='err_pos'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -5551,27 +5629,30 @@
       <parameter type-id='type-id-27' name='priorities'/>
       <return type-id='type-id-376'/>
     </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-423' name='priority'/>
+      <parameter type-id='type-id-424' 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-423' name='priority_cache'/>
+      <parameter type-id='type-id-424' name='priority_cache'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-427'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-428'>
       <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-427' id='type-id-428'/>
+    <typedef-decl name='gnutls_ctype_target_t' type-id='type-id-428' id='type-id-429'/>
     <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-423' name='pcache'/>
-      <parameter type-id='type-id-424' name='list'/>
-      <parameter type-id='type-id-428' name='target'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' name='list'/>
+      <parameter type-id='type-id-429' 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'>
@@ -5583,6 +5664,9 @@
     <function-decl name='strchr' mangled-name='strchr' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='_gnutls_profile_to_sec_level' mangled-name='_gnutls_profile_to_sec_level' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_id_to_group' mangled-name='_gnutls_id_to_group' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -5619,29 +5703,47 @@
     <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_certificate_type_get_id' mangled-name='gnutls_certificate_type_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_group_get_id' mangled-name='gnutls_group_get_id' visibility='default' binding='global' size-in-bits='64'>
+    <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_buffer_append_str' mangled-name='_gnutls_buffer_append_str' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='__getdelim' mangled-name='__getdelim' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='__xstat' mangled-name='__xstat' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='fmemopen' mangled-name='fmemopen' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='ini_parse' mangled-name='ini_parse' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='__xstat' mangled-name='__xstat' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='exit' mangled-name='exit' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='gnutls_load_file' mangled-name='gnutls_load_file' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_profile_get_id' mangled-name='_gnutls_profile_get_id' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='gnutls_cipher_get_id' mangled-name='gnutls_cipher_get_id' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <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'>
+      <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'>
+      <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'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_ecc_curve_mark_disabled' mangled-name='_gnutls_ecc_curve_mark_disabled' 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='hash_int.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='hash_int.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <return type-id='type-id-22'/>
@@ -5653,10 +5755,13 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cipher_int.c' comp-dir-path='/home/nmavrogi/cvs/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='_gnutls_mac_init' mangled-name='_gnutls_mac_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -5664,7 +5769,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='session.c' comp-dir-path='/home/nmavrogi/cvs/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-57' name='sid'/>
@@ -5680,8 +5785,8 @@
     </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-102' name='session_data'/>
-      <parameter type-id='type-id-100' name='session_data_size'/>
+      <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'>
@@ -5691,8 +5796,8 @@
     </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-102' name='session_id'/>
-      <parameter type-id='type-id-421' name='session_id_size'/>
+      <parameter type-id='type-id-101' name='session_id'/>
+      <parameter type-id='type-id-422' 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'>
@@ -5702,8 +5807,8 @@
     </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-102' name='session_data'/>
-      <parameter type-id='type-id-421' name='session_data_size'/>
+      <parameter type-id='type-id-101' name='session_data'/>
+      <parameter type-id='type-id-422' name='session_data_size'/>
       <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'>
@@ -5742,14 +5847,14 @@
     <function-decl name='_gnutls_session_unpack' mangled-name='_gnutls_session_unpack' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_session_pack' mangled-name='_gnutls_session_pack' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='gnutls_session_is_resumed' mangled-name='gnutls_session_is_resumed' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='gnutls_session_is_resumed' mangled-name='gnutls_session_is_resumed' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_session_pack' mangled-name='_gnutls_session_pack' 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='db.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='db.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <return type-id='type-id-111'/>
@@ -5777,11 +5882,11 @@
     </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'/>
-      <return type-id='type-id-102'/>
+      <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-102' name='ptr'/>
+      <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'>
@@ -5806,7 +5911,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509_b64.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -5827,7 +5932,7 @@
       <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-421' name='result_size'/>
+      <parameter type-id='type-id-422' 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'>
@@ -5840,7 +5945,7 @@
       <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-421' name='result_size'/>
+      <parameter type-id='type-id-422' 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'>
@@ -5852,6 +5957,9 @@
     <function-decl name='memmem' mangled-name='memmem' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='nettle_base64_encode_raw' mangled-name='nettle_base64_encode_raw' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='nettle_base64_decode_init' mangled-name='nettle_base64_decode_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -5861,11 +5969,8 @@
     <function-decl name='nettle_base64_decode_final' mangled-name='nettle_base64_decode_final' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='nettle_base64_encode_raw' mangled-name='nettle_base64_encode_raw' 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='hello_ext.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='hello_ext.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <return type-id='type-id-10'/>
@@ -5886,7 +5991,7 @@
       <parameter type-id='type-id-236' 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_type'/>
+      <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'/>
@@ -5898,7 +6003,7 @@
     <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_type'/>
+      <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'/>
@@ -5920,7 +6025,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='auth.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -5933,17 +6038,17 @@
       <parameter type-id='type-id-413' name='session'/>
       <return type-id='type-id-309'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-429'/>
+    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-430'/>
     <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-429' name='cred'/>
+      <parameter type-id='type-id-430' 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-102' name='cred'/>
+      <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'>
@@ -5957,7 +6062,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='sslv2_compat.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -5977,7 +6082,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='session_pack.c' comp-dir-path='/home/nmavrogi/cvs/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-10' name='entity'/>
@@ -6024,18 +6129,18 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='mpi.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-430'/>
+  <abi-instr version='1.0' address-size='64' path='pk.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-431'/>
     <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-430' name='hash'/>
+      <parameter type-id='type-id-431' name='hash'/>
       <parameter type-id='type-id-64' name='digest'/>
-      <parameter type-id='type-id-418' name='digest_size'/>
+      <parameter type-id='type-id-419' 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'>
@@ -6105,10 +6210,10 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <class-decl name='gnutls_certificate_credentials_st' size-in-bits='1344' is-struct='yes' visibility='default' id='type-id-431'>
+  <abi-instr version='1.0' address-size='64' path='cert-cred.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_certificate_credentials_st' size-in-bits='1408' is-struct='yes' visibility='default' id='type-id-432'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='dh_params' type-id='type-id-417' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-418' 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'/>
@@ -6117,19 +6222,19 @@
         <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='params_func' type-id='type-id-432' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-433' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='certs' type-id='type-id-433' visibility='default'/>
+        <var-decl name='certs' type-id='type-id-434' 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-418' visibility='default'/>
+        <var-decl name='sorted_cert_idx' type-id='type-id-419' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='tlist' type-id='type-id-434' visibility='default'/>
+        <var-decl name='tlist' type-id='type-id-435' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
@@ -6144,13 +6249,13 @@
         <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-435' visibility='default'/>
+        <var-decl name='legacy_cert_cb1' type-id='type-id-436' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='legacy_cert_cb2' type-id='type-id-436' visibility='default'/>
+        <var-decl name='legacy_cert_cb2' type-id='type-id-437' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='get_cert_callback3' type-id='type-id-437' visibility='default'/>
+        <var-decl name='get_cert_callback3' type-id='type-id-438' 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'/>
@@ -6159,47 +6264,50 @@
         <var-decl name='pin' type-id='type-id-374' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='pin_tmp' type-id='type-id-438' visibility='default'/>
+        <var-decl name='pin_tmp' type-id='type-id-439' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='glob_ocsp_func_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='glob_ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1344'>
+        <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-439'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-440'>
       <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-439' id='type-id-440'/>
-    <class-decl name='gnutls_params_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-441'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-440' visibility='default'/>
+        <var-decl name='type' type-id='type-id-441' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='params' type-id='type-id-442' visibility='default'/>
+        <var-decl name='params' type-id='type-id-443' 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-442'>
+    <union-decl name='params' size-in-bits='64' visibility='default' id='type-id-443'>
       <data-member access='private'>
-        <var-decl name='dh' type-id='type-id-417' visibility='default'/>
+        <var-decl name='dh' type-id='type-id-418' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='rsa_export' type-id='type-id-443' visibility='default'/>
+        <var-decl name='rsa_export' type-id='type-id-444' visibility='default'/>
       </data-member>
     </union-decl>
-    <typedef-decl name='gnutls_rsa_params_t' type-id='type-id-391' id='type-id-443'/>
-    <typedef-decl name='gnutls_params_st' type-id='type-id-441' id='type-id-444'/>
-    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-445'/>
-    <typedef-decl name='gnutls_params_function' type-id='type-id-446' id='type-id-447'/>
-    <pointer-type-def type-id='type-id-447' size-in-bits='64' id='type-id-432'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='4544' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-448' visibility='default' id='type-id-449'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='cert_list' type-id='type-id-161' visibility='default'/>
       </data-member>
@@ -6207,16 +6315,16 @@
         <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-450' visibility='default'/>
+        <var-decl name='names' type-id='type-id-451' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='ocsp_func_ptr' type-id='type-id-102' visibility='default'/>
+        <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-451' visibility='default'/>
+        <var-decl name='ocsp_data' type-id='type-id-452' 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'/>
@@ -6225,7 +6333,7 @@
         <var-decl name='pkey' type-id='type-id-401' 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-452'>
+    <class-decl name='gnutls_str_array_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-453'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='str' type-id='type-id-376' visibility='default'/>
       </data-member>
@@ -6233,36 +6341,36 @@
         <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-453' visibility='default'/>
+        <var-decl name='next' type-id='type-id-454' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-453'/>
-    <typedef-decl name='gnutls_str_array_t' type-id='type-id-453' id='type-id-450'/>
+    <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'/>
 
-    <array-type-def dimensions='1' type-id='type-id-274' size-in-bits='4096' id='type-id-451'>
-      <subrange length='8' type-id='type-id-38' id='type-id-133'/>
+    <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>
-    <typedef-decl name='certs_st' type-id='type-id-449' id='type-id-448'/>
-    <pointer-type-def type-id='type-id-448' size-in-bits='64' id='type-id-433'/>
-    <class-decl name='gnutls_x509_trust_list_st' size-in-bits='576' is-struct='yes' visibility='default' id='type-id-454'>
+    <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'>
       <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-455' visibility='default'/>
+        <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-456' visibility='default'/>
+        <var-decl name='blacklisted' type-id='type-id-458' 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-456' visibility='default'/>
+        <var-decl name='keep_certs' type-id='type-id-458' 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'/>
@@ -6271,9 +6379,9 @@
         <var-decl name='pkcs11_token' type-id='type-id-376' 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-457'/>
-    <pointer-type-def type-id='type-id-457' size-in-bits='64' id='type-id-455'/>
-    <class-decl name='gnutls_x509_crt_int' size-in-bits='1088' is-struct='yes' visibility='default' id='type-id-458'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='cert' type-id='type-id-387' visibility='default'/>
       </data-member>
@@ -6305,35 +6413,35 @@
         <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-459' visibility='default'/>
+        <var-decl name='san' type-id='type-id-461' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='ian' type-id='type-id-459' visibility='default'/>
+        <var-decl name='ian' type-id='type-id-461' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='dn' type-id='type-id-460' visibility='default'/>
+        <var-decl name='dn' type-id='type-id-462' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='idn' type-id='type-id-460' visibility='default'/>
+        <var-decl name='idn' type-id='type-id-462' 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-461'/>
-    <pointer-type-def type-id='type-id-461' size-in-bits='64' id='type-id-462'/>
-    <typedef-decl name='gnutls_subject_alt_names_t' type-id='type-id-462' id='type-id-459'/>
-    <class-decl name='gnutls_x509_dn_st' size-in-bits='64' 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' 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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='asn' type-id='type-id-387' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_x509_dn_st' type-id='type-id-463' id='type-id-460'/>
-    <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-464'/>
-    <typedef-decl name='gnutls_x509_crt_t' type-id='type-id-464' id='type-id-465'/>
-    <pointer-type-def type-id='type-id-465' size-in-bits='64' id='type-id-456'/>
-    <pointer-type-def type-id='type-id-454' size-in-bits='64' id='type-id-466'/>
-    <typedef-decl name='gnutls_x509_trust_list_t' type-id='type-id-466' id='type-id-434'/>
-    <qualified-type-def type-id='type-id-60' const='yes' id='type-id-467'/>
-    <pointer-type-def type-id='type-id-467' size-in-bits='64' id='type-id-468'/>
-    <class-decl name='gnutls_retr2_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-469'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='cert_type' type-id='type-id-19' visibility='default'/>
       </data-member>
@@ -6341,57 +6449,57 @@
         <var-decl name='key_type' type-id='type-id-380' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cert' type-id='type-id-470' visibility='default'/>
+        <var-decl name='cert' type-id='type-id-472' 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-471' visibility='default'/>
+        <var-decl name='key' type-id='type-id-473' 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-470'>
+    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' id='type-id-472'>
       <data-member access='private'>
-        <var-decl name='x509' type-id='type-id-456' visibility='default'/>
+        <var-decl name='x509' type-id='type-id-458' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='pgp' type-id='type-id-472' visibility='default'/>
+        <var-decl name='pgp' type-id='type-id-474' 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-473'/>
-    <pointer-type-def type-id='type-id-473' size-in-bits='64' id='type-id-474'/>
-    <typedef-decl name='gnutls_openpgp_crt_t' type-id='type-id-474' id='type-id-472'/>
-    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' id='type-id-471'>
+    <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'>
       <data-member access='private'>
         <var-decl name='x509' type-id='type-id-383' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='pgp' type-id='type-id-475' visibility='default'/>
+        <var-decl name='pgp' type-id='type-id-477' visibility='default'/>
       </data-member>
       <data-member access='private'>
         <var-decl name='pkcs11' type-id='type-id-384' 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-476'/>
-    <pointer-type-def type-id='type-id-476' size-in-bits='64' id='type-id-477'/>
-    <typedef-decl name='gnutls_openpgp_privkey_t' type-id='type-id-477' id='type-id-475'/>
-    <typedef-decl name='gnutls_retr2_st' type-id='type-id-469' id='type-id-478'/>
+    <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_certificate_retrieve_function' type-id='type-id-480' id='type-id-481'/>
-    <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-435'/>
-    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-482'/>
-    <pointer-type-def type-id='type-id-401' size-in-bits='64' id='type-id-483'/>
-    <typedef-decl name='gnutls_certificate_retrieve_function2' type-id='type-id-484' id='type-id-485'/>
-    <pointer-type-def type-id='type-id-485' size-in-bits='64' id='type-id-436'/>
-    <class-decl name='gnutls_cert_retr_st' size-in-bits='896' is-struct='yes' visibility='default' id='type-id-486'>
+    <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'>
       <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-487' visibility='default'/>
+        <var-decl name='cred' type-id='type-id-489' 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'/>
@@ -6400,40 +6508,40 @@
         <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-468' visibility='default'/>
+        <var-decl name='pk_algos' type-id='type-id-470' 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-488' visibility='default'/>
+        <var-decl name='padding' type-id='type-id-490' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-431' size-in-bits='64' id='type-id-489'/>
-    <typedef-decl name='gnutls_certificate_credentials_t' type-id='type-id-489' id='type-id-487'/>
+    <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'/>
 
-    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='512' id='type-id-488'>
-      <subrange length='64' type-id='type-id-38' id='type-id-93'/>
+    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='512' id='type-id-490'>
+      <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-486' const='yes' id='type-id-490'/>
-    <pointer-type-def type-id='type-id-490' size-in-bits='64' id='type-id-491'/>
-    <pointer-type-def type-id='type-id-163' size-in-bits='64' id='type-id-492'/>
-    <typedef-decl name='gnutls_certificate_retrieve_function3' type-id='type-id-493' id='type-id-494'/>
-    <pointer-type-def type-id='type-id-494' size-in-bits='64' id='type-id-437'/>
+    <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'/>
 
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='256' id='type-id-438'>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='256' id='type-id-439'>
       <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-487' name='res'/>
+      <parameter type-id='type-id-489' name='res'/>
       <parameter type-id='type-id-202' 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-487' name='res'/>
-      <parameter type-id='type-id-417' name='dh_params'/>
+      <parameter type-id='type-id-489' name='res'/>
+      <parameter type-id='type-id-418' 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'>
@@ -6444,23 +6552,23 @@
       <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-487' name='cred'/>
+      <parameter type-id='type-id-489' name='cred'/>
       <parameter type-id='type-id-171' 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-487' name='cred'/>
-      <parameter type-id='type-id-437' name='func'/>
+      <parameter type-id='type-id-489' name='cred'/>
+      <parameter type-id='type-id-438' 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-487' name='cred'/>
-      <parameter type-id='type-id-436' name='func'/>
+      <parameter type-id='type-id-489' name='cred'/>
+      <parameter type-id='type-id-437' 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-487' name='cred'/>
-      <parameter type-id='type-id-435' name='func'/>
+      <parameter type-id='type-id-489' name='cred'/>
+      <parameter type-id='type-id-436' 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'>
@@ -6468,44 +6576,44 @@
       <parameter type-id='type-id-148' name='req'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-487' size-in-bits='64' id='type-id-495'/>
+    <pointer-type-def type-id='type-id-489' size-in-bits='64' id='type-id-497'/>
     <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-495' name='res'/>
+      <parameter type-id='type-id-497' 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-487' name='sc'/>
+      <parameter type-id='type-id-489' 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-487' name='sc'/>
+      <parameter type-id='type-id-489' 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-487' name='sc'/>
+      <parameter type-id='type-id-489' 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'/>
       <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-487' name='sc'/>
-      <parameter type-id='type-id-465' name='cert'/>
-      <parameter type-id='type-id-456' name='issuer'/>
+      <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-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-487' name='sc'/>
+      <parameter type-id='type-id-489' 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-487' name='sc'/>
+      <parameter type-id='type-id-489' 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-487' name='res'/>
-      <parameter type-id='type-id-425' name='names'/>
+      <parameter type-id='type-id-489' name='res'/>
+      <parameter type-id='type-id-426' 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-22' name='pcert_list_size'/>
@@ -6584,54 +6692,58 @@
     <function-decl name='gnutls_realloc_fast' mangled-name='gnutls_realloc_fast' 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-493'>
+    <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-491'/>
-      <parameter type-id='type-id-482'/>
-      <parameter type-id='type-id-418'/>
-      <parameter type-id='type-id-492'/>
-      <parameter type-id='type-id-418'/>
-      <parameter type-id='type-id-483'/>
-      <parameter type-id='type-id-418'/>
+      <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'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-484'>
+    <function-type size-in-bits='64' id='type-id-486'>
       <parameter type-id='type-id-413'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-22'/>
-      <parameter type-id='type-id-468'/>
+      <parameter type-id='type-id-470'/>
       <parameter type-id='type-id-22'/>
-      <parameter type-id='type-id-482'/>
-      <parameter type-id='type-id-418'/>
-      <parameter type-id='type-id-483'/>
+      <parameter type-id='type-id-484'/>
+      <parameter type-id='type-id-419'/>
+      <parameter type-id='type-id-485'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-480'>
+    <function-type size-in-bits='64' id='type-id-482'>
       <parameter type-id='type-id-413'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-22'/>
-      <parameter type-id='type-id-468'/>
+      <parameter type-id='type-id-470'/>
       <parameter type-id='type-id-22'/>
-      <parameter type-id='type-id-479'/>
+      <parameter type-id='type-id-481'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-446'>
+    <function-type size-in-bits='64' id='type-id-447'>
       <parameter type-id='type-id-413'/>
-      <parameter type-id='type-id-440'/>
-      <parameter type-id='type-id-445'/>
+      <parameter type-id='type-id-441'/>
+      <parameter type-id='type-id-446'/>
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='global.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/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-496' size-in-bits='64' id='type-id-497'/>
-    <typedef-decl name='gnutls_log_func' type-id='type-id-497' id='type-id-498'/>
-    <var-decl name='_gnutls_log_func' type-id='type-id-498' visibility='default'/>
-    <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-500'/>
-    <typedef-decl name='gnutls_audit_log_func' type-id='type-id-500' id='type-id-501'/>
-    <var-decl name='_gnutls_audit_log_func' type-id='type-id-501' 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'/>
+    <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'/>
     <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'>
       <parameter type-id='type-id-27' name='req_version'/>
       <return type-id='type-id-27'/>
@@ -6642,38 +6754,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-502' size-in-bits='64' id='type-id-503'/>
-    <typedef-decl name='gnutls_alloc_function' type-id='type-id-503' id='type-id-504'/>
-    <pointer-type-def type-id='type-id-505' size-in-bits='64' id='type-id-506'/>
-    <typedef-decl name='gnutls_is_secure_function' type-id='type-id-506' id='type-id-507'/>
-    <pointer-type-def type-id='type-id-508' size-in-bits='64' id='type-id-509'/>
-    <typedef-decl name='gnutls_realloc_function' type-id='type-id-509' id='type-id-510'/>
-    <typedef-decl name='gnutls_free_function' type-id='type-id-121' id='type-id-511'/>
+    <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'/>
+    <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'/>
     <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-504' name='alloc_func'/>
-      <parameter type-id='type-id-504' name='secure_alloc_func'/>
-      <parameter type-id='type-id-507' name='is_secure_func'/>
-      <parameter type-id='type-id-510' name='realloc_func'/>
-      <parameter type-id='type-id-511' name='free_func'/>
+      <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'/>
       <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-512'/>
-    <pointer-type-def type-id='type-id-513' size-in-bits='64' id='type-id-514'/>
-    <typedef-decl name='gnutls_time_func' type-id='type-id-514' id='type-id-515'/>
+    <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'/>
     <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-515' name='time_func'/>
+      <parameter type-id='type-id-517' 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-501' 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_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-498' name='log_func'/>
+      <parameter type-id='type-id-500' 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'>
@@ -6763,35 +6875,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-505'>
-      <parameter type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-507'>
+      <parameter type-id='type-id-101'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-513'>
-      <parameter type-id='type-id-512'/>
+    <function-type size-in-bits='64' id='type-id-515'>
+      <parameter type-id='type-id-514'/>
       <return type-id='type-id-17'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-496'>
+    <function-type size-in-bits='64' id='type-id-498'>
       <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-499'>
+    <function-type size-in-bits='64' id='type-id-501'>
       <parameter type-id='type-id-236'/>
       <parameter type-id='type-id-27'/>
       <return type-id='type-id-111'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-502'>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-504'>
+      <parameter type-id='type-id-99'/>
+      <return type-id='type-id-101'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-508'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-510'>
+      <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='constate.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -6804,10 +6916,10 @@
     <function-decl name='_gnutls_generate_master' mangled-name='_gnutls_generate_master' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_dtls_reset_window' mangled-name='_dtls_reset_window' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_record_overhead' mangled-name='_gnutls_record_overhead' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_record_overhead' mangled-name='_gnutls_record_overhead' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_dtls_reset_window' mangled-name='_dtls_reset_window' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_auth_cipher_init' mangled-name='_gnutls_auth_cipher_init' visibility='default' binding='global' size-in-bits='64'>
@@ -6817,10 +6929,10 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <class-decl name='gnutls_anon_server_credentials_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-516'>
+  <abi-instr version='1.0' address-size='64' path='anon_cred.c' comp-dir-path='/home/nmavrogi/cvs/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-518'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='dh_params' type-id='type-id-417' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-418' 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'/>
@@ -6829,107 +6941,107 @@
         <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='params_func' type-id='type-id-432' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-433' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-516' size-in-bits='64' id='type-id-517'/>
-    <typedef-decl name='gnutls_anon_server_credentials_t' type-id='type-id-517' id='type-id-518'/>
+    <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'/>
     <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-518' name='res'/>
+      <parameter type-id='type-id-520' name='res'/>
       <parameter type-id='type-id-202' 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-518' name='res'/>
-      <parameter type-id='type-id-417' name='dh_params'/>
+      <parameter type-id='type-id-520' name='res'/>
+      <parameter type-id='type-id-418' 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-519'>
+    <class-decl name='gnutls_anon_client_credentials_st' size-in-bits='32' is-struct='yes' visibility='default' id='type-id-521'>
       <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-519' size-in-bits='64' id='type-id-520'/>
-    <typedef-decl name='gnutls_anon_client_credentials_t' type-id='type-id-520' id='type-id-521'/>
     <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'/>
     <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-522' name='sc'/>
+      <parameter type-id='type-id-524' 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-521' name='sc'/>
+      <parameter type-id='type-id-523' name='sc'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-523'/>
+    <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-525'/>
     <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-523' name='sc'/>
+      <parameter type-id='type-id-525' 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-518' name='sc'/>
+      <parameter type-id='type-id-520' 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-518' name='res'/>
-      <parameter type-id='type-id-432' name='func'/>
+      <parameter type-id='type-id-520' name='res'/>
+      <parameter type-id='type-id-433' 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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <var-decl name='gnutls_secure_malloc' type-id='type-id-504' 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-504' mangled-name='gnutls_malloc' visibility='default' elf-symbol-id='gnutls_malloc@@GNUTLS_3_4'/>
-    <var-decl name='gnutls_free' type-id='type-id-511' mangled-name='gnutls_free' visibility='default' elf-symbol-id='gnutls_free@@GNUTLS_3_4'/>
-    <var-decl name='gnutls_realloc' type-id='type-id-510' mangled-name='gnutls_realloc' visibility='default' elf-symbol-id='gnutls_realloc@@GNUTLS_3_4'/>
-    <pointer-type-def type-id='type-id-524' size-in-bits='64' id='type-id-525'/>
-    <typedef-decl name='gnutls_calloc_function' type-id='type-id-525' id='type-id-526'/>
-    <var-decl name='gnutls_calloc' type-id='type-id-526' mangled-name='gnutls_calloc' visibility='default' elf-symbol-id='gnutls_calloc@@GNUTLS_3_4'/>
-    <pointer-type-def type-id='type-id-527' size-in-bits='64' id='type-id-528'/>
-    <var-decl name='gnutls_strdup' type-id='type-id-528' mangled-name='gnutls_strdup' visibility='default' elf-symbol-id='gnutls_strdup@@GNUTLS_3_4'/>
-    <function-type size-in-bits='64' id='type-id-527'>
+  <abi-instr version='1.0' address-size='64' path='mem.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/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'/>
+    <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'>
       <parameter type-id='type-id-27'/>
       <return type-id='type-id-376'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-524'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-526'>
+      <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='fingerprint.c' comp-dir-path='/home/nmavrogi/cvs/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-57' name='data'/>
-      <parameter type-id='type-id-102' name='result'/>
-      <parameter type-id='type-id-421' name='result_size'/>
+      <parameter type-id='type-id-101' name='result'/>
+      <parameter type-id='type-id-422' 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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <function-decl name='_gnutls_session_get_sign_algo' mangled-name='_gnutls_session_get_sign_algo' visibility='default' binding='global' size-in-bits='64'>
+  <abi-instr version='1.0' address-size='64' path='tls-sig.c' comp-dir-path='/home/nmavrogi/cvs/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>
-    <function-decl name='gnutls_sign_supports_pk_algorithm' mangled-name='gnutls_sign_supports_pk_algorithm' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_hash_init' mangled-name='_gnutls_hash_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </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'>
+    <function-decl name='_gnutls_hash_deinit' mangled-name='_gnutls_hash_deinit' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_pubkey_compatible_with_sig' mangled-name='_gnutls_pubkey_compatible_with_sig' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='gnutls_privkey_sign_hash' mangled-name='gnutls_privkey_sign_hash' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_hash_init' mangled-name='_gnutls_hash_init' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_session_get_sign_algo' mangled-name='_gnutls_session_get_sign_algo' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_hash_deinit' mangled-name='_gnutls_hash_deinit' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='gnutls_sign_supports_pk_algorithm' mangled-name='gnutls_sign_supports_pk_algorithm' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='gnutls_privkey_sign_hash' mangled-name='gnutls_privkey_sign_hash' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='gnutls_pubkey_get_key_usage' mangled-name='gnutls_pubkey_get_key_usage' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_session_sign_algo_enabled' mangled-name='_gnutls_session_sign_algo_enabled' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='gnutls_pubkey_verify_hash2' mangled-name='gnutls_pubkey_verify_hash2' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='gnutls_pubkey_verify_hash2' mangled-name='gnutls_pubkey_verify_hash2' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_session_sign_algo_enabled' mangled-name='_gnutls_session_sign_algo_enabled' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </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'>
@@ -6939,13 +7051,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ecc.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-529'>
+  <abi-instr version='1.0' address-size='64' path='alert.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-531'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_A_CLOSE_NOTIFY' value='0'/>
       <enumerator name='GNUTLS_A_UNEXPECTED_MESSAGE' value='10'/>
@@ -6981,10 +7093,10 @@
       <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-529' id='type-id-530'/>
+    <typedef-decl name='gnutls_alert_description_t' type-id='type-id-531' id='type-id-532'/>
     <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-530'/>
+      <return type-id='type-id-532'/>
     </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'/>
@@ -6996,28 +7108,28 @@
       <parameter type-id='type-id-364' name='level'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-531'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-533'>
       <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-531' id='type-id-532'/>
+    <typedef-decl name='gnutls_alert_level_t' type-id='type-id-533' id='type-id-534'/>
     <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-532' name='level'/>
-      <parameter type-id='type-id-530' name='desc'/>
+      <parameter type-id='type-id-534' name='level'/>
+      <parameter type-id='type-id-532' 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-530' name='alert'/>
+      <parameter type-id='type-id-532' 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-530' name='alert'/>
+      <parameter type-id='type-id-532' 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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='privkey_raw.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <class-decl name='gnutls_pkcs11_privkey_st' size-in-bits='3392' is-struct='yes' visibility='default' id='type-id-392'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pk_algorithm' type-id='type-id-60' visibility='default'/>
@@ -7032,44 +7144,44 @@
         <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-533' visibility='default'/>
+        <var-decl name='uinfo' type-id='type-id-535' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='url' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='sinfo' type-id='type-id-534' visibility='default'/>
+        <var-decl name='sinfo' type-id='type-id-536' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3072'>
-        <var-decl name='ref' type-id='type-id-535' visibility='default'/>
+        <var-decl name='ref' type-id='type-id-537' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3136'>
         <var-decl name='reauth' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3200'>
-        <var-decl name='mutex' type-id='type-id-102' visibility='default'/>
+        <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'/>
       </data-member>
     </class-decl>
-    <class-decl name='p11_kit_uri' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-536'/>
-    <pointer-type-def type-id='type-id-536' size-in-bits='64' id='type-id-533'/>
-    <class-decl name='pkcs11_session_info' size-in-bits='2816' is-struct='yes' visibility='default' id='type-id-534'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='module' type-id='type-id-537' visibility='default'/>
+        <var-decl name='module' type-id='type-id-539' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tinfo' type-id='type-id-538' visibility='default'/>
+        <var-decl name='tinfo' type-id='type-id-540' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='slot_info' type-id='type-id-539' visibility='default'/>
+        <var-decl name='slot_info' type-id='type-id-541' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2624'>
-        <var-decl name='pks' type-id='type-id-540' visibility='default'/>
+        <var-decl name='pks' type-id='type-id-542' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2688'>
-        <var-decl name='sid' type-id='type-id-541' visibility='default'/>
+        <var-decl name='sid' type-id='type-id-543' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2752'>
         <var-decl name='init' type-id='type-id-10' visibility='default'/>
@@ -7078,216 +7190,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-542'>
+    <class-decl name='ck_function_list' size-in-bits='4416' is-struct='yes' visibility='default' id='type-id-544'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='version' type-id='type-id-543' visibility='default'/>
+        <var-decl name='version' type-id='type-id-545' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='C_Initialize' type-id='type-id-544' visibility='default'/>
+        <var-decl name='C_Initialize' type-id='type-id-546' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='C_Finalize' type-id='type-id-545' visibility='default'/>
+        <var-decl name='C_Finalize' type-id='type-id-547' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='C_GetInfo' type-id='type-id-546' visibility='default'/>
+        <var-decl name='C_GetInfo' type-id='type-id-548' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='C_GetFunctionList' type-id='type-id-547' visibility='default'/>
+        <var-decl name='C_GetFunctionList' type-id='type-id-549' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='C_GetSlotList' type-id='type-id-548' visibility='default'/>
+        <var-decl name='C_GetSlotList' type-id='type-id-550' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='C_GetSlotInfo' type-id='type-id-549' visibility='default'/>
+        <var-decl name='C_GetSlotInfo' type-id='type-id-551' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='C_GetTokenInfo' type-id='type-id-550' visibility='default'/>
+        <var-decl name='C_GetTokenInfo' type-id='type-id-552' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='C_GetMechanismList' type-id='type-id-551' visibility='default'/>
+        <var-decl name='C_GetMechanismList' type-id='type-id-553' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='C_GetMechanismInfo' type-id='type-id-552' visibility='default'/>
+        <var-decl name='C_GetMechanismInfo' type-id='type-id-554' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='C_InitToken' type-id='type-id-553' visibility='default'/>
+        <var-decl name='C_InitToken' type-id='type-id-555' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='C_InitPIN' type-id='type-id-554' visibility='default'/>
+        <var-decl name='C_InitPIN' type-id='type-id-556' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='C_SetPIN' type-id='type-id-555' visibility='default'/>
+        <var-decl name='C_SetPIN' type-id='type-id-557' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='C_OpenSession' type-id='type-id-556' visibility='default'/>
+        <var-decl name='C_OpenSession' type-id='type-id-558' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='C_CloseSession' type-id='type-id-557' visibility='default'/>
+        <var-decl name='C_CloseSession' type-id='type-id-559' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='C_CloseAllSessions' type-id='type-id-558' visibility='default'/>
+        <var-decl name='C_CloseAllSessions' type-id='type-id-560' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='C_GetSessionInfo' type-id='type-id-559' visibility='default'/>
+        <var-decl name='C_GetSessionInfo' type-id='type-id-561' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='C_GetOperationState' type-id='type-id-560' visibility='default'/>
+        <var-decl name='C_GetOperationState' type-id='type-id-562' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='C_SetOperationState' type-id='type-id-561' visibility='default'/>
+        <var-decl name='C_SetOperationState' type-id='type-id-563' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='C_Login' type-id='type-id-562' visibility='default'/>
+        <var-decl name='C_Login' type-id='type-id-564' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='C_Logout' type-id='type-id-563' visibility='default'/>
+        <var-decl name='C_Logout' type-id='type-id-565' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='C_CreateObject' type-id='type-id-564' visibility='default'/>
+        <var-decl name='C_CreateObject' type-id='type-id-566' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='C_CopyObject' type-id='type-id-565' visibility='default'/>
+        <var-decl name='C_CopyObject' type-id='type-id-567' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='C_DestroyObject' type-id='type-id-566' visibility='default'/>
+        <var-decl name='C_DestroyObject' type-id='type-id-568' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='C_GetObjectSize' type-id='type-id-567' visibility='default'/>
+        <var-decl name='C_GetObjectSize' type-id='type-id-569' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='C_GetAttributeValue' type-id='type-id-568' visibility='default'/>
+        <var-decl name='C_GetAttributeValue' type-id='type-id-570' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='C_SetAttributeValue' type-id='type-id-569' visibility='default'/>
+        <var-decl name='C_SetAttributeValue' type-id='type-id-571' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='C_FindObjectsInit' type-id='type-id-570' visibility='default'/>
+        <var-decl name='C_FindObjectsInit' type-id='type-id-572' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1792'>
-        <var-decl name='C_FindObjects' type-id='type-id-571' visibility='default'/>
+        <var-decl name='C_FindObjects' type-id='type-id-573' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1856'>
-        <var-decl name='C_FindObjectsFinal' type-id='type-id-572' visibility='default'/>
+        <var-decl name='C_FindObjectsFinal' type-id='type-id-574' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1920'>
-        <var-decl name='C_EncryptInit' type-id='type-id-573' visibility='default'/>
+        <var-decl name='C_EncryptInit' type-id='type-id-575' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1984'>
-        <var-decl name='C_Encrypt' type-id='type-id-574' visibility='default'/>
+        <var-decl name='C_Encrypt' type-id='type-id-576' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
-        <var-decl name='C_EncryptUpdate' type-id='type-id-575' visibility='default'/>
+        <var-decl name='C_EncryptUpdate' type-id='type-id-577' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
-        <var-decl name='C_EncryptFinal' type-id='type-id-576' visibility='default'/>
+        <var-decl name='C_EncryptFinal' type-id='type-id-578' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='C_DecryptInit' type-id='type-id-577' visibility='default'/>
+        <var-decl name='C_DecryptInit' type-id='type-id-579' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
-        <var-decl name='C_Decrypt' type-id='type-id-578' visibility='default'/>
+        <var-decl name='C_Decrypt' type-id='type-id-580' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='C_DecryptUpdate' type-id='type-id-579' visibility='default'/>
+        <var-decl name='C_DecryptUpdate' type-id='type-id-581' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='C_DecryptFinal' type-id='type-id-580' visibility='default'/>
+        <var-decl name='C_DecryptFinal' type-id='type-id-582' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
-        <var-decl name='C_DigestInit' type-id='type-id-581' visibility='default'/>
+        <var-decl name='C_DigestInit' type-id='type-id-583' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
-        <var-decl name='C_Digest' type-id='type-id-582' visibility='default'/>
+        <var-decl name='C_Digest' type-id='type-id-584' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2560'>
-        <var-decl name='C_DigestUpdate' type-id='type-id-583' visibility='default'/>
+        <var-decl name='C_DigestUpdate' type-id='type-id-585' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2624'>
-        <var-decl name='C_DigestKey' type-id='type-id-584' visibility='default'/>
+        <var-decl name='C_DigestKey' type-id='type-id-586' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2688'>
-        <var-decl name='C_DigestFinal' type-id='type-id-585' visibility='default'/>
+        <var-decl name='C_DigestFinal' type-id='type-id-587' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2752'>
-        <var-decl name='C_SignInit' type-id='type-id-586' visibility='default'/>
+        <var-decl name='C_SignInit' type-id='type-id-588' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2816'>
-        <var-decl name='C_Sign' type-id='type-id-587' visibility='default'/>
+        <var-decl name='C_Sign' type-id='type-id-589' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2880'>
-        <var-decl name='C_SignUpdate' type-id='type-id-588' visibility='default'/>
+        <var-decl name='C_SignUpdate' type-id='type-id-590' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2944'>
-        <var-decl name='C_SignFinal' type-id='type-id-589' visibility='default'/>
+        <var-decl name='C_SignFinal' type-id='type-id-591' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3008'>
-        <var-decl name='C_SignRecoverInit' type-id='type-id-590' visibility='default'/>
+        <var-decl name='C_SignRecoverInit' type-id='type-id-592' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3072'>
-        <var-decl name='C_SignRecover' type-id='type-id-591' visibility='default'/>
+        <var-decl name='C_SignRecover' type-id='type-id-593' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3136'>
-        <var-decl name='C_VerifyInit' type-id='type-id-592' visibility='default'/>
+        <var-decl name='C_VerifyInit' type-id='type-id-594' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3200'>
-        <var-decl name='C_Verify' type-id='type-id-593' visibility='default'/>
+        <var-decl name='C_Verify' type-id='type-id-595' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
-        <var-decl name='C_VerifyUpdate' type-id='type-id-594' visibility='default'/>
+        <var-decl name='C_VerifyUpdate' type-id='type-id-596' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
-        <var-decl name='C_VerifyFinal' type-id='type-id-595' visibility='default'/>
+        <var-decl name='C_VerifyFinal' type-id='type-id-597' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
-        <var-decl name='C_VerifyRecoverInit' type-id='type-id-596' visibility='default'/>
+        <var-decl name='C_VerifyRecoverInit' type-id='type-id-598' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
-        <var-decl name='C_VerifyRecover' type-id='type-id-597' visibility='default'/>
+        <var-decl name='C_VerifyRecover' type-id='type-id-599' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
-        <var-decl name='C_DigestEncryptUpdate' type-id='type-id-598' visibility='default'/>
+        <var-decl name='C_DigestEncryptUpdate' type-id='type-id-600' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3584'>
-        <var-decl name='C_DecryptDigestUpdate' type-id='type-id-599' visibility='default'/>
+        <var-decl name='C_DecryptDigestUpdate' type-id='type-id-601' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3648'>
-        <var-decl name='C_SignEncryptUpdate' type-id='type-id-600' visibility='default'/>
+        <var-decl name='C_SignEncryptUpdate' type-id='type-id-602' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3712'>
-        <var-decl name='C_DecryptVerifyUpdate' type-id='type-id-601' visibility='default'/>
+        <var-decl name='C_DecryptVerifyUpdate' type-id='type-id-603' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='C_GenerateKey' type-id='type-id-602' visibility='default'/>
+        <var-decl name='C_GenerateKey' type-id='type-id-604' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='C_GenerateKeyPair' type-id='type-id-603' visibility='default'/>
+        <var-decl name='C_GenerateKeyPair' type-id='type-id-605' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='C_WrapKey' type-id='type-id-604' visibility='default'/>
+        <var-decl name='C_WrapKey' type-id='type-id-606' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
-        <var-decl name='C_UnwrapKey' type-id='type-id-605' visibility='default'/>
+        <var-decl name='C_UnwrapKey' type-id='type-id-607' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='C_DeriveKey' type-id='type-id-606' visibility='default'/>
+        <var-decl name='C_DeriveKey' type-id='type-id-608' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
-        <var-decl name='C_SeedRandom' type-id='type-id-607' visibility='default'/>
+        <var-decl name='C_SeedRandom' type-id='type-id-609' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4160'>
-        <var-decl name='C_GenerateRandom' type-id='type-id-608' visibility='default'/>
+        <var-decl name='C_GenerateRandom' type-id='type-id-610' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
-        <var-decl name='C_GetFunctionStatus' type-id='type-id-609' visibility='default'/>
+        <var-decl name='C_GetFunctionStatus' type-id='type-id-611' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4288'>
-        <var-decl name='C_CancelFunction' type-id='type-id-610' visibility='default'/>
+        <var-decl name='C_CancelFunction' type-id='type-id-612' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4352'>
-        <var-decl name='C_WaitForSlotEvent' type-id='type-id-611' visibility='default'/>
+        <var-decl name='C_WaitForSlotEvent' type-id='type-id-613' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='ck_version' size-in-bits='16' is-struct='yes' visibility='default' id='type-id-543'>
+    <class-decl name='ck_version' size-in-bits='16' is-struct='yes' visibility='default' id='type-id-545'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='major' type-id='type-id-35' visibility='default'/>
       </data-member>
@@ -7295,61 +7407,61 @@
         <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-612'/>
-    <pointer-type-def type-id='type-id-613' size-in-bits='64' id='type-id-614'/>
-    <typedef-decl name='CK_C_Initialize' type-id='type-id-614' id='type-id-544'/>
-    <typedef-decl name='CK_C_Finalize' type-id='type-id-614' id='type-id-545'/>
-    <class-decl name='ck_info' size-in-bits='704' is-struct='yes' visibility='default' id='type-id-615'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cryptoki_version' type-id='type-id-543' visibility='default'/>
+        <var-decl name='cryptoki_version' type-id='type-id-545' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='flags' type-id='type-id-616' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-618' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='library_version' type-id='type-id-543' visibility='default'/>
+        <var-decl name='library_version' type-id='type-id-545' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='ck_flags_t' type-id='type-id-38' id='type-id-616'/>
-    <pointer-type-def type-id='type-id-615' size-in-bits='64' 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_GetInfo' type-id='type-id-619' id='type-id-546'/>
-    <pointer-type-def type-id='type-id-542' size-in-bits='64' id='type-id-537'/>
-    <pointer-type-def type-id='type-id-537' size-in-bits='64' id='type-id-620'/>
-    <pointer-type-def type-id='type-id-621' size-in-bits='64' id='type-id-622'/>
-    <typedef-decl name='CK_C_GetFunctionList' type-id='type-id-622' id='type-id-547'/>
-    <typedef-decl name='ck_slot_id_t' type-id='type-id-38' id='type-id-541'/>
-    <pointer-type-def type-id='type-id-541' size-in-bits='64' id='type-id-623'/>
-    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-624'/>
-    <pointer-type-def type-id='type-id-625' size-in-bits='64' id='type-id-626'/>
-    <typedef-decl name='CK_C_GetSlotList' type-id='type-id-626' id='type-id-548'/>
-    <class-decl name='ck_slot_info' size-in-bits='896' is-struct='yes' visibility='default' id='type-id-539'>
+    <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'/>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='slot_description' type-id='type-id-488' visibility='default'/>
+        <var-decl name='slot_description' type-id='type-id-490' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='flags' type-id='type-id-616' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-618' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='hardware_version' type-id='type-id-543' visibility='default'/>
+        <var-decl name='hardware_version' type-id='type-id-545' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='848'>
-        <var-decl name='firmware_version' type-id='type-id-543' visibility='default'/>
+        <var-decl name='firmware_version' type-id='type-id-545' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-539' size-in-bits='64' id='type-id-627'/>
-    <pointer-type-def type-id='type-id-628' size-in-bits='64' id='type-id-629'/>
-    <typedef-decl name='CK_C_GetSlotInfo' type-id='type-id-629' id='type-id-549'/>
-    <class-decl name='ck_token_info' size-in-bits='1664' is-struct='yes' visibility='default' id='type-id-538'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='label' type-id='type-id-273' visibility='default'/>
       </data-member>
@@ -7357,13 +7469,13 @@
         <var-decl name='manufacturer_id' type-id='type-id-273' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='model' type-id='type-id-630' visibility='default'/>
+        <var-decl name='model' type-id='type-id-632' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='serial_number' type-id='type-id-630' visibility='default'/>
+        <var-decl name='serial_number' type-id='type-id-632' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='flags' type-id='type-id-616' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-618' 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'/>
@@ -7396,28 +7508,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-543' visibility='default'/>
+        <var-decl name='hardware_version' type-id='type-id-545' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1488'>
-        <var-decl name='firmware_version' type-id='type-id-543' visibility='default'/>
+        <var-decl name='firmware_version' type-id='type-id-545' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='utc_time' type-id='type-id-630' visibility='default'/>
+        <var-decl name='utc_time' type-id='type-id-632' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='128' id='type-id-630'>
-      <subrange length='16' type-id='type-id-38' id='type-id-94'/>
+    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='128' id='type-id-632'>
+      <subrange length='16' type-id='type-id-38' id='type-id-93'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-538' size-in-bits='64' id='type-id-631'/>
-    <pointer-type-def type-id='type-id-632' size-in-bits='64' id='type-id-633'/>
-    <typedef-decl name='CK_C_GetTokenInfo' type-id='type-id-633' id='type-id-550'/>
-    <typedef-decl name='ck_mechanism_type_t' type-id='type-id-38' id='type-id-634'/>
+    <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'/>
-    <typedef-decl name='CK_C_GetMechanismList' type-id='type-id-637' id='type-id-551'/>
-    <class-decl name='ck_mechanism_info' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-638'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='min_key_size' type-id='type-id-38' visibility='default'/>
       </data-member>
@@ -7425,146 +7537,146 @@
         <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-616' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-618' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-638' size-in-bits='64' id='type-id-639'/>
     <pointer-type-def type-id='type-id-640' size-in-bits='64' id='type-id-641'/>
-    <typedef-decl name='CK_C_GetMechanismInfo' type-id='type-id-641' id='type-id-552'/>
     <pointer-type-def type-id='type-id-642' size-in-bits='64' id='type-id-643'/>
-    <typedef-decl name='CK_C_InitToken' type-id='type-id-643' id='type-id-553'/>
-    <typedef-decl name='ck_session_handle_t' type-id='type-id-38' id='type-id-540'/>
+    <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_InitPIN' type-id='type-id-645' id='type-id-554'/>
+    <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_SetPIN' type-id='type-id-647' id='type-id-555'/>
-    <typedef-decl name='ck_notification_t' type-id='type-id-38' id='type-id-648'/>
-    <pointer-type-def type-id='type-id-649' size-in-bits='64' id='type-id-650'/>
-    <typedef-decl name='ck_notify_t' type-id='type-id-650' id='type-id-651'/>
-    <pointer-type-def type-id='type-id-540' size-in-bits='64' id='type-id-652'/>
-    <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-654'/>
-    <typedef-decl name='CK_C_OpenSession' type-id='type-id-654' id='type-id-556'/>
+    <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-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_CloseSession' type-id='type-id-656' id='type-id-557'/>
+    <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_CloseAllSessions' type-id='type-id-658' id='type-id-558'/>
-    <class-decl name='ck_session_info' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-659'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='slot_id' type-id='type-id-541' visibility='default'/>
+        <var-decl name='slot_id' type-id='type-id-543' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='state' type-id='type-id-660' visibility='default'/>
+        <var-decl name='state' type-id='type-id-662' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='flags' type-id='type-id-616' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-618' 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-660'/>
-    <pointer-type-def type-id='type-id-659' size-in-bits='64' id='type-id-661'/>
-    <pointer-type-def type-id='type-id-662' size-in-bits='64' id='type-id-663'/>
-    <typedef-decl name='CK_C_GetSessionInfo' type-id='type-id-663' id='type-id-559'/>
+    <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_GetOperationState' type-id='type-id-665' id='type-id-560'/>
-    <typedef-decl name='ck_object_handle_t' type-id='type-id-38' id='type-id-535'/>
+    <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_SetOperationState' type-id='type-id-667' id='type-id-561'/>
-    <typedef-decl name='ck_user_type_t' type-id='type-id-38' id='type-id-668'/>
-    <pointer-type-def type-id='type-id-669' size-in-bits='64' id='type-id-670'/>
-    <typedef-decl name='CK_C_Login' type-id='type-id-670' id='type-id-562'/>
-    <typedef-decl name='CK_C_Logout' type-id='type-id-656' id='type-id-563'/>
-    <class-decl name='ck_attribute' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-671'>
+    <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'/>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-672' visibility='default'/>
+        <var-decl name='type' type-id='type-id-674' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='value' type-id='type-id-102' visibility='default'/>
+        <var-decl name='value' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <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-672'/>
-    <pointer-type-def type-id='type-id-671' size-in-bits='64' id='type-id-673'/>
-    <pointer-type-def type-id='type-id-535' size-in-bits='64' id='type-id-674'/>
-    <pointer-type-def type-id='type-id-675' size-in-bits='64' id='type-id-676'/>
-    <typedef-decl name='CK_C_CreateObject' type-id='type-id-676' id='type-id-564'/>
+    <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_CopyObject' type-id='type-id-678' id='type-id-565'/>
+    <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_DestroyObject' type-id='type-id-680' id='type-id-566'/>
+    <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_GetObjectSize' type-id='type-id-682' id='type-id-567'/>
+    <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_GetAttributeValue' type-id='type-id-684' id='type-id-568'/>
-    <typedef-decl name='CK_C_SetAttributeValue' type-id='type-id-684' id='type-id-569'/>
+    <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_FindObjectsInit' type-id='type-id-686' id='type-id-570'/>
+    <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_FindObjects' type-id='type-id-688' id='type-id-571'/>
-    <typedef-decl name='CK_C_FindObjectsFinal' type-id='type-id-656' id='type-id-572'/>
-    <class-decl name='ck_mechanism' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-689'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='mechanism' type-id='type-id-634' visibility='default'/>
+        <var-decl name='mechanism' type-id='type-id-636' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='parameter' type-id='type-id-102' visibility='default'/>
+        <var-decl name='parameter' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='parameter_len' type-id='type-id-38' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-689' size-in-bits='64' id='type-id-690'/>
     <pointer-type-def type-id='type-id-691' size-in-bits='64' id='type-id-692'/>
-    <typedef-decl name='CK_C_EncryptInit' type-id='type-id-692' id='type-id-573'/>
     <pointer-type-def type-id='type-id-693' size-in-bits='64' id='type-id-694'/>
-    <typedef-decl name='CK_C_Encrypt' type-id='type-id-694' id='type-id-574'/>
-    <typedef-decl name='CK_C_EncryptUpdate' type-id='type-id-694' id='type-id-575'/>
-    <typedef-decl name='CK_C_EncryptFinal' type-id='type-id-665' id='type-id-576'/>
-    <typedef-decl name='CK_C_DecryptInit' type-id='type-id-692' id='type-id-577'/>
-    <typedef-decl name='CK_C_Decrypt' type-id='type-id-694' id='type-id-578'/>
-    <typedef-decl name='CK_C_DecryptUpdate' type-id='type-id-694' id='type-id-579'/>
-    <typedef-decl name='CK_C_DecryptFinal' type-id='type-id-665' id='type-id-580'/>
+    <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_DigestInit' type-id='type-id-696' id='type-id-581'/>
-    <typedef-decl name='CK_C_Digest' type-id='type-id-694' id='type-id-582'/>
-    <typedef-decl name='CK_C_DigestUpdate' type-id='type-id-645' id='type-id-583'/>
-    <typedef-decl name='CK_C_DigestKey' type-id='type-id-680' id='type-id-584'/>
-    <typedef-decl name='CK_C_DigestFinal' type-id='type-id-665' id='type-id-585'/>
-    <typedef-decl name='CK_C_SignInit' type-id='type-id-692' id='type-id-586'/>
-    <typedef-decl name='CK_C_Sign' type-id='type-id-694' id='type-id-587'/>
-    <typedef-decl name='CK_C_SignUpdate' type-id='type-id-645' id='type-id-588'/>
-    <typedef-decl name='CK_C_SignFinal' type-id='type-id-665' id='type-id-589'/>
-    <typedef-decl name='CK_C_SignRecoverInit' type-id='type-id-692' id='type-id-590'/>
-    <typedef-decl name='CK_C_SignRecover' type-id='type-id-694' id='type-id-591'/>
-    <typedef-decl name='CK_C_VerifyInit' type-id='type-id-692' id='type-id-592'/>
-    <typedef-decl name='CK_C_Verify' type-id='type-id-647' id='type-id-593'/>
-    <typedef-decl name='CK_C_VerifyUpdate' type-id='type-id-645' id='type-id-594'/>
-    <typedef-decl name='CK_C_VerifyFinal' type-id='type-id-645' id='type-id-595'/>
-    <typedef-decl name='CK_C_VerifyRecoverInit' type-id='type-id-692' id='type-id-596'/>
-    <typedef-decl name='CK_C_VerifyRecover' type-id='type-id-694' id='type-id-597'/>
-    <typedef-decl name='CK_C_DigestEncryptUpdate' type-id='type-id-694' id='type-id-598'/>
-    <typedef-decl name='CK_C_DecryptDigestUpdate' type-id='type-id-694' id='type-id-599'/>
-    <typedef-decl name='CK_C_SignEncryptUpdate' type-id='type-id-694' id='type-id-600'/>
-    <typedef-decl name='CK_C_DecryptVerifyUpdate' type-id='type-id-694' id='type-id-601'/>
+    <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_GenerateKey' type-id='type-id-698' id='type-id-602'/>
+    <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_GenerateKeyPair' type-id='type-id-700' id='type-id-603'/>
+    <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_WrapKey' type-id='type-id-702' id='type-id-604'/>
+    <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_UnwrapKey' type-id='type-id-704' id='type-id-605'/>
+    <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_DeriveKey' type-id='type-id-706' id='type-id-606'/>
-    <typedef-decl name='CK_C_SeedRandom' type-id='type-id-645' id='type-id-607'/>
-    <typedef-decl name='CK_C_GenerateRandom' type-id='type-id-645' id='type-id-608'/>
-    <typedef-decl name='CK_C_GetFunctionStatus' type-id='type-id-656' id='type-id-609'/>
-    <typedef-decl name='CK_C_CancelFunction' type-id='type-id-656' id='type-id-610'/>
+    <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_WaitForSlotEvent' type-id='type-id-708' id='type-id-611'/>
+    <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'/>
     <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-59' name='curve'/>
@@ -7604,13 +7716,13 @@
       <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-709'/>
-    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-710'/>
+    <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'/>
     <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-709' name='curve'/>
-      <parameter type-id='type-id-430' name='digest'/>
-      <parameter type-id='type-id-710' name='paramset'/>
+      <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'/>
@@ -7619,7 +7731,7 @@
     </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-709' name='curve'/>
+      <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'/>
@@ -7671,7 +7783,7 @@
     </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-709' name='curve'/>
+      <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'/>
@@ -7711,241 +7823,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-621'>
-      <parameter type-id='type-id-620'/>
-      <return type-id='type-id-612'/>
+    <function-type size-in-bits='64' id='type-id-623'>
+      <parameter type-id='type-id-622'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-618'>
-      <parameter type-id='type-id-617'/>
-      <return type-id='type-id-612'/>
+    <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-707'>
-      <parameter type-id='type-id-616'/>
-      <parameter type-id='type-id-623'/>
-      <parameter type-id='type-id-102'/>
-      <return type-id='type-id-612'/>
+    <function-type size-in-bits='64' id='type-id-709'>
+      <parameter type-id='type-id-618'/>
+      <parameter type-id='type-id-625'/>
+      <parameter type-id='type-id-101'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-655'>
-      <parameter type-id='type-id-540'/>
-      <return type-id='type-id-612'/>
+    <function-type size-in-bits='64' id='type-id-657'>
+      <parameter type-id='type-id-542'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-685'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-673'/>
+    <function-type size-in-bits='64' id='type-id-687'>
+      <parameter type-id='type-id-542'/>
+      <parameter type-id='type-id-675'/>
       <parameter type-id='type-id-38'/>
-      <return type-id='type-id-612'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-675'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-673'/>
+    <function-type size-in-bits='64' id='type-id-677'>
+      <parameter type-id='type-id-542'/>
+      <parameter type-id='type-id-675'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-674'/>
-      <return type-id='type-id-612'/>
+      <parameter type-id='type-id-676'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-695'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-690'/>
-      <return type-id='type-id-612'/>
+    <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>
-    <function-type size-in-bits='64' id='type-id-699'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-690'/>
-      <parameter type-id='type-id-673'/>
+    <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'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-673'/>
+      <parameter type-id='type-id-675'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-674'/>
-      <parameter type-id='type-id-674'/>
-      <return type-id='type-id-612'/>
+      <parameter type-id='type-id-676'/>
+      <parameter type-id='type-id-676'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-697'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-690'/>
-      <parameter type-id='type-id-673'/>
+    <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'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-674'/>
-      <return type-id='type-id-612'/>
+      <parameter type-id='type-id-676'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-691'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-690'/>
-      <parameter type-id='type-id-535'/>
-      <return type-id='type-id-612'/>
+    <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>
-    <function-type size-in-bits='64' id='type-id-705'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-690'/>
-      <parameter type-id='type-id-535'/>
-      <parameter type-id='type-id-673'/>
+    <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'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-674'/>
-      <return type-id='type-id-612'/>
+      <parameter type-id='type-id-676'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-701'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-690'/>
-      <parameter type-id='type-id-535'/>
-      <parameter type-id='type-id-535'/>
+    <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'/>
       <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-624'/>
-      <return type-id='type-id-612'/>
+      <parameter type-id='type-id-626'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-703'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-690'/>
-      <parameter type-id='type-id-535'/>
+    <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'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-673'/>
+      <parameter type-id='type-id-675'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-674'/>
-      <return type-id='type-id-612'/>
+      <parameter type-id='type-id-676'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-687'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-674'/>
+    <function-type size-in-bits='64' id='type-id-689'>
+      <parameter type-id='type-id-542'/>
+      <parameter type-id='type-id-676'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-624'/>
-      <return type-id='type-id-612'/>
+      <parameter type-id='type-id-626'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-662'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-661'/>
-      <return type-id='type-id-612'/>
+    <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>
-    <function-type size-in-bits='64' id='type-id-649'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-648'/>
-      <parameter type-id='type-id-102'/>
-      <return type-id='type-id-612'/>
+    <function-type size-in-bits='64' id='type-id-651'>
+      <parameter type-id='type-id-542'/>
+      <parameter type-id='type-id-650'/>
+      <parameter type-id='type-id-101'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-679'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-535'/>
-      <return type-id='type-id-612'/>
+    <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>
-    <function-type size-in-bits='64' id='type-id-683'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-535'/>
-      <parameter type-id='type-id-673'/>
+    <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'/>
       <parameter type-id='type-id-38'/>
-      <return type-id='type-id-612'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-677'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-535'/>
-      <parameter type-id='type-id-673'/>
+    <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'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-674'/>
-      <return type-id='type-id-612'/>
+      <parameter type-id='type-id-676'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-681'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-535'/>
-      <parameter type-id='type-id-624'/>
-      <return type-id='type-id-612'/>
+    <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>
-    <function-type size-in-bits='64' id='type-id-669'>
-      <parameter type-id='type-id-540'/>
-      <parameter type-id='type-id-668'/>
+    <function-type size-in-bits='64' id='type-id-671'>
+      <parameter type-id='type-id-542'/>
+      <parameter type-id='type-id-670'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-38'/>
-      <return type-id='type-id-612'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-644'>
-      <parameter type-id='type-id-540'/>
+    <function-type size-in-bits='64' id='type-id-646'>
+      <parameter type-id='type-id-542'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-38'/>
-      <return type-id='type-id-612'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-664'>
-      <parameter type-id='type-id-540'/>
+    <function-type size-in-bits='64' id='type-id-666'>
+      <parameter type-id='type-id-542'/>
       <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-624'/>
-      <return type-id='type-id-612'/>
+      <parameter type-id='type-id-626'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-666'>
-      <parameter type-id='type-id-540'/>
+    <function-type size-in-bits='64' id='type-id-668'>
+      <parameter type-id='type-id-542'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-535'/>
-      <parameter type-id='type-id-535'/>
-      <return type-id='type-id-612'/>
+      <parameter type-id='type-id-537'/>
+      <parameter type-id='type-id-537'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-646'>
-      <parameter type-id='type-id-540'/>
+    <function-type size-in-bits='64' id='type-id-648'>
+      <parameter type-id='type-id-542'/>
       <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-612'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-693'>
-      <parameter type-id='type-id-540'/>
+    <function-type size-in-bits='64' id='type-id-695'>
+      <parameter type-id='type-id-542'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-38'/>
       <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-624'/>
-      <return type-id='type-id-612'/>
+      <parameter type-id='type-id-626'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-657'>
-      <parameter type-id='type-id-541'/>
-      <return type-id='type-id-612'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-636'>
-      <parameter type-id='type-id-541'/>
-      <parameter type-id='type-id-635'/>
-      <parameter type-id='type-id-624'/>
-      <return type-id='type-id-612'/>
+    <function-type size-in-bits='64' id='type-id-659'>
+      <parameter type-id='type-id-543'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-628'>
-      <parameter type-id='type-id-541'/>
-      <parameter type-id='type-id-627'/>
-      <return type-id='type-id-612'/>
+    <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>
-    <function-type size-in-bits='64' id='type-id-632'>
-      <parameter type-id='type-id-541'/>
-      <parameter type-id='type-id-631'/>
-      <return type-id='type-id-612'/>
+    <function-type size-in-bits='64' id='type-id-630'>
+      <parameter type-id='type-id-543'/>
+      <parameter type-id='type-id-629'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-653'>
-      <parameter type-id='type-id-541'/>
-      <parameter type-id='type-id-616'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-651'/>
-      <parameter type-id='type-id-652'/>
-      <return type-id='type-id-612'/>
+    <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>
-    <function-type size-in-bits='64' id='type-id-640'>
-      <parameter type-id='type-id-541'/>
-      <parameter type-id='type-id-634'/>
-      <parameter type-id='type-id-639'/>
-      <return type-id='type-id-612'/>
+    <function-type size-in-bits='64' id='type-id-655'>
+      <parameter type-id='type-id-543'/>
+      <parameter type-id='type-id-618'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-653'/>
+      <parameter type-id='type-id-654'/>
+      <return type-id='type-id-614'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-642'>
-      <parameter type-id='type-id-541'/>
+      <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>
+    <function-type size-in-bits='64' id='type-id-644'>
+      <parameter type-id='type-id-543'/>
       <parameter type-id='type-id-64'/>
       <parameter type-id='type-id-38'/>
       <parameter type-id='type-id-64'/>
-      <return type-id='type-id-612'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-625'>
+    <function-type size-in-bits='64' id='type-id-627'>
       <parameter type-id='type-id-35'/>
-      <parameter type-id='type-id-623'/>
-      <parameter type-id='type-id-624'/>
-      <return type-id='type-id-612'/>
+      <parameter type-id='type-id-625'/>
+      <parameter type-id='type-id-626'/>
+      <return type-id='type-id-614'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-613'>
-      <parameter type-id='type-id-102'/>
-      <return type-id='type-id-612'/>
+    <function-type size-in-bits='64' id='type-id-615'>
+      <parameter type-id='type-id-101'/>
+      <return type-id='type-id-614'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='system/certs.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <class-decl name='gnutls_x509_trust_list_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-711'/>
-    <pointer-type-def type-id='type-id-711' size-in-bits='64' id='type-id-712'/>
-    <typedef-decl name='gnutls_x509_trust_list_t' type-id='type-id-712' id='type-id-713'/>
+  <abi-instr version='1.0' address-size='64' path='system/certs.c' comp-dir-path='/home/nmavrogi/cvs/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-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'/>
     <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-713' name='list'/>
+      <parameter type-id='type-id-715' 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'/>
@@ -7960,7 +8072,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system/threads.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -7971,7 +8083,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system/fastopen.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -8003,7 +8115,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system/sockets.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -8013,17 +8125,17 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='str-iconv.c' comp-dir-path='/home/nmavrogi/cvs/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-102' name='data'/>
-      <parameter type-id='type-id-100' name='size'/>
+      <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-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-102' name='data'/>
-      <parameter type-id='type-id-100' name='size'/>
+      <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-10' name='be'/>
       <return type-id='type-id-22'/>
@@ -8038,25 +8150,33 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <var-decl name='gnutls_time' type-id='type-id-515' visibility='default'/>
-    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-714'/>
-    <pointer-type-def type-id='type-id-715' size-in-bits='64' id='type-id-716'/>
-    <typedef-decl name='gnutls_gettime_func' type-id='type-id-716' id='type-id-717'/>
-    <var-decl name='gnutls_gettime' type-id='type-id-717' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='system.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/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'/>
     <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-717' name='gettime_func'/>
+      <parameter type-id='type-id-719' 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-715'>
-      <parameter type-id='type-id-714'/>
+    <function-type size-in-bits='64' id='type-id-717'>
+      <parameter type-id='type-id-716'/>
       <return type-id='type-id-111'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='str.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='inih/ini.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <function-decl name='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/nmavrogi/cvs/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'/>
@@ -8065,13 +8185,13 @@
     <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-421' name='result_size'/>
+      <parameter type-id='type-id-422' 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-102' name='result'/>
-      <parameter type-id='type-id-421' name='result_size'/>
+      <parameter type-id='type-id-101' name='result'/>
+      <parameter type-id='type-id-422' 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'>
@@ -8081,25 +8201,35 @@
     </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-100' name='hex_size'/>
-      <parameter type-id='type-id-102' name='bin_data'/>
-      <parameter type-id='type-id-421' name='bin_size'/>
+      <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'/>
       <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-102' name='_old'/>
-      <parameter type-id='type-id-100' name='oldlen'/>
+      <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-100' name='buffer_size'/>
+      <parameter type-id='type-id-99' name='buffer_size'/>
       <parameter type-id='type-id-27' name='separator'/>
       <return type-id='type-id-376'/>
     </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'/>
+      <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-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-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-27' name='src'/>
@@ -8107,10 +8237,14 @@
     </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-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <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'/>
+      <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'/>
       <return type-id='type-id-111'/>
@@ -8127,23 +8261,17 @@
     <function-decl name='hex_decode' mangled-name='hex_decode' 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>
     <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'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='sscanf' mangled-name='sscanf' 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'>
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='str-unicode.c' comp-dir-path='/home/nmavrogi/cvs/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-10' name='plen'/>
@@ -8160,13 +8288,13 @@
     <function-decl name='uc_is_property_join_control' mangled-name='uc_is_property_join_control' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='uc_is_property_default_ignorable_code_point' mangled-name='uc_is_property_default_ignorable_code_point' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='uc_is_general_category' mangled-name='uc_is_general_category' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='uc_is_property_not_a_character' mangled-name='uc_is_property_not_a_character' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='uc_is_property_default_ignorable_code_point' mangled-name='uc_is_property_default_ignorable_code_point' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='uc_is_general_category' mangled-name='uc_is_general_category' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='uc_is_property_not_a_character' mangled-name='uc_is_property_not_a_character' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='u32_normalize' mangled-name='u32_normalize' visibility='default' binding='global' size-in-bits='64'>
@@ -8182,7 +8310,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='str-idna.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -8213,7 +8341,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='state.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -8269,14 +8397,14 @@
       <parameter type-id='type-id-413' name='session'/>
       <return type-id='type-id-59'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-718'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-720'>
       <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-718' id='type-id-719'/>
+    <typedef-decl name='gnutls_channel_binding_t' type-id='type-id-720' id='type-id-721'/>
     <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-719' name='cbtype'/>
+      <parameter type-id='type-id-721' name='cbtype'/>
       <parameter type-id='type-id-275' name='cb'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -8306,12 +8434,12 @@
     </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-102' name='ptr'/>
+      <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'/>
-      <return type-id='type-id-102'/>
+      <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'/>
@@ -8347,9 +8475,9 @@
       <parameter type-id='type-id-413' 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-720'/>
+    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-722'/>
     <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-720' name='session'/>
+      <parameter type-id='type-id-722' name='session'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -8375,7 +8503,7 @@
     </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-428' name='target'/>
+      <parameter type-id='type-id-429' 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'>
@@ -8415,10 +8543,10 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <class-decl name='gnutls_certificate_credentials_st' size-in-bits='1344' is-struct='yes' visibility='default' id='type-id-721'>
+  <abi-instr version='1.0' address-size='64' path='cert-cred-x509.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_certificate_credentials_st' size-in-bits='1408' is-struct='yes' visibility='default' id='type-id-723'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='dh_params' type-id='type-id-417' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-418' 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'/>
@@ -8427,19 +8555,19 @@
         <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='params_func' type-id='type-id-432' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-433' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='certs' type-id='type-id-433' visibility='default'/>
+        <var-decl name='certs' type-id='type-id-434' 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-418' visibility='default'/>
+        <var-decl name='sorted_cert_idx' type-id='type-id-419' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='tlist' type-id='type-id-713' visibility='default'/>
+        <var-decl name='tlist' type-id='type-id-715' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
@@ -8454,13 +8582,13 @@
         <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-435' visibility='default'/>
+        <var-decl name='legacy_cert_cb1' type-id='type-id-436' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='legacy_cert_cb2' type-id='type-id-436' visibility='default'/>
+        <var-decl name='legacy_cert_cb2' type-id='type-id-437' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='get_cert_callback3' type-id='type-id-437' visibility='default'/>
+        <var-decl name='get_cert_callback3' type-id='type-id-438' 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'/>
@@ -8469,48 +8597,51 @@
         <var-decl name='pin' type-id='type-id-374' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='pin_tmp' type-id='type-id-438' visibility='default'/>
+        <var-decl name='pin_tmp' type-id='type-id-439' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='glob_ocsp_func_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='glob_ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1344'>
+        <var-decl name='tls13_ok' type-id='type-id-75' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-721' size-in-bits='64' id='type-id-722'/>
-    <typedef-decl name='gnutls_certificate_credentials_t' type-id='type-id-722' id='type-id-723'/>
+    <pointer-type-def type-id='type-id-723' size-in-bits='64' id='type-id-724'/>
+    <typedef-decl name='gnutls_certificate_credentials_t' type-id='type-id-724' id='type-id-725'/>
     <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-723' name='cred'/>
+      <parameter type-id='type-id-725' name='cred'/>
       <parameter type-id='type-id-375' name='fn'/>
-      <parameter type-id='type-id-102' name='userdata'/>
+      <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-723' name='sc'/>
+      <parameter type-id='type-id-725' 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-723' name='res'/>
+      <parameter type-id='type-id-725' name='res'/>
       <parameter type-id='type-id-57' name='p12blob'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-421' 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-723' name='res'/>
+      <parameter type-id='type-id-725' name='res'/>
       <parameter type-id='type-id-27' name='pkcs12file'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-421' 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-723' name='res'/>
+      <parameter type-id='type-id-725' name='res'/>
       <parameter type-id='type-id-27' name='crlfile'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-421' 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-724'>
+    <class-decl name='gnutls_x509_crl_int' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-726'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='crl' type-id='type-id-387' visibility='default'/>
       </data-member>
@@ -8533,111 +8664,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-724' size-in-bits='64' id='type-id-725'/>
-    <typedef-decl name='gnutls_x509_crl_t' type-id='type-id-725' id='type-id-726'/>
     <pointer-type-def type-id='type-id-726' size-in-bits='64' id='type-id-727'/>
+    <typedef-decl name='gnutls_x509_crl_t' type-id='type-id-727' id='type-id-728'/>
+    <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-729'/>
     <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-723' name='res'/>
-      <parameter type-id='type-id-727' name='crl_list'/>
+      <parameter type-id='type-id-725' name='res'/>
+      <parameter type-id='type-id-729' 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-723' name='res'/>
+      <parameter type-id='type-id-725' name='res'/>
       <parameter type-id='type-id-57' name='CRL'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-421' 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-723' name='cred'/>
+      <parameter type-id='type-id-725' 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-723' name='cred'/>
+      <parameter type-id='type-id-725' name='cred'/>
       <parameter type-id='type-id-27' name='ca_dir'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-421' 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-723' name='cred'/>
+      <parameter type-id='type-id-725' name='cred'/>
       <parameter type-id='type-id-27' name='ca_dir'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-421' 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-723' name='res'/>
-      <parameter type-id='type-id-456' name='ca_list'/>
+      <parameter type-id='type-id-725' name='res'/>
+      <parameter type-id='type-id-458' 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-723' name='res'/>
+      <parameter type-id='type-id-725' name='res'/>
       <parameter type-id='type-id-57' name='ca'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-421' 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-723' name='res'/>
+      <parameter type-id='type-id-725' name='res'/>
       <parameter type-id='type-id-27' name='certfile'/>
       <parameter type-id='type-id-27' name='keyfile'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-421' name='type'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-728'/>
+    <pointer-type-def type-id='type-id-715' size-in-bits='64' id='type-id-730'/>
     <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-723' name='res'/>
-      <parameter type-id='type-id-728' name='tlist'/>
+      <parameter type-id='type-id-725' name='res'/>
+      <parameter type-id='type-id-730' 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-723' name='res'/>
-      <parameter type-id='type-id-713' name='tlist'/>
+      <parameter type-id='type-id-725' name='res'/>
+      <parameter type-id='type-id-715' 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-456' size-in-bits='64' id='type-id-729'/>
+    <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-731'/>
     <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-723' name='res'/>
+      <parameter type-id='type-id-725' name='res'/>
       <parameter type-id='type-id-10' name='index'/>
-      <parameter type-id='type-id-729' name='crt_list'/>
-      <parameter type-id='type-id-418' name='crt_list_size'/>
+      <parameter type-id='type-id-731' name='crt_list'/>
+      <parameter type-id='type-id-419' 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-730'/>
+    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-732'/>
     <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-723' name='res'/>
+      <parameter type-id='type-id-725' name='res'/>
       <parameter type-id='type-id-10' name='index'/>
-      <parameter type-id='type-id-730' name='key'/>
+      <parameter type-id='type-id-732' 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-723' name='res'/>
-      <parameter type-id='type-id-456' name='cert_list'/>
+      <parameter type-id='type-id-725' name='res'/>
+      <parameter type-id='type-id-458' name='cert_list'/>
       <parameter type-id='type-id-22' name='cert_list_size'/>
       <parameter type-id='type-id-383' 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-723' name='res'/>
+      <parameter type-id='type-id-725' name='res'/>
       <parameter type-id='type-id-57' name='cert'/>
       <parameter type-id='type-id-57' name='key'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-421' 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-723' name='res'/>
+      <parameter type-id='type-id-725' name='res'/>
       <parameter type-id='type-id-57' name='cert'/>
       <parameter type-id='type-id-57' name='key'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-421' 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-723' name='res'/>
+      <parameter type-id='type-id-725' name='res'/>
       <parameter type-id='type-id-27' name='certfile'/>
       <parameter type-id='type-id-27' name='keyfile'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-421' name='type'/>
       <parameter type-id='type-id-27' name='pass'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
@@ -8733,35 +8864,35 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='file.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='supplemental.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <class-decl name='gnutls_supplemental_entry_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-295'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='type' type-id='type-id-731' visibility='default'/>
+        <var-decl name='type' type-id='type-id-733' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='supp_recv_func' type-id='type-id-732' visibility='default'/>
+        <var-decl name='supp_recv_func' type-id='type-id-734' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='supp_send_func' type-id='type-id-733' visibility='default'/>
+        <var-decl name='supp_send_func' type-id='type-id-735' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-734'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-736'>
       <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-734' id='type-id-731'/>
-    <typedef-decl name='gnutls_supp_recv_func' type-id='type-id-348' id='type-id-732'/>
-    <typedef-decl name='gnutls_supp_send_func' type-id='type-id-352' id='type-id-733'/>
+    <typedef-decl name='gnutls_supplemental_data_format_type_t' type-id='type-id-736' id='type-id-733'/>
+    <typedef-decl name='gnutls_supp_recv_func' type-id='type-id-348' id='type-id-734'/>
+    <typedef-decl name='gnutls_supp_send_func' type-id='type-id-352' id='type-id-735'/>
     <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-10' name='do_send_supplemental'/>
@@ -8775,39 +8906,39 @@
     <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-27' name='name'/>
-      <parameter type-id='type-id-731' name='type'/>
-      <parameter type-id='type-id-732' name='recv_func'/>
-      <parameter type-id='type-id-733' name='send_func'/>
+      <parameter type-id='type-id-733' name='type'/>
+      <parameter type-id='type-id-734' name='recv_func'/>
+      <parameter type-id='type-id-735' 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-731' name='type'/>
-      <parameter type-id='type-id-732' name='recv_func'/>
-      <parameter type-id='type-id-733' name='send_func'/>
+      <parameter type-id='type-id-733' name='type'/>
+      <parameter type-id='type-id-734' name='recv_func'/>
+      <parameter type-id='type-id-735' 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-731' name='type'/>
+      <parameter type-id='type-id-733' 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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='random.c' comp-dir-path='/home/nmavrogi/cvs/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-735'>
+    <enum-decl name='gnutls_rnd_level' id='type-id-737'>
       <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-735' id='type-id-736'/>
+    <typedef-decl name='gnutls_rnd_level_t' type-id='type-id-737' id='type-id-738'/>
     <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-736' name='level'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-100' name='len'/>
+      <parameter type-id='type-id-738' name='level'/>
+      <parameter type-id='type-id-101' name='data'/>
+      <parameter type-id='type-id-99' name='len'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_rnd_system_entropy_deinit' mangled-name='_rnd_system_entropy_deinit' visibility='default' binding='global' size-in-bits='64'>
@@ -8817,55 +8948,79 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-737'/>
-    <typedef-decl name='gnutls_aead_cipher_hd_t' type-id='type-id-737' id='type-id-738'/>
+  <abi-instr version='1.0' address-size='64' path='crypto-api.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-739'/>
+    <typedef-decl name='gnutls_aead_cipher_hd_t' type-id='type-id-739' id='type-id-740'/>
     <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-738' name='handle'/>
+      <parameter type-id='type-id-740' 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-740' 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-22' name='auth_iovcnt'/>
+      <parameter type-id='type-id-249' 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-740' 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-22' name='auth_iovcnt'/>
+      <parameter type-id='type-id-249' 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'/>
+      <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-738' name='handle'/>
-      <parameter type-id='type-id-102' name='nonce'/>
-      <parameter type-id='type-id-100' name='nonce_len'/>
+      <parameter type-id='type-id-740' 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-22' name='auth_iovcnt'/>
-      <parameter type-id='type-id-100' name='tag_size'/>
+      <parameter type-id='type-id-99' name='tag_size'/>
       <parameter type-id='type-id-249' name='iov'/>
       <parameter type-id='type-id-22' name='iovcnt'/>
-      <parameter type-id='type-id-102' name='ctext'/>
-      <parameter type-id='type-id-421' name='ctext_len'/>
+      <parameter type-id='type-id-101' name='ctext'/>
+      <parameter type-id='type-id-422' 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-738' name='handle'/>
-      <parameter type-id='type-id-102' name='nonce'/>
-      <parameter type-id='type-id-100' name='nonce_len'/>
-      <parameter type-id='type-id-102' name='auth'/>
-      <parameter type-id='type-id-100' name='auth_len'/>
-      <parameter type-id='type-id-100' name='tag_size'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
-      <parameter type-id='type-id-102' name='ctext'/>
-      <parameter type-id='type-id-421' name='ctext_len'/>
+      <parameter type-id='type-id-740' 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'/>
+      <parameter type-id='type-id-99' name='auth_len'/>
+      <parameter type-id='type-id-99' name='tag_size'/>
+      <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'/>
       <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-738' name='handle'/>
-      <parameter type-id='type-id-102' name='nonce'/>
-      <parameter type-id='type-id-100' name='nonce_len'/>
-      <parameter type-id='type-id-102' name='auth'/>
-      <parameter type-id='type-id-100' name='auth_len'/>
-      <parameter type-id='type-id-100' name='tag_size'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
-      <parameter type-id='type-id-102' name='ctext'/>
-      <parameter type-id='type-id-421' name='ctext_len'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <pointer-type-def type-id='type-id-738' size-in-bits='64' id='type-id-739'/>
+      <parameter type-id='type-id-740' 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'/>
+      <parameter type-id='type-id-99' name='auth_len'/>
+      <parameter type-id='type-id-99' name='tag_size'/>
+      <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'/>
+      <return type-id='type-id-22'/>
+    </function-decl>
+    <pointer-type-def type-id='type-id-740' size-in-bits='64' id='type-id-741'/>
     <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-739' name='handle'/>
+      <parameter type-id='type-id-741' name='handle'/>
       <parameter type-id='type-id-29' name='cipher'/>
       <parameter type-id='type-id-57' name='key'/>
       <return type-id='type-id-22'/>
@@ -8875,173 +9030,195 @@
       <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-742'/>
+    <pointer-type-def type-id='type-id-742' size-in-bits='64' id='type-id-743'/>
+    <typedef-decl name='gnutls_hash_hd_t' type-id='type-id-743' id='type-id-744'/>
+    <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-744' name='handle'/>
+      <return type-id='type-id-744'/>
+    </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-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
-      <parameter type-id='type-id-102' name='digest'/>
+      <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_get_len' mangled-name='gnutls_hash_get_len' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hash_get_len@@GNUTLS_3_4'>
-      <parameter type-id='type-id-211' name='algorithm'/>
-      <return type-id='type-id-10'/>
-    </function-decl>
-    <class-decl name='hash_hd_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-740'/>
-    <pointer-type-def type-id='type-id-740' size-in-bits='64' id='type-id-741'/>
-    <typedef-decl name='gnutls_hash_hd_t' type-id='type-id-741' id='type-id-742'/>
     <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-742' name='handle'/>
-      <parameter type-id='type-id-102' name='digest'/>
+      <parameter type-id='type-id-744' 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-742' name='handle'/>
-      <parameter type-id='type-id-102' name='digest'/>
+      <parameter type-id='type-id-744' 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-742' name='handle'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
+      <parameter type-id='type-id-744' 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-742' size-in-bits='64' id='type-id-743'/>
+    <pointer-type-def type-id='type-id-744' size-in-bits='64' id='type-id-745'/>
     <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-743' name='dig'/>
+      <parameter type-id='type-id-745' name='dig'/>
       <parameter type-id='type-id-211' 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-746'/>
+    <pointer-type-def type-id='type-id-746' size-in-bits='64' id='type-id-747'/>
+    <typedef-decl name='gnutls_hmac_hd_t' type-id='type-id-747' id='type-id-748'/>
+    <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-748' name='handle'/>
+      <return type-id='type-id-748'/>
+    </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'/>
-      <parameter type-id='type-id-102' name='key'/>
-      <parameter type-id='type-id-100' name='keylen'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
-      <parameter type-id='type-id-102' name='digest'/>
+      <parameter type-id='type-id-101' name='key'/>
+      <parameter type-id='type-id-99' name='keylen'/>
+      <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_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>
-    <class-decl name='hmac_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_hmac_hd_t' type-id='type-id-745' id='type-id-746'/>
     <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-746' name='handle'/>
-      <parameter type-id='type-id-102' name='digest'/>
+      <parameter type-id='type-id-748' 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-746' name='handle'/>
-      <parameter type-id='type-id-102' name='digest'/>
+      <parameter type-id='type-id-748' 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-746' name='handle'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
+      <parameter type-id='type-id-748' 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-746' name='handle'/>
-      <parameter type-id='type-id-102' name='nonce'/>
-      <parameter type-id='type-id-100' name='nonce_len'/>
+      <parameter type-id='type-id-748' 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-746' size-in-bits='64' id='type-id-747'/>
+    <pointer-type-def type-id='type-id-748' size-in-bits='64' id='type-id-749'/>
     <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-747' name='dig'/>
+      <parameter type-id='type-id-749' name='dig'/>
       <parameter type-id='type-id-31' name='algorithm'/>
-      <parameter type-id='type-id-102' name='key'/>
-      <parameter type-id='type-id-100' name='keylen'/>
+      <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='1280' is-struct='yes' visibility='default' id='type-id-748'>
+    <class-decl name='api_cipher_hd_st' size-in-bits='1408' is-struct='yes' visibility='default' id='type-id-750'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ctx_enc' type-id='type-id-98' visibility='default'/>
+        <var-decl name='ctx_enc' type-id='type-id-97' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='ctx_dec' type-id='type-id-98' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='ctx_dec' type-id='type-id-97' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-748' size-in-bits='64' id='type-id-749'/>
-    <typedef-decl name='gnutls_cipher_hd_t' type-id='type-id-749' id='type-id-750'/>
+    <pointer-type-def type-id='type-id-750' size-in-bits='64' id='type-id-751'/>
+    <typedef-decl name='gnutls_cipher_hd_t' type-id='type-id-751' id='type-id-752'/>
     <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-750' name='handle'/>
+      <parameter type-id='type-id-752' 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-750' name='handle'/>
-      <parameter type-id='type-id-102' name='ctext'/>
-      <parameter type-id='type-id-100' name='ctext_len'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
+      <parameter type-id='type-id-752' 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'/>
+      <parameter type-id='type-id-99' name='ptext_len'/>
       <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-750' name='handle'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
-      <parameter type-id='type-id-102' name='ctext'/>
-      <parameter type-id='type-id-100' name='ctext_len'/>
+      <parameter type-id='type-id-752' 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'/>
+      <parameter type-id='type-id-99' name='ctext_len'/>
       <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-750' name='handle'/>
-      <parameter type-id='type-id-102' name='ctext'/>
-      <parameter type-id='type-id-100' name='ctext_len'/>
+      <parameter type-id='type-id-752' 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-750' name='handle'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
+      <parameter type-id='type-id-752' 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-752' 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-750' name='handle'/>
-      <parameter type-id='type-id-102' name='iv'/>
-      <parameter type-id='type-id-100' name='ivlen'/>
+      <parameter type-id='type-id-752' 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-750' name='handle'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_size'/>
+      <parameter type-id='type-id-752' 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-750' name='handle'/>
-      <parameter type-id='type-id-102' name='tag'/>
-      <parameter type-id='type-id-100' name='tag_size'/>
+      <parameter type-id='type-id-752' 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-750' size-in-bits='64' id='type-id-751'/>
+    <pointer-type-def type-id='type-id-752' size-in-bits='64' id='type-id-753'/>
     <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-751' name='handle'/>
+      <parameter type-id='type-id-753' 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
+    <function-decl name='_gnutls_iov_iter_init' mangled-name='_gnutls_iov_iter_init' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_iov_iter_next' mangled-name='_gnutls_iov_iter_next' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_iov_iter_sync' mangled-name='_gnutls_iov_iter_sync' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_hash_copy' mangled-name='_gnutls_hash_copy' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_mac_fast' mangled-name='_gnutls_mac_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='privkey.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-752'/>
-    <typedef-decl name='gnutls_x509_spki_t' type-id='type-id-752' id='type-id-753'/>
-    <qualified-type-def type-id='type-id-753' const='yes' id='type-id-754'/>
+  <abi-instr version='1.0' address-size='64' path='privkey.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-754'/>
+    <typedef-decl name='gnutls_x509_spki_t' type-id='type-id-754' id='type-id-755'/>
+    <qualified-type-def type-id='type-id-755' const='yes' id='type-id-756'/>
     <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-754' name='spki'/>
+      <parameter type-id='type-id-756' 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-753' name='spki'/>
+      <parameter type-id='type-id-755' name='spki'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -9061,7 +9238,7 @@
     <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-102' name='userdata'/>
+      <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'>
@@ -9073,7 +9250,7 @@
     <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-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
@@ -9083,7 +9260,7 @@
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='ciphertext'/>
       <parameter type-id='type-id-64' name='plaintext'/>
-      <parameter type-id='type-id-100' name='plaintext_size'/>
+      <parameter type-id='type-id-99' name='plaintext_size'/>
       <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'>
@@ -9134,7 +9311,7 @@
     </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-730' name='key'/>
+      <parameter type-id='type-id-732' 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'>
@@ -9145,7 +9322,7 @@
     </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-102' name='userdata'/>
+      <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'/>
@@ -9156,7 +9333,7 @@
     </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-102' name='userdata'/>
+      <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'/>
@@ -9167,7 +9344,7 @@
     <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-60' name='pk'/>
-      <parameter type-id='type-id-102' name='userdata'/>
+      <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'/>
@@ -9177,16 +9354,16 @@
     <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-60' name='pk'/>
-      <parameter type-id='type-id-102' name='userdata'/>
+      <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-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-755'/>
+    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-757'/>
     <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-755' name='key'/>
+      <parameter type-id='type-id-757' 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'>
@@ -9194,21 +9371,21 @@
       <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-483' name='key'/>
+      <parameter type-id='type-id-485' 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-102' name='seed'/>
-      <parameter type-id='type-id-100' name='seed_size'/>
+      <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-430' name='digest'/>
-      <parameter type-id='type-id-102' name='seed'/>
-      <parameter type-id='type-id-421' name='seed_size'/>
+      <parameter type-id='type-id-431' name='digest'/>
+      <parameter type-id='type-id-101' name='seed'/>
+      <parameter type-id='type-id-422' 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'>
@@ -9217,7 +9394,7 @@
     </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-418' name='bits'/>
+      <parameter type-id='type-id-419' 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'>
@@ -9226,9 +9403,9 @@
       <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-756' visibility='default' id='type-id-757'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-758' visibility='default' id='type-id-759'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-758' visibility='default'/>
+        <var-decl name='type' type-id='type-id-760' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data' type-id='type-id-64' visibility='default'/>
@@ -9237,22 +9414,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-759'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-761'>
       <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-759' id='type-id-758'/>
-    <typedef-decl name='gnutls_keygen_data_st' type-id='type-id-757' id='type-id-756'/>
-    <qualified-type-def type-id='type-id-756' const='yes' id='type-id-760'/>
-    <pointer-type-def type-id='type-id-760' size-in-bits='64' id='type-id-761'/>
+    <typedef-decl name='gnutls_keygen_types_t' type-id='type-id-761' id='type-id-760'/>
+    <typedef-decl name='gnutls_keygen_data_st' type-id='type-id-759' id='type-id-758'/>
+    <qualified-type-def type-id='type-id-758' const='yes' id='type-id-762'/>
+    <pointer-type-def type-id='type-id-762' size-in-bits='64' id='type-id-763'/>
     <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-60' name='algo'/>
       <parameter type-id='type-id-10' name='bits'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-761' name='data'/>
+      <parameter type-id='type-id-763' name='data'/>
       <parameter type-id='type-id-10' name='data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -9304,6 +9481,9 @@
     <function-decl name='_gnutls_pkcs11_privkey_sign' mangled-name='_gnutls_pkcs11_privkey_sign' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='pk_prepare_hash' mangled-name='pk_prepare_hash' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_pk_to_sign_entry' mangled-name='_gnutls_pk_to_sign_entry' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -9352,21 +9532,18 @@
     <function-decl name='gnutls_x509_privkey_generate2' mangled-name='gnutls_x509_privkey_generate2' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='pk_prepare_hash' mangled-name='pk_prepare_hash' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
     <function-decl name='pk_hash_data' mangled-name='pk_hash_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='pcert.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pcert.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <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-456' name='crt'/>
+      <parameter type-id='type-id-458' 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'>
@@ -9378,45 +9555,45 @@
     <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-57' name='cert'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-418' name='pcert_list_size'/>
+      <parameter type-id='type-id-419' name='pcert_list_size'/>
       <parameter type-id='type-id-27' name='file'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-375' name='pin_fn'/>
-      <parameter type-id='type-id-102' name='pin_fn_userdata'/>
+      <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-418' name='pcert_list_size'/>
+      <parameter type-id='type-id-419' name='pcert_list_size'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-456' name='crt'/>
-      <parameter type-id='type-id-418' name='ncrt'/>
+      <parameter type-id='type-id-458' name='crt'/>
+      <parameter type-id='type-id-419' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' 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-57' name='rawpubkey'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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'/>
@@ -9427,6 +9604,9 @@
     <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'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='gnutls_load_file' mangled-name='gnutls_load_file' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </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'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -9452,16 +9632,16 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pubkey.c' comp-dir-path='/home/nmavrogi/cvs/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-754' name='spki'/>
+      <parameter type-id='type-id-756' 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-753' name='spki'/>
+      <parameter type-id='type-id-755' name='spki'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -9472,14 +9652,14 @@
     <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-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-102' name='userdata'/>
+      <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'>
@@ -9552,34 +9732,34 @@
       <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-762'>
+    <class-decl name='gnutls_x509_crq_int' size-in-bits='64' is-struct='yes' visibility='default' id='type-id-764'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='crq' type-id='type-id-387' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-762' size-in-bits='64' id='type-id-763'/>
-    <typedef-decl name='gnutls_x509_crq_t' type-id='type-id-763' id='type-id-764'/>
+    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-765'/>
+    <typedef-decl name='gnutls_x509_crq_t' type-id='type-id-765' id='type-id-766'/>
     <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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-267' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-267' 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-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-709' name='curve'/>
-      <parameter type-id='type-id-430' name='digest'/>
-      <parameter type-id='type-id-710' name='paramset'/>
+      <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-10' name='flags'/>
@@ -9593,7 +9773,7 @@
     </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-709' name='curve'/>
+      <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-10' name='flags'/>
@@ -9601,7 +9781,7 @@
     </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-709' name='curve'/>
+      <parameter type-id='type-id-711' name='curve'/>
       <parameter type-id='type-id-275' name='x'/>
       <parameter type-id='type-id-275' name='y'/>
       <return type-id='type-id-22'/>
@@ -9640,40 +9820,40 @@
       <parameter type-id='type-id-267' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-422' 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-420' name='format'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-275' 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-420' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-765'>
+    <class-decl name='gnutls_pkcs11_obj_st' size-in-bits='1152' is-struct='yes' visibility='default' id='type-id-767'>
       <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-766' visibility='default'/>
+        <var-decl name='type' type-id='type-id-768' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='class' type-id='type-id-767' visibility='default'/>
+        <var-decl name='class' type-id='type-id-769' 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-533' visibility='default'/>
+        <var-decl name='info' type-id='type-id-535' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='pubkey' type-id='type-id-768' visibility='default'/>
+        <var-decl name='pubkey' type-id='type-id-770' 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'/>
@@ -9688,7 +9868,7 @@
         <var-decl name='pin' type-id='type-id-374' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-769'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-771'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_X509_CRT' value='1'/>
@@ -9698,25 +9878,25 @@
       <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-769' id='type-id-766'/>
-    <typedef-decl name='ck_object_class_t' type-id='type-id-38' id='type-id-767'/>
+    <typedef-decl name='gnutls_pkcs11_obj_type_t' type-id='type-id-771' id='type-id-768'/>
+    <typedef-decl name='ck_object_class_t' type-id='type-id-38' id='type-id-769'/>
 
-    <array-type-def dimensions='1' type-id='type-id-62' size-in-bits='512' id='type-id-768'>
+    <array-type-def dimensions='1' type-id='type-id-62' size-in-bits='512' id='type-id-770'>
       <subrange length='4' type-id='type-id-38' id='type-id-136'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-765' size-in-bits='64' id='type-id-770'/>
-    <typedef-decl name='gnutls_pkcs11_obj_t' type-id='type-id-770' id='type-id-771'/>
+    <pointer-type-def type-id='type-id-767' size-in-bits='64' id='type-id-772'/>
+    <typedef-decl name='gnutls_pkcs11_obj_t' type-id='type-id-772' id='type-id-773'/>
     <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-771' name='obj'/>
+      <parameter type-id='type-id-773' 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-430' name='hash'/>
-      <parameter type-id='type-id-418' name='mand'/>
+      <parameter type-id='type-id-431' name='hash'/>
+      <parameter type-id='type-id-419' 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'>
@@ -9728,13 +9908,13 @@
     </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-764' name='crq'/>
+      <parameter type-id='type-id-766' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -9742,33 +9922,36 @@
       <parameter type-id='type-id-267' 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-772'/>
+    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-774'/>
     <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-772' name='key'/>
+      <parameter type-id='type-id-774' 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-418' name='usage'/>
+      <parameter type-id='type-id-419' 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-418' name='usage'/>
+      <parameter type-id='type-id-419' 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'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='encode_ber_digest_info' mangled-name='encode_ber_digest_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
     <function-decl name='_gnutls_sign_is_secure2' mangled-name='_gnutls_sign_is_secure2' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_is_broken_sig_allowed' mangled-name='_gnutls_is_broken_sig_allowed' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='encode_ber_digest_info' mangled-name='encode_ber_digest_info' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gost_digest' mangled-name='_gnutls_gost_digest' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_digest_gost' mangled-name='_gnutls_digest_gost' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -9817,9 +10000,6 @@
     <function-decl name='_gnutls_get_asn_mpis' mangled-name='_gnutls_get_asn_mpis' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_gost_digest' mangled-name='_gnutls_gost_digest' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
     <function-decl name='_gnutls_x509_write_ecc_pubkey' mangled-name='_gnutls_x509_write_ecc_pubkey' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -9872,33 +10052,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-774'/>
-    <typedef-decl name='mutex_init_func' type-id='type-id-774' id='type-id-775'/>
-    <typedef-decl name='mutex_deinit_func' type-id='type-id-774' id='type-id-776'/>
-    <typedef-decl name='mutex_lock_func' type-id='type-id-774' id='type-id-777'/>
-    <typedef-decl name='mutex_unlock_func' type-id='type-id-774' id='type-id-778'/>
+  <abi-instr version='1.0' address-size='64' path='locks.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-776'/>
+    <typedef-decl name='mutex_init_func' type-id='type-id-776' id='type-id-777'/>
+    <typedef-decl name='mutex_deinit_func' type-id='type-id-776' id='type-id-778'/>
+    <typedef-decl name='mutex_lock_func' type-id='type-id-776' id='type-id-779'/>
+    <typedef-decl name='mutex_unlock_func' type-id='type-id-776' id='type-id-780'/>
     <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-775' name='init'/>
-      <parameter type-id='type-id-776' name='deinit'/>
-      <parameter type-id='type-id-777' name='lock'/>
-      <parameter type-id='type-id-778' name='unlock'/>
+      <parameter type-id='type-id-777' name='init'/>
+      <parameter type-id='type-id-778' name='deinit'/>
+      <parameter type-id='type-id-779' name='lock'/>
+      <parameter type-id='type-id-780' 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-773'>
-      <parameter type-id='type-id-429'/>
+    <function-type size-in-bits='64' id='type-id-775'>
+      <parameter type-id='type-id-430'/>
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dtls.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <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-779' visibility='default' id='type-id-780'>
+    <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-781' visibility='default' id='type-id-782'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='record_seq' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -9909,27 +10089,27 @@
         <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-780' id='type-id-779'/>
-    <pointer-type-def type-id='type-id-779' size-in-bits='64' id='type-id-781'/>
+    <typedef-decl name='gnutls_dtls_prestate_st' type-id='type-id-782' id='type-id-781'/>
+    <pointer-type-def type-id='type-id-781' size-in-bits='64' id='type-id-783'/>
     <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-781' name='prestate'/>
+      <parameter type-id='type-id-783' 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-102' name='client_data'/>
-      <parameter type-id='type-id-100' name='client_data_size'/>
-      <parameter type-id='type-id-102' name='_msg'/>
-      <parameter type-id='type-id-100' name='msg_size'/>
-      <parameter type-id='type-id-781' name='prestate'/>
+      <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-783' 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-102' name='client_data'/>
-      <parameter type-id='type-id-100' name='client_data_size'/>
-      <parameter type-id='type-id-781' name='prestate'/>
+      <parameter type-id='type-id-101' name='client_data'/>
+      <parameter type-id='type-id-99' name='client_data_size'/>
+      <parameter type-id='type-id-783' 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'/>
@@ -9953,7 +10133,7 @@
     </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'/>
-      <return type-id='type-id-100'/>
+      <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'/>
@@ -9961,7 +10141,7 @@
       <parameter type-id='type-id-31' name='mac'/>
       <parameter type-id='type-id-367' name='comp'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-100'/>
+      <return type-id='type-id-99'/>
     </function-decl>
     <function-decl name='_gnutls_record_overhead' mangled-name='_gnutls_record_overhead' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_record_overhead@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-23' name='ver'/>
@@ -9988,7 +10168,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system_override.c' comp-dir-path='/home/nmavrogi/cvs/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-153' name='errno_func'/>
@@ -10020,160 +10200,160 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crypto-backend.c' comp-dir-path='/home/nmavrogi/cvs/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-782' size-in-bits='64' id='type-id-783'/>
-    <typedef-decl name='gnutls_digest_init_func' type-id='type-id-783' id='type-id-784'/>
-    <typedef-decl name='gnutls_digest_hash_func' type-id='type-id-117' id='type-id-785'/>
-    <typedef-decl name='gnutls_digest_output_func' type-id='type-id-117' id='type-id-786'/>
-    <typedef-decl name='gnutls_digest_deinit_func' type-id='type-id-121' id='type-id-787'/>
-    <pointer-type-def type-id='type-id-788' size-in-bits='64' id='type-id-789'/>
-    <typedef-decl name='gnutls_digest_fast_func' type-id='type-id-789' id='type-id-790'/>
+    <pointer-type-def type-id='type-id-784' size-in-bits='64' id='type-id-785'/>
+    <typedef-decl name='gnutls_digest_init_func' type-id='type-id-785' id='type-id-786'/>
+    <typedef-decl name='gnutls_digest_hash_func' type-id='type-id-117' id='type-id-787'/>
+    <typedef-decl name='gnutls_digest_output_func' type-id='type-id-117' id='type-id-788'/>
+    <typedef-decl name='gnutls_digest_deinit_func' type-id='type-id-121' id='type-id-789'/>
+    <pointer-type-def type-id='type-id-790' size-in-bits='64' id='type-id-791'/>
+    <typedef-decl name='gnutls_digest_fast_func' type-id='type-id-791' id='type-id-792'/>
     <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-22' name='priority'/>
-      <parameter type-id='type-id-784' name='init'/>
-      <parameter type-id='type-id-785' name='hash'/>
-      <parameter type-id='type-id-786' name='output'/>
-      <parameter type-id='type-id-787' name='deinit'/>
-      <parameter type-id='type-id-790' name='hash_fast'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <pointer-type-def type-id='type-id-791' size-in-bits='64' id='type-id-792'/>
-    <typedef-decl name='gnutls_mac_init_func' type-id='type-id-792' id='type-id-793'/>
-    <typedef-decl name='gnutls_mac_setkey_func' type-id='type-id-117' id='type-id-794'/>
-    <typedef-decl name='gnutls_mac_setnonce_func' type-id='type-id-117' id='type-id-795'/>
-    <typedef-decl name='gnutls_mac_hash_func' type-id='type-id-117' id='type-id-796'/>
-    <typedef-decl name='gnutls_mac_output_func' type-id='type-id-117' id='type-id-797'/>
-    <typedef-decl name='gnutls_mac_deinit_func' type-id='type-id-121' id='type-id-798'/>
-    <pointer-type-def type-id='type-id-799' size-in-bits='64' id='type-id-800'/>
-    <typedef-decl name='gnutls_mac_fast_func' type-id='type-id-800' id='type-id-801'/>
+      <parameter type-id='type-id-786' name='init'/>
+      <parameter type-id='type-id-787' name='hash'/>
+      <parameter type-id='type-id-788' name='output'/>
+      <parameter type-id='type-id-789' name='deinit'/>
+      <parameter type-id='type-id-792' name='hash_fast'/>
+      <return type-id='type-id-22'/>
+    </function-decl>
+    <pointer-type-def type-id='type-id-793' size-in-bits='64' id='type-id-794'/>
+    <typedef-decl name='gnutls_mac_init_func' type-id='type-id-794' id='type-id-795'/>
+    <typedef-decl name='gnutls_mac_setkey_func' type-id='type-id-117' id='type-id-796'/>
+    <typedef-decl name='gnutls_mac_setnonce_func' type-id='type-id-117' id='type-id-797'/>
+    <typedef-decl name='gnutls_mac_hash_func' type-id='type-id-117' id='type-id-798'/>
+    <typedef-decl name='gnutls_mac_output_func' type-id='type-id-117' id='type-id-799'/>
+    <typedef-decl name='gnutls_mac_deinit_func' type-id='type-id-121' id='type-id-800'/>
+    <pointer-type-def type-id='type-id-801' size-in-bits='64' id='type-id-802'/>
+    <typedef-decl name='gnutls_mac_fast_func' type-id='type-id-802' id='type-id-803'/>
     <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-793' name='init'/>
-      <parameter type-id='type-id-794' name='setkey'/>
-      <parameter type-id='type-id-795' name='setnonce'/>
-      <parameter type-id='type-id-796' name='hash'/>
-      <parameter type-id='type-id-797' name='output'/>
-      <parameter type-id='type-id-798' name='deinit'/>
-      <parameter type-id='type-id-801' name='hash_fast'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <pointer-type-def type-id='type-id-802' size-in-bits='64' id='type-id-803'/>
-    <typedef-decl name='gnutls_cipher_init_func' type-id='type-id-803' id='type-id-804'/>
-    <typedef-decl name='gnutls_cipher_setkey_func' type-id='type-id-117' id='type-id-805'/>
-    <typedef-decl name='gnutls_cipher_aead_encrypt_func' type-id='type-id-115' id='type-id-806'/>
-    <typedef-decl name='gnutls_cipher_aead_decrypt_func' type-id='type-id-115' id='type-id-807'/>
-    <typedef-decl name='gnutls_cipher_deinit_func' type-id='type-id-121' id='type-id-808'/>
+      <parameter type-id='type-id-795' name='init'/>
+      <parameter type-id='type-id-796' name='setkey'/>
+      <parameter type-id='type-id-797' name='setnonce'/>
+      <parameter type-id='type-id-798' name='hash'/>
+      <parameter type-id='type-id-799' name='output'/>
+      <parameter type-id='type-id-800' name='deinit'/>
+      <parameter type-id='type-id-803' name='hash_fast'/>
+      <return type-id='type-id-22'/>
+    </function-decl>
+    <pointer-type-def type-id='type-id-804' size-in-bits='64' id='type-id-805'/>
+    <typedef-decl name='gnutls_cipher_init_func' type-id='type-id-805' id='type-id-806'/>
+    <typedef-decl name='gnutls_cipher_setkey_func' type-id='type-id-117' id='type-id-807'/>
+    <typedef-decl name='gnutls_cipher_aead_encrypt_func' type-id='type-id-115' id='type-id-808'/>
+    <typedef-decl name='gnutls_cipher_aead_decrypt_func' type-id='type-id-115' id='type-id-809'/>
+    <typedef-decl name='gnutls_cipher_deinit_func' type-id='type-id-121' id='type-id-810'/>
     <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-804' name='init'/>
-      <parameter type-id='type-id-805' name='setkey'/>
-      <parameter type-id='type-id-806' name='aead_encrypt'/>
-      <parameter type-id='type-id-807' name='aead_decrypt'/>
-      <parameter type-id='type-id-808' name='deinit'/>
+      <parameter type-id='type-id-806' name='init'/>
+      <parameter type-id='type-id-807' name='setkey'/>
+      <parameter type-id='type-id-808' name='aead_encrypt'/>
+      <parameter type-id='type-id-809' name='aead_decrypt'/>
+      <parameter type-id='type-id-810' 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-809'/>
-    <typedef-decl name='gnutls_cipher_encrypt_func' type-id='type-id-113' id='type-id-810'/>
-    <typedef-decl name='gnutls_cipher_decrypt_func' type-id='type-id-113' id='type-id-811'/>
+    <typedef-decl name='gnutls_cipher_setiv_func' type-id='type-id-117' id='type-id-811'/>
+    <typedef-decl name='gnutls_cipher_encrypt_func' type-id='type-id-113' id='type-id-812'/>
+    <typedef-decl name='gnutls_cipher_decrypt_func' type-id='type-id-113' id='type-id-813'/>
     <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-804' name='init'/>
-      <parameter type-id='type-id-805' name='setkey'/>
-      <parameter type-id='type-id-809' name='setiv'/>
-      <parameter type-id='type-id-810' name='encrypt'/>
-      <parameter type-id='type-id-811' name='decrypt'/>
-      <parameter type-id='type-id-808' name='deinit'/>
+      <parameter type-id='type-id-806' name='init'/>
+      <parameter type-id='type-id-807' name='setkey'/>
+      <parameter type-id='type-id-811' name='setiv'/>
+      <parameter type-id='type-id-812' name='encrypt'/>
+      <parameter type-id='type-id-813' name='decrypt'/>
+      <parameter type-id='type-id-810' name='deinit'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-802'>
+    <function-type size-in-bits='64' id='type-id-804'>
       <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-429'/>
+      <parameter type-id='type-id-430'/>
       <parameter type-id='type-id-22'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-782'>
+    <function-type size-in-bits='64' id='type-id-784'>
       <parameter type-id='type-id-211'/>
-      <parameter type-id='type-id-429'/>
+      <parameter type-id='type-id-430'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-788'>
+    <function-type size-in-bits='64' id='type-id-790'>
       <parameter type-id='type-id-211'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
+      <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-791'>
+    <function-type size-in-bits='64' id='type-id-793'>
       <parameter type-id='type-id-31'/>
-      <parameter type-id='type-id-429'/>
+      <parameter type-id='type-id-430'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-799'>
+    <function-type size-in-bits='64' id='type-id-801'>
       <parameter type-id='type-id-31'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <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>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='verify-tofu.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <class-decl name='gnutls_tdb_int' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-812'>
+  <abi-instr version='1.0' address-size='64' path='verify-tofu.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_tdb_int' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-814'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='store' type-id='type-id-813' visibility='default'/>
+        <var-decl name='store' type-id='type-id-815' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cstore' type-id='type-id-814' visibility='default'/>
+        <var-decl name='cstore' type-id='type-id-816' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='verify' type-id='type-id-815' visibility='default'/>
+        <var-decl name='verify' type-id='type-id-817' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-816' size-in-bits='64' id='type-id-817'/>
-    <typedef-decl name='gnutls_tdb_store_func' type-id='type-id-817' id='type-id-813'/>
     <pointer-type-def type-id='type-id-818' size-in-bits='64' id='type-id-819'/>
-    <typedef-decl name='gnutls_tdb_store_commitment_func' type-id='type-id-819' id='type-id-814'/>
+    <typedef-decl name='gnutls_tdb_store_func' type-id='type-id-819' id='type-id-815'/>
     <pointer-type-def type-id='type-id-820' size-in-bits='64' id='type-id-821'/>
-    <typedef-decl name='gnutls_tdb_verify_func' type-id='type-id-821' id='type-id-815'/>
-    <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-822'/>
-    <typedef-decl name='gnutls_tdb_t' type-id='type-id-822' id='type-id-823'/>
+    <typedef-decl name='gnutls_tdb_store_commitment_func' type-id='type-id-821' id='type-id-816'/>
+    <pointer-type-def type-id='type-id-822' size-in-bits='64' id='type-id-823'/>
+    <typedef-decl name='gnutls_tdb_verify_func' type-id='type-id-823' id='type-id-817'/>
+    <pointer-type-def type-id='type-id-814' size-in-bits='64' id='type-id-824'/>
+    <typedef-decl name='gnutls_tdb_t' type-id='type-id-824' id='type-id-825'/>
     <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-823' name='tdb'/>
+      <parameter type-id='type-id-825' 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-823' name='tdb'/>
-      <parameter type-id='type-id-815' name='verify'/>
+      <parameter type-id='type-id-825' name='tdb'/>
+      <parameter type-id='type-id-817' 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-823' name='tdb'/>
-      <parameter type-id='type-id-814' name='cstore'/>
+      <parameter type-id='type-id-825' name='tdb'/>
+      <parameter type-id='type-id-816' 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-823' name='tdb'/>
-      <parameter type-id='type-id-813' name='store'/>
+      <parameter type-id='type-id-825' name='tdb'/>
+      <parameter type-id='type-id-815' name='store'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-823' size-in-bits='64' id='type-id-824'/>
+    <pointer-type-def type-id='type-id-825' size-in-bits='64' id='type-id-826'/>
     <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-824' name='tdb'/>
+      <parameter type-id='type-id-826' 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-823' name='tdb'/>
+      <parameter type-id='type-id-825' 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'/>
@@ -10184,7 +10364,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-823' name='tdb'/>
+      <parameter type-id='type-id-825' 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'/>
@@ -10195,7 +10375,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-823' name='tdb'/>
+      <parameter type-id='type-id-825' 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'/>
@@ -10218,14 +10398,17 @@
     <function-decl name='strpbrk' mangled-name='strpbrk' 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-820'>
+    <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-822'>
       <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-816'>
+    <function-type size-in-bits='64' id='type-id-818'>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-27'/>
@@ -10233,7 +10416,7 @@
       <parameter type-id='type-id-57'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-818'>
+    <function-type size-in-bits='64' id='type-id-820'>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-27'/>
@@ -10243,152 +10426,152 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pin.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <var-decl name='_gnutls_pin_func' type-id='type-id-375' visibility='default'/>
-    <var-decl name='_gnutls_pin_data' type-id='type-id-102' 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-429' name='userdata'/>
+      <parameter type-id='type-id-430' name='userdata'/>
       <return type-id='type-id-375'/>
     </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-102' name='userdata'/>
+      <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tpm.c' comp-dir-path='/home/nmavrogi/cvs/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-825'>
+    <class-decl name='tpm_key_list_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-827'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='size' type-id='type-id-826' visibility='default'/>
+        <var-decl name='size' type-id='type-id-828' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='ki' type-id='type-id-827' visibility='default'/>
+        <var-decl name='ki' type-id='type-id-829' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='tpm_ctx' type-id='type-id-828' visibility='default'/>
+        <var-decl name='tpm_ctx' type-id='type-id-830' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='UINT32' type-id='type-id-18' id='type-id-826'/>
-    <class-decl name='tdTSS_KM_KEYINFO2' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-829'>
+    <typedef-decl name='UINT32' type-id='type-id-18' id='type-id-828'/>
+    <class-decl name='tdTSS_KM_KEYINFO2' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-831'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='versionInfo' type-id='type-id-830' visibility='default'/>
+        <var-decl name='versionInfo' type-id='type-id-832' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='keyUUID' type-id='type-id-831' visibility='default'/>
+        <var-decl name='keyUUID' type-id='type-id-833' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='parentKeyUUID' type-id='type-id-831' visibility='default'/>
+        <var-decl name='parentKeyUUID' type-id='type-id-833' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='bAuthDataUsage' type-id='type-id-832' visibility='default'/>
+        <var-decl name='bAuthDataUsage' type-id='type-id-834' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='persistentStorageType' type-id='type-id-833' visibility='default'/>
+        <var-decl name='persistentStorageType' type-id='type-id-835' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='persistentStorageTypeParent' type-id='type-id-833' visibility='default'/>
+        <var-decl name='persistentStorageTypeParent' type-id='type-id-835' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='fIsLoaded' type-id='type-id-834' visibility='default'/>
+        <var-decl name='fIsLoaded' type-id='type-id-836' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='ulVendorDataLength' type-id='type-id-826' visibility='default'/>
+        <var-decl name='ulVendorDataLength' type-id='type-id-828' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='rgbVendorData' type-id='type-id-835' visibility='default'/>
+        <var-decl name='rgbVendorData' type-id='type-id-837' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='tdTSS_VERSION' size-in-bits='32' is-struct='yes' visibility='default' id='type-id-836'>
+    <class-decl name='tdTSS_VERSION' size-in-bits='32' is-struct='yes' visibility='default' id='type-id-838'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='bMajor' type-id='type-id-832' visibility='default'/>
+        <var-decl name='bMajor' type-id='type-id-834' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8'>
-        <var-decl name='bMinor' type-id='type-id-832' visibility='default'/>
+        <var-decl name='bMinor' type-id='type-id-834' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='bRevMajor' type-id='type-id-832' visibility='default'/>
+        <var-decl name='bRevMajor' type-id='type-id-834' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='bRevMinor' type-id='type-id-832' visibility='default'/>
+        <var-decl name='bRevMinor' type-id='type-id-834' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='BYTE' type-id='type-id-16' id='type-id-832'/>
-    <typedef-decl name='TSS_VERSION' type-id='type-id-836' id='type-id-830'/>
-    <class-decl name='tdTSS_UUID' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-837'>
+    <typedef-decl name='BYTE' type-id='type-id-16' id='type-id-834'/>
+    <typedef-decl name='TSS_VERSION' type-id='type-id-838' id='type-id-832'/>
+    <class-decl name='tdTSS_UUID' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-839'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ulTimeLow' type-id='type-id-826' visibility='default'/>
+        <var-decl name='ulTimeLow' type-id='type-id-828' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='usTimeMid' type-id='type-id-838' visibility='default'/>
+        <var-decl name='usTimeMid' type-id='type-id-840' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='usTimeHigh' type-id='type-id-838' visibility='default'/>
+        <var-decl name='usTimeHigh' type-id='type-id-840' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='bClockSeqHigh' type-id='type-id-832' visibility='default'/>
+        <var-decl name='bClockSeqHigh' type-id='type-id-834' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='72'>
-        <var-decl name='bClockSeqLow' type-id='type-id-832' visibility='default'/>
+        <var-decl name='bClockSeqLow' type-id='type-id-834' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='rgbNode' type-id='type-id-839' visibility='default'/>
+        <var-decl name='rgbNode' type-id='type-id-841' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='UINT16' type-id='type-id-11' id='type-id-838'/>
+    <typedef-decl name='UINT16' type-id='type-id-11' id='type-id-840'/>
 
-    <array-type-def dimensions='1' type-id='type-id-832' size-in-bits='48' id='type-id-839'>
+    <array-type-def dimensions='1' type-id='type-id-834' size-in-bits='48' id='type-id-841'>
       <subrange length='6' type-id='type-id-38' id='type-id-230'/>
 
     </array-type-def>
-    <typedef-decl name='TSS_UUID' type-id='type-id-837' id='type-id-831'/>
-    <typedef-decl name='TSS_FLAG' type-id='type-id-826' id='type-id-833'/>
-    <type-decl name='signed char' size-in-bits='8' id='type-id-840'/>
-    <typedef-decl name='__int8_t' type-id='type-id-840' id='type-id-841'/>
-    <typedef-decl name='int8_t' type-id='type-id-841' id='type-id-842'/>
-    <typedef-decl name='TSS_BOOL' type-id='type-id-842' id='type-id-834'/>
-    <pointer-type-def type-id='type-id-832' size-in-bits='64' id='type-id-835'/>
-    <typedef-decl name='TSS_KM_KEYINFO2' type-id='type-id-829' id='type-id-843'/>
-    <pointer-type-def type-id='type-id-843' size-in-bits='64' id='type-id-827'/>
-    <typedef-decl name='TSS_HOBJECT' type-id='type-id-826' id='type-id-844'/>
-    <typedef-decl name='TSS_HCONTEXT' type-id='type-id-844' id='type-id-828'/>
-    <pointer-type-def type-id='type-id-825' size-in-bits='64' id='type-id-845'/>
-    <typedef-decl name='gnutls_tpm_key_list_t' type-id='type-id-845' id='type-id-846'/>
-    <pointer-type-def type-id='type-id-846' size-in-bits='64' id='type-id-847'/>
+    <typedef-decl name='TSS_UUID' type-id='type-id-839' id='type-id-833'/>
+    <typedef-decl name='TSS_FLAG' type-id='type-id-828' id='type-id-835'/>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-842'/>
+    <typedef-decl name='__int8_t' type-id='type-id-842' id='type-id-843'/>
+    <typedef-decl name='int8_t' type-id='type-id-843' id='type-id-844'/>
+    <typedef-decl name='TSS_BOOL' type-id='type-id-844' id='type-id-836'/>
+    <pointer-type-def type-id='type-id-834' size-in-bits='64' id='type-id-837'/>
+    <typedef-decl name='TSS_KM_KEYINFO2' type-id='type-id-831' id='type-id-845'/>
+    <pointer-type-def type-id='type-id-845' size-in-bits='64' id='type-id-829'/>
+    <typedef-decl name='TSS_HOBJECT' type-id='type-id-828' id='type-id-846'/>
+    <typedef-decl name='TSS_HCONTEXT' type-id='type-id-846' id='type-id-830'/>
+    <pointer-type-def type-id='type-id-827' size-in-bits='64' id='type-id-847'/>
+    <typedef-decl name='gnutls_tpm_key_list_t' type-id='type-id-847' id='type-id-848'/>
+    <pointer-type-def type-id='type-id-848' size-in-bits='64' id='type-id-849'/>
     <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-847' name='list'/>
+      <parameter type-id='type-id-849' 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-848'/>
+    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-850'/>
     <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-846' name='list'/>
+      <parameter type-id='type-id-848' name='list'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-848' name='url'/>
+      <parameter type-id='type-id-850' 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-846' name='list'/>
+      <parameter type-id='type-id-848' name='list'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-849'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-851'>
       <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-849' id='type-id-850'/>
+    <typedef-decl name='gnutls_tpmkey_fmt_t' type-id='type-id-851' id='type-id-852'/>
     <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-850' name='format'/>
-      <parameter type-id='type-id-420' name='pub_format'/>
+      <parameter type-id='type-id-852' 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-10' name='flags'/>
@@ -10412,7 +10595,7 @@
     <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-57' name='fdata'/>
-      <parameter type-id='type-id-850' name='format'/>
+      <parameter type-id='type-id-852' 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'/>
@@ -10421,7 +10604,7 @@
     <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-57' name='fdata'/>
-      <parameter type-id='type-id-850' name='format'/>
+      <parameter type-id='type-id-852' 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'/>
@@ -10472,7 +10655,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='fips.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -10480,7 +10663,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-851'>
+    <enum-decl name='gnutls_fips_mode_t' id='type-id-853'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_FIPS140_DISABLED' value='0'/>
       <enumerator name='GNUTLS_FIPS140_STRICT' value='1'/>
@@ -10488,9 +10671,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-851' id='type-id-852'/>
+    <typedef-decl name='gnutls_fips_mode_t' type-id='type-id-853' id='type-id-854'/>
     <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-852' name='mode'/>
+      <parameter type-id='type-id-854' name='mode'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -10498,41 +10681,41 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='safe-memfuncs.c' comp-dir-path='/home/nmavrogi/cvs/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-102' name='s1'/>
-      <parameter type-id='type-id-102' name='s2'/>
-      <parameter type-id='type-id-100' name='n'/>
+      <parameter type-id='type-id-101' name='s1'/>
+      <parameter type-id='type-id-101' name='s2'/>
+      <parameter type-id='type-id-99' name='n'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_memset' mangled-name='gnutls_memset' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_memset@@GNUTLS_3_4'>
-      <parameter type-id='type-id-102' name='data'/>
+      <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-22' name='c'/>
-      <parameter type-id='type-id-100' name='size'/>
+      <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'>
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='atfork.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <enum-decl name='gnutls_random_art' id='type-id-853'>
+  <abi-instr version='1.0' address-size='64' path='randomart.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <enum-decl name='gnutls_random_art' id='type-id-855'>
       <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-853' id='type-id-854'/>
+    <typedef-decl name='gnutls_random_art_t' type-id='type-id-855' id='type-id-856'/>
     <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-854' name='type'/>
+      <parameter type-id='type-id-856' 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-102' name='fpr'/>
-      <parameter type-id='type-id-100' name='fpr_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'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -10540,8 +10723,8 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <class-decl name='gnutls_custom_url_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-855'>
+  <abi-instr version='1.0' address-size='64' path='urls.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_custom_url_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-857'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
@@ -10549,48 +10732,48 @@
         <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-856' visibility='default'/>
+        <var-decl name='import_key' type-id='type-id-858' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='import_crt' type-id='type-id-857' visibility='default'/>
+        <var-decl name='import_crt' type-id='type-id-859' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='import_pubkey' type-id='type-id-858' visibility='default'/>
+        <var-decl name='import_pubkey' type-id='type-id-860' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='get_issuer' type-id='type-id-859' visibility='default'/>
+        <var-decl name='get_issuer' type-id='type-id-861' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='future1' type-id='type-id-102' visibility='default'/>
+        <var-decl name='future1' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='future2' type-id='type-id-102' visibility='default'/>
+        <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-860'/>
-    <pointer-type-def type-id='type-id-861' size-in-bits='64' id='type-id-862'/>
-    <typedef-decl name='gnutls_privkey_import_url_func' type-id='type-id-862' id='type-id-856'/>
-    <class-decl name='gnutls_x509_crt_int' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-863'/>
+    <typedef-decl name='gnutls_privkey_t' type-id='type-id-162' id='type-id-862'/>
     <pointer-type-def type-id='type-id-863' size-in-bits='64' id='type-id-864'/>
-    <typedef-decl name='gnutls_x509_crt_t' type-id='type-id-864' id='type-id-865'/>
-    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-867'/>
-    <typedef-decl name='gnutls_x509_crt_import_url_func' type-id='type-id-867' id='type-id-857'/>
+    <typedef-decl name='gnutls_privkey_import_url_func' type-id='type-id-864' id='type-id-858'/>
+    <class-decl name='gnutls_x509_crt_int' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-865'/>
+    <pointer-type-def type-id='type-id-865' size-in-bits='64' id='type-id-866'/>
+    <typedef-decl name='gnutls_x509_crt_t' type-id='type-id-866' id='type-id-867'/>
     <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-869'/>
-    <typedef-decl name='gnutls_pubkey_import_url_func' type-id='type-id-869' id='type-id-858'/>
+    <typedef-decl name='gnutls_x509_crt_import_url_func' type-id='type-id-869' id='type-id-859'/>
     <pointer-type-def type-id='type-id-870' size-in-bits='64' id='type-id-871'/>
-    <typedef-decl name='gnutls_get_raw_issuer_func' type-id='type-id-871' id='type-id-859'/>
-    <typedef-decl name='gnutls_custom_url_st' type-id='type-id-855' id='type-id-872'/>
+    <typedef-decl name='gnutls_pubkey_import_url_func' type-id='type-id-871' id='type-id-860'/>
+    <pointer-type-def type-id='type-id-872' size-in-bits='64' id='type-id-873'/>
+    <typedef-decl name='gnutls_get_raw_issuer_func' type-id='type-id-873' id='type-id-861'/>
+    <typedef-decl name='gnutls_custom_url_st' type-id='type-id-857' id='type-id-874'/>
 
-    <array-type-def dimensions='1' type-id='type-id-872' size-in-bits='infinite' id='type-id-873'>
-      <subrange length='infinite' id='type-id-874'/>
+    <array-type-def dimensions='1' type-id='type-id-874' size-in-bits='infinite' id='type-id-875'>
+      <subrange length='infinite' id='type-id-876'/>
 
     </array-type-def>
-    <var-decl name='_gnutls_custom_urls' type-id='type-id-873' visibility='default'/>
+    <var-decl name='_gnutls_custom_urls' type-id='type-id-875' visibility='default'/>
     <var-decl name='_gnutls_custom_urls_size' type-id='type-id-10' visibility='default'/>
-    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-875'/>
-    <pointer-type-def type-id='type-id-875' size-in-bits='64' id='type-id-876'/>
+    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-877'/>
+    <pointer-type-def type-id='type-id-877' size-in-bits='64' id='type-id-878'/>
     <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-876' name='st'/>
+      <parameter type-id='type-id-878' 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'>
@@ -10600,66 +10783,82 @@
     <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-870'>
+    <function-type size-in-bits='64' id='type-id-872'>
       <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-865'/>
+      <parameter type-id='type-id-867'/>
       <parameter type-id='type-id-275'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-861'>
-      <parameter type-id='type-id-860'/>
+    <function-type size-in-bits='64' id='type-id-863'>
+      <parameter type-id='type-id-862'/>
       <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-868'>
+    <function-type size-in-bits='64' id='type-id-870'>
       <parameter type-id='type-id-267'/>
       <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-866'>
-      <parameter type-id='type-id-865'/>
+    <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>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='prf.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='prf.c' comp-dir-path='/home/nmavrogi/cvs/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-100' name='label_size'/>
+      <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-100' name='extra_size'/>
+      <parameter type-id='type-id-99' name='extra_size'/>
       <parameter type-id='type-id-27' name='extra'/>
-      <parameter type-id='type-id-100' name='outsize'/>
+      <parameter type-id='type-id-99' name='outsize'/>
+      <parameter type-id='type-id-376' 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-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'/>
       <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-100' name='label_size'/>
+      <parameter type-id='type-id-99' name='label_size'/>
       <parameter type-id='type-id-27' name='label'/>
-      <parameter type-id='type-id-100' name='context_size'/>
+      <parameter type-id='type-id-99' name='context_size'/>
       <parameter type-id='type-id-27' name='context'/>
-      <parameter type-id='type-id-100' name='outsize'/>
+      <parameter type-id='type-id-99' name='outsize'/>
       <parameter type-id='type-id-376' 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-100' name='label_size'/>
+      <parameter type-id='type-id-99' name='label_size'/>
       <parameter type-id='type-id-27' name='label'/>
-      <parameter type-id='type-id-100' name='seed_size'/>
+      <parameter type-id='type-id-99' name='seed_size'/>
       <parameter type-id='type-id-27' name='seed'/>
-      <parameter type-id='type-id-100' name='outsize'/>
+      <parameter type-id='type-id-99' name='outsize'/>
       <parameter type-id='type-id-376' 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'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_tls13_expand_secret2' mangled-name='_tls13_expand_secret2' 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='auto-verify.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='auto-verify.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <return type-id='type-id-10'/>
@@ -10687,7 +10886,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dh-session.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <return type-id='type-id-22'/>
@@ -10717,7 +10916,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cert-session.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <return type-id='type-id-17'/>
@@ -10729,37 +10928,37 @@
     <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-27' name='hostname'/>
-      <parameter type-id='type-id-418' name='status'/>
+      <parameter type-id='type-id-419' 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-418' name='status'/>
+      <parameter type-id='type-id-419' 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-723' name='res'/>
+      <parameter type-id='type-id-725' 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-723' name='res'/>
+      <parameter type-id='type-id-725' 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-723' name='res'/>
+      <parameter type-id='type-id-725' 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-723' name='res'/>
+      <parameter type-id='type-id-725' 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-723' name='res'/>
-      <parameter type-id='type-id-432' name='func'/>
+      <parameter type-id='type-id-725' name='res'/>
+      <parameter type-id='type-id-433' 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'>
@@ -10768,7 +10967,7 @@
     </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-418' name='list_size'/>
+      <parameter type-id='type-id-419' 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'>
@@ -10779,7 +10978,7 @@
       <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-172' name='data'/>
       <parameter type-id='type-id-10' name='elements'/>
-      <parameter type-id='type-id-418' name='status'/>
+      <parameter type-id='type-id-419' 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'>
@@ -10831,26 +11030,31 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dh-primes.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
     <var-decl name='gnutls_ffdhe_2048_key_bits' type-id='type-id-66' mangled-name='gnutls_ffdhe_2048_key_bits' visibility='default' elf-symbol-id='gnutls_ffdhe_2048_key_bits@@GNUTLS_3_4'/>
-    <var-decl name='gnutls_ffdhe_3072_group_generator' type-id='type-id-65' mangled-name='gnutls_ffdhe_3072_group_generator' visibility='default' elf-symbol-id='gnutls_ffdhe_3072_group_generator@@GNUTLS_3_4'/>
     <var-decl name='gnutls_ffdhe_3072_group_prime' type-id='type-id-65' mangled-name='gnutls_ffdhe_3072_group_prime' visibility='default' elf-symbol-id='gnutls_ffdhe_3072_group_prime@@GNUTLS_3_4'/>
+    <var-decl name='gnutls_ffdhe_3072_group_q' type-id='type-id-65' mangled-name='gnutls_ffdhe_3072_group_q' visibility='default' elf-symbol-id='gnutls_ffdhe_3072_group_q@@GNUTLS_3_6_8'/>
+    <var-decl name='gnutls_ffdhe_3072_group_generator' type-id='type-id-65' mangled-name='gnutls_ffdhe_3072_group_generator' visibility='default' elf-symbol-id='gnutls_ffdhe_3072_group_generator@@GNUTLS_3_4'/>
     <var-decl name='gnutls_ffdhe_3072_key_bits' type-id='type-id-66' mangled-name='gnutls_ffdhe_3072_key_bits' visibility='default' elf-symbol-id='gnutls_ffdhe_3072_key_bits@@GNUTLS_3_4'/>
-    <var-decl name='gnutls_ffdhe_4096_group_generator' type-id='type-id-65' mangled-name='gnutls_ffdhe_4096_group_generator' visibility='default' elf-symbol-id='gnutls_ffdhe_4096_group_generator@@GNUTLS_3_4'/>
     <var-decl name='gnutls_ffdhe_4096_group_prime' type-id='type-id-65' mangled-name='gnutls_ffdhe_4096_group_prime' visibility='default' elf-symbol-id='gnutls_ffdhe_4096_group_prime@@GNUTLS_3_4'/>
+    <var-decl name='gnutls_ffdhe_4096_group_q' type-id='type-id-65' mangled-name='gnutls_ffdhe_4096_group_q' visibility='default' elf-symbol-id='gnutls_ffdhe_4096_group_q@@GNUTLS_3_6_8'/>
+    <var-decl name='gnutls_ffdhe_4096_group_generator' type-id='type-id-65' mangled-name='gnutls_ffdhe_4096_group_generator' visibility='default' elf-symbol-id='gnutls_ffdhe_4096_group_generator@@GNUTLS_3_4'/>
     <var-decl name='gnutls_ffdhe_4096_key_bits' type-id='type-id-66' mangled-name='gnutls_ffdhe_4096_key_bits' visibility='default' elf-symbol-id='gnutls_ffdhe_4096_key_bits@@GNUTLS_3_4'/>
     <var-decl name='gnutls_ffdhe_6144_group_prime' type-id='type-id-65' mangled-name='gnutls_ffdhe_6144_group_prime' visibility='default' elf-symbol-id='gnutls_ffdhe_6144_group_prime@@GNUTLS_3_6_4'/>
+    <var-decl name='gnutls_ffdhe_6144_group_q' type-id='type-id-65' mangled-name='gnutls_ffdhe_6144_group_q' visibility='default' elf-symbol-id='gnutls_ffdhe_6144_group_q@@GNUTLS_3_6_8'/>
     <var-decl name='gnutls_ffdhe_6144_group_generator' type-id='type-id-65' mangled-name='gnutls_ffdhe_6144_group_generator' visibility='default' elf-symbol-id='gnutls_ffdhe_6144_group_generator@@GNUTLS_3_6_4'/>
     <var-decl name='gnutls_ffdhe_6144_key_bits' type-id='type-id-66' mangled-name='gnutls_ffdhe_6144_key_bits' visibility='default' elf-symbol-id='gnutls_ffdhe_6144_key_bits@@GNUTLS_3_6_4'/>
-    <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_group_prime' type-id='type-id-65' mangled-name='gnutls_ffdhe_8192_group_prime' visibility='default' elf-symbol-id='gnutls_ffdhe_8192_group_prime@@GNUTLS_3_4'/>
+    <var-decl name='gnutls_ffdhe_8192_group_q' type-id='type-id-65' mangled-name='gnutls_ffdhe_8192_group_q' visibility='default' elf-symbol-id='gnutls_ffdhe_8192_group_q@@GNUTLS_3_6_8'/>
+    <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='openpgp_compat.c' comp-dir-path='/home/nmavrogi/cvs/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-475' name='key'/>
+      <parameter type-id='type-id-477' name='key'/>
       <parameter type-id='type-id-57' name='hash'/>
       <parameter type-id='type-id-275' name='signature'/>
       <return type-id='type-id-22'/>
@@ -10860,27 +11064,27 @@
       <parameter type-id='type-id-275' name='session_id'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-877'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-879'>
       <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-877' id='type-id-878'/>
+    <typedef-decl name='gnutls_openpgp_crt_status_t' type-id='type-id-879' id='type-id-880'/>
     <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-878' name='status'/>
+      <parameter type-id='type-id-880' name='status'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <enum-decl name='gnutls_openpgp_crt_fmt' id='type-id-879'>
+    <enum-decl name='gnutls_openpgp_crt_fmt' id='type-id-881'>
       <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-879' id='type-id-880'/>
+    <typedef-decl name='gnutls_openpgp_crt_fmt_t' type-id='type-id-881' id='type-id-882'/>
     <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-860' name='pkey'/>
+      <parameter type-id='type-id-862' name='pkey'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-880' name='format'/>
+      <parameter type-id='type-id-882' name='format'/>
       <parameter type-id='type-id-346' name='keyid'/>
       <parameter type-id='type-id-27' name='password'/>
       <return type-id='type-id-22'/>
@@ -10889,56 +11093,56 @@
       <parameter type-id='type-id-267' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
-      <parameter type-id='type-id-418' name='subkey'/>
+      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-419' 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-881'/>
-    <pointer-type-def type-id='type-id-881' size-in-bits='64' id='type-id-882'/>
-    <typedef-decl name='gnutls_certificate_credentials_t' type-id='type-id-882' id='type-id-883'/>
+    <class-decl name='gnutls_certificate_credentials_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-883'/>
+    <pointer-type-def type-id='type-id-883' size-in-bits='64' id='type-id-884'/>
+    <typedef-decl name='gnutls_certificate_credentials_t' type-id='type-id-884' id='type-id-885'/>
     <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-883' name='c'/>
+      <parameter type-id='type-id-885' name='c'/>
       <parameter type-id='type-id-346' name='data'/>
-      <parameter type-id='type-id-100' name='dlen'/>
-      <parameter type-id='type-id-880' name='format'/>
+      <parameter type-id='type-id-99' name='dlen'/>
+      <parameter type-id='type-id-882' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-884' size-in-bits='64' id='type-id-885'/>
-    <typedef-decl name='gnutls_openpgp_recv_key_func' type-id='type-id-885' id='type-id-886'/>
+    <pointer-type-def type-id='type-id-886' size-in-bits='64' id='type-id-887'/>
+    <typedef-decl name='gnutls_openpgp_recv_key_func' type-id='type-id-887' id='type-id-888'/>
     <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-886' name='func'/>
+      <parameter type-id='type-id-888' 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-887'/>
-    <pointer-type-def type-id='type-id-887' size-in-bits='64' id='type-id-888'/>
-    <typedef-decl name='gnutls_openpgp_keyring_t' type-id='type-id-888' id='type-id-889'/>
+    <class-decl name='gnutls_openpgp_keyring_int' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-889'/>
+    <pointer-type-def type-id='type-id-889' size-in-bits='64' id='type-id-890'/>
+    <typedef-decl name='gnutls_openpgp_keyring_t' type-id='type-id-890' id='type-id-891'/>
     <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-472' name='key'/>
-      <parameter type-id='type-id-889' name='keyring'/>
+      <parameter type-id='type-id-474' name='key'/>
+      <parameter type-id='type-id-891' name='keyring'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-418' name='verify'/>
+      <parameter type-id='type-id-419' 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-475' name='key'/>
-      <parameter type-id='type-id-880' name='format'/>
+      <parameter type-id='type-id-477' name='key'/>
+      <parameter type-id='type-id-882' 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'/>
       <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-475' name='key'/>
-      <parameter type-id='type-id-880' name='format'/>
+      <parameter type-id='type-id-477' name='key'/>
+      <parameter type-id='type-id-882' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-475' name='pkey'/>
+      <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'/>
@@ -10948,7 +11152,7 @@
       <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-475' name='pkey'/>
+      <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'/>
@@ -10957,7 +11161,7 @@
       <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-475' name='pkey'/>
+      <parameter type-id='type-id-477' 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'/>
@@ -10968,7 +11172,7 @@
       <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-475' name='pkey'/>
+      <parameter type-id='type-id-477' 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'/>
@@ -10978,17 +11182,17 @@
       <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-475' name='key'/>
+      <parameter type-id='type-id-477' name='key'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-418' name='bits'/>
+      <parameter type-id='type-id-419' 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-475' name='key'/>
+      <parameter type-id='type-id-477' name='key'/>
       <return type-id='type-id-202'/>
     </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-472' name='crt'/>
+      <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'/>
@@ -10996,7 +11200,7 @@
       <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-472' name='crt'/>
+      <parameter type-id='type-id-474' 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'/>
@@ -11005,89 +11209,89 @@
       <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-472' name='key'/>
+      <parameter type-id='type-id-474' name='key'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-418' name='bits'/>
+      <parameter type-id='type-id-419' 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-472' name='key'/>
+      <parameter type-id='type-id-474' name='key'/>
       <parameter type-id='type-id-22' name='idx'/>
       <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-421' name='sizeof_buf'/>
+      <parameter type-id='type-id-422' name='sizeof_buf'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-890'/>
+    <pointer-type-def type-id='type-id-474' size-in-bits='64' id='type-id-892'/>
     <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-890' name='key'/>
+      <parameter type-id='type-id-892' 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-472' name='key'/>
+      <parameter type-id='type-id-474' 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-472' name='key'/>
+      <parameter type-id='type-id-474' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-880' name='format'/>
+      <parameter type-id='type-id-882' 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-472' name='key'/>
-      <parameter type-id='type-id-880' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-474' name='key'/>
+      <parameter type-id='type-id-882' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-472' name='key'/>
-      <parameter type-id='type-id-880' name='format'/>
+      <parameter type-id='type-id-474' name='key'/>
+      <parameter type-id='type-id-882' name='format'/>
       <parameter type-id='type-id-275' 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-472' name='key'/>
-      <parameter type-id='type-id-418' name='bits'/>
+      <parameter type-id='type-id-474' name='key'/>
+      <parameter type-id='type-id-419' 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-472' name='key'/>
+      <parameter type-id='type-id-474' 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-472' name='key'/>
+      <parameter type-id='type-id-474' 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-472' name='key'/>
+      <parameter type-id='type-id-474' 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-475' name='key'/>
+      <parameter type-id='type-id-477' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-880' name='format'/>
+      <parameter type-id='type-id-882' 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-883' name='res'/>
+      <parameter type-id='type-id-885' name='res'/>
       <parameter type-id='type-id-27' name='certfile'/>
       <parameter type-id='type-id-27' name='keyfile'/>
-      <parameter type-id='type-id-880' name='format'/>
+      <parameter type-id='type-id-882' 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-883' name='res'/>
+      <parameter type-id='type-id-885' 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-880' name='format'/>
+      <parameter type-id='type-id-882' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-884'>
+    <function-type size-in-bits='64' id='type-id-886'>
       <parameter type-id='type-id-236'/>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-10'/>
@@ -11095,7 +11299,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crypto-selftests.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -11150,6 +11354,9 @@
     <function-decl name='gnutls_cipher_get_iv_size' mangled-name='gnutls_cipher_get_iv_size' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='_gnutls_cipher_get_iv' mangled-name='_gnutls_cipher_get_iv' visibility='default' binding='global' size-in-bits='64'>
+      <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'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -11162,6 +11369,9 @@
     <function-decl name='gnutls_hash_init' mangled-name='gnutls_hash_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='gnutls_hash_copy' mangled-name='gnutls_hash_copy' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='gnutls_digest_get_name' mangled-name='gnutls_digest_get_name' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -11174,14 +11384,20 @@
     <function-decl name='gnutls_hmac' mangled-name='gnutls_hmac' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='gnutls_hmac_copy' mangled-name='gnutls_hmac_copy' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='gnutls_hmac_deinit' mangled-name='gnutls_hmac_deinit' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hmac_get_len' mangled-name='gnutls_hmac_get_len' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='gnutls_hmac_set_nonce' mangled-name='gnutls_hmac_set_nonce' 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='crypto-selftests-pk.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crypto-selftests-pk.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -11200,7 +11416,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='secrets.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/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>
@@ -11214,25 +11430,25 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-891' size-in-bits='64' id='type-id-892'/>
-    <typedef-decl name='gnutls_ext_raw_process_func' type-id='type-id-892' id='type-id-893'/>
+  <abi-instr version='1.0' address-size='64' path='extv.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-893' size-in-bits='64' id='type-id-894'/>
+    <typedef-decl name='gnutls_ext_raw_process_func' type-id='type-id-894' id='type-id-895'/>
     <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-102' name='ctx'/>
-      <parameter type-id='type-id-893' name='cb'/>
+      <parameter type-id='type-id-101' name='ctx'/>
+      <parameter type-id='type-id-895' 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-891'>
-      <parameter type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-893'>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-346'/>
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='hello_ext_lib.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -11246,61 +11462,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ocsp-api.c' comp-dir-path='/home/nmavrogi/cvs/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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </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-723' name='sc'/>
+      <parameter type-id='type-id-725' 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-723' name='sc'/>
+      <parameter type-id='type-id-725' name='sc'/>
       <parameter type-id='type-id-57' name='resp_data'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-420' name='fmt'/>
+      <parameter type-id='type-id-421' 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-723' name='sc'/>
+      <parameter type-id='type-id-725' 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-723' name='sc'/>
+      <parameter type-id='type-id-725' name='sc'/>
       <parameter type-id='type-id-10' name='idx'/>
       <parameter type-id='type-id-164' name='ocsp_func'/>
-      <parameter type-id='type-id-102' name='ptr'/>
+      <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-723' name='sc'/>
+      <parameter type-id='type-id-725' name='sc'/>
       <parameter type-id='type-id-164' name='ocsp_func'/>
-      <parameter type-id='type-id-102' name='ptr'/>
+      <parameter type-id='type-id-101' name='ptr'/>
       <return type-id='type-id-111'/>
     </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'>
+    <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-10' name='idx'/>
       <parameter type-id='type-id-275' name='response'/>
       <return type-id='type-id-22'/>
     </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'>
+    <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-10' name='idx'/>
       <parameter type-id='type-id-275' 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-723' name='sc'/>
+      <parameter type-id='type-id-725' name='sc'/>
       <parameter type-id='type-id-27' name='response_file'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-420' name='fmt'/>
+      <parameter type-id='type-id-421' 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'>
@@ -11310,35 +11526,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='stek.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cert-cred-rawpk.c' comp-dir-path='/home/nmavrogi/cvs/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-723' name='cred'/>
+      <parameter type-id='type-id-725' name='cred'/>
       <parameter type-id='type-id-27' name='rawpkfile'/>
       <parameter type-id='type-id-27' name='privkeyfile'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-27' name='pass'/>
       <parameter type-id='type-id-10' name='key_usage'/>
-      <parameter type-id='type-id-425' name='names'/>
+      <parameter type-id='type-id-426' 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-723' name='cred'/>
+      <parameter type-id='type-id-725' name='cred'/>
       <parameter type-id='type-id-57' name='spki'/>
       <parameter type-id='type-id-57' name='pkey'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-27' name='pass'/>
       <parameter type-id='type-id-10' name='key_usage'/>
-      <parameter type-id='type-id-425' name='names'/>
+      <parameter type-id='type-id-426' 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'/>
@@ -11359,31 +11575,94 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='iov.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='iov_iter_st' size-in-bits='896' is-struct='yes' visibility='default' id='type-id-896'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='iov' type-id='type-id-249' 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'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='iov_index' type-id='type-id-99' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='iov_offset' type-id='type-id-99' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='block' type-id='type-id-89' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='768'>
+        <var-decl name='block_size' type-id='type-id-99' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <var-decl name='block_offset' type-id='type-id-99' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-897'/>
+    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-898'/>
+    <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-897' name='iter'/>
+      <parameter type-id='type-id-898' 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-899'/>
+    <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-897' name='iter'/>
+      <parameter type-id='type-id-899' 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-897' name='iter'/>
+      <parameter type-id='type-id-249' 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/nmavrogi/cvs/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>
+    <function-decl name='_gnutls_gost_key_unwrap' mangled-name='_gnutls_gost_key_unwrap' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gost_key_wrap' mangled-name='_gnutls_gost_key_wrap' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_x509_write_value' mangled-name='_gnutls_x509_write_value' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </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'>
+      <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/nmavrogi/cvs/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-865' name='crt'/>
+      <parameter type-id='type-id-867' name='crt'/>
       <parameter type-id='type-id-383' name='privkey'/>
       <parameter type-id='type-id-27' name='label'/>
-      <parameter type-id='type-id-848' name='cert_url'/>
-      <parameter type-id='type-id-848' name='key_url'/>
+      <parameter type-id='type-id-850' name='cert_url'/>
+      <parameter type-id='type-id-850' 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-894'/>
-    <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-895'/>
-    <typedef-decl name='gnutls_system_key_iter_t' type-id='type-id-895' id='type-id-896'/>
-    <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-897'/>
+    <class-decl name='system_key_iter_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-900'/>
+    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-901'/>
+    <typedef-decl name='gnutls_system_key_iter_t' type-id='type-id-901' id='type-id-902'/>
+    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-903'/>
     <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-897' name='iter'/>
+      <parameter type-id='type-id-903' name='iter'/>
       <parameter type-id='type-id-10' name='cert_type'/>
-      <parameter type-id='type-id-848' name='cert_url'/>
-      <parameter type-id='type-id-848' name='key_url'/>
-      <parameter type-id='type-id-848' name='label'/>
+      <parameter type-id='type-id-850' name='cert_url'/>
+      <parameter type-id='type-id-850' name='key_url'/>
+      <parameter type-id='type-id-850' name='label'/>
       <parameter type-id='type-id-275' 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-896' name='iter'/>
+      <parameter type-id='type-id-902' 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'>
@@ -11392,7 +11671,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/certificate_request.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -11406,7 +11685,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/certificate_verify.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -11420,32 +11699,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13-sig.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/finished.c' comp-dir-path='/home/nmavrogi/cvs/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>
-    <function-decl name='_tls13_expand_secret2' mangled-name='_tls13_expand_secret2' 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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/key_update.c' comp-dir-path='/home/nmavrogi/cvs/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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='tls13/hello_retry.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <function-decl name='reset_binders' mangled-name='reset_binders' 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/session_ticket.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/session_ticket.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -11462,17 +11733,17 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/certificate.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/early_data.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/post_handshake.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -11483,29 +11754,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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <class-decl name='psk_ext_parser_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-898'>
+  <abi-instr version='1.0' address-size='64' path='tls13/psk_ext_parser.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='psk_ext_parser_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-904'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='identities_data' type-id='type-id-346' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='identities_len' type-id='type-id-3' visibility='default'/>
+        <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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='binders_len' type-id='type-id-3' visibility='default'/>
+        <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-898' id='type-id-899'/>
-    <pointer-type-def type-id='type-id-899' size-in-bits='64' id='type-id-900'/>
+    <typedef-decl name='psk_ext_iter_st' type-id='type-id-904' id='type-id-905'/>
+    <pointer-type-def type-id='type-id-905' size-in-bits='64' id='type-id-906'/>
     <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-900' name='iter'/>
+      <parameter type-id='type-id-906' name='iter'/>
       <parameter type-id='type-id-275' 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-901'>
+    <class-decl name='psk_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-907'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='identity' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -11513,22 +11784,22 @@
         <var-decl name='ob_ticket_age' type-id='type-id-18' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-901' size-in-bits='64' id='type-id-902'/>
+    <pointer-type-def type-id='type-id-907' size-in-bits='64' id='type-id-908'/>
     <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-900' name='iter'/>
-      <parameter type-id='type-id-902' name='psk'/>
+      <parameter type-id='type-id-906' name='iter'/>
+      <parameter type-id='type-id-908' name='psk'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <typedef-decl name='psk_ext_parser_st' type-id='type-id-898' id='type-id-903'/>
-    <pointer-type-def type-id='type-id-903' size-in-bits='64' id='type-id-904'/>
+    <typedef-decl name='psk_ext_parser_st' type-id='type-id-904' id='type-id-909'/>
+    <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-910'/>
     <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-904' name='p'/>
+      <parameter type-id='type-id-910' name='p'/>
       <parameter type-id='type-id-346' name='data'/>
-      <parameter type-id='type-id-100' name='_len'/>
+      <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/anti_replay.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <class-decl name='gnutls_anti_replay_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-303'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='window' type-id='type-id-18' visibility='default'/>
@@ -11537,28 +11808,28 @@
         <var-decl name='start_time' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='db_add_func' type-id='type-id-905' visibility='default'/>
+        <var-decl name='db_add_func' type-id='type-id-911' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='db_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='db_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-907'/>
-    <typedef-decl name='gnutls_db_add_func' type-id='type-id-907' id='type-id-905'/>
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-913'/>
+    <typedef-decl name='gnutls_db_add_func' type-id='type-id-913' id='type-id-911'/>
     <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-905' name='add_func'/>
+      <parameter type-id='type-id-911' 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-102' name='ptr'/>
+      <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-18' name='client_ticket_age'/>
-      <parameter type-id='type-id-714' name='ticket_creation_time'/>
+      <parameter type-id='type-id-716' name='ticket_creation_time'/>
       <parameter type-id='type-id-275' name='id'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -11576,38 +11847,38 @@
       <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-908'/>
+    <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-914'/>
     <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-908' name='anti_replay'/>
+      <parameter type-id='type-id-914' name='anti_replay'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-906'>
-      <parameter type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-912'>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-57'/>
       <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='pkcs11.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-909'/>
-    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-910'/>
-    <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-912'/>
-    <typedef-decl name='gnutls_pkcs11_token_callback_t' type-id='type-id-912' id='type-id-913'/>
-    <var-decl name='_gnutls_token_func' type-id='type-id-913' visibility='default'/>
-    <var-decl name='_gnutls_token_data' type-id='type-id-102' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='pkcs11.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-101' const='yes' id='type-id-915'/>
+    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-916'/>
+    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-918'/>
+    <typedef-decl name='gnutls_pkcs11_token_callback_t' type-id='type-id-918' id='type-id-919'/>
+    <var-decl name='_gnutls_token_func' type-id='type-id-919' 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'/>
     </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-771' name='obj'/>
-      <parameter type-id='type-id-418' name='oflags'/>
+      <parameter type-id='type-id-773' name='obj'/>
+      <parameter type-id='type-id-419' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-10'/>
     </function-decl>
@@ -11616,7 +11887,7 @@
       <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-420' name='fmt'/>
+      <parameter type-id='type-id-421' name='fmt'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -11624,26 +11895,26 @@
       <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-420' name='fmt'/>
+      <parameter type-id='type-id-421' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-275' name='issuer'/>
-      <parameter type-id='type-id-420' name='fmt'/>
+      <parameter type-id='type-id-421' 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-766' name='type'/>
+      <parameter type-id='type-id-768' 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'>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-38' name='mechanism'/>
-      <parameter type-id='type-id-102' name='ptr'/>
+      <parameter type-id='type-id-101' name='ptr'/>
       <parameter type-id='type-id-10' name='psize'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-10'/>
@@ -11651,60 +11922,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-624' name='mechanism'/>
+      <parameter type-id='type-id-626' 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-418' name='flags'/>
+      <parameter type-id='type-id-419' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-771' size-in-bits='64' id='type-id-914'/>
-    <qualified-type-def type-id='type-id-914' const='yes' id='type-id-915'/>
+    <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-920'/>
+    <qualified-type-def type-id='type-id-920' const='yes' id='type-id-921'/>
     <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-456' name='certs'/>
+      <parameter type-id='type-id-458' name='certs'/>
       <parameter type-id='type-id-10' name='cert_max'/>
-      <parameter type-id='type-id-915' name='objs'/>
+      <parameter type-id='type-id-921' 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-465' name='crt'/>
-      <parameter type-id='type-id-771' name='pkcs11_crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-773' 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-914' name='p_list'/>
-      <parameter type-id='type-id-418' name='n_list'/>
+      <parameter type-id='type-id-920' name='p_list'/>
+      <parameter type-id='type-id-419' 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-771' name='obj'/>
-      <return type-id='type-id-766'/>
+      <parameter type-id='type-id-773' name='obj'/>
+      <return type-id='type-id-768'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-916'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-922'>
       <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-916' id='type-id-917'/>
+    <typedef-decl name='gnutls_pkcs11_url_type_t' type-id='type-id-922' id='type-id-923'/>
     <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-771' name='obj'/>
-      <parameter type-id='type-id-917' name='detailed'/>
-      <parameter type-id='type-id-848' name='url'/>
+      <parameter type-id='type-id-773' name='obj'/>
+      <parameter type-id='type-id-923' name='detailed'/>
+      <parameter type-id='type-id-850' 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-429' name='ptr'/>
-      <parameter type-id='type-id-624' name='slot_id'/>
+      <parameter type-id='type-id-430' name='ptr'/>
+      <parameter type-id='type-id-626' 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-918'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-924'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PKCS11_TOKEN_LABEL' value='0'/>
       <enumerator name='GNUTLS_PKCS11_TOKEN_SERIAL' value='1'/>
@@ -11712,72 +11983,72 @@
       <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-918' id='type-id-919'/>
+    <typedef-decl name='gnutls_pkcs11_token_info_t' type-id='type-id-924' id='type-id-925'/>
     <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-919' name='ttype'/>
-      <parameter type-id='type-id-102' name='output'/>
-      <parameter type-id='type-id-421' name='output_size'/>
+      <parameter type-id='type-id-925' name='ttype'/>
+      <parameter type-id='type-id-101' name='output'/>
+      <parameter type-id='type-id-422' 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-917' name='detailed'/>
-      <parameter type-id='type-id-848' name='url'/>
+      <parameter type-id='type-id-923' name='detailed'/>
+      <parameter type-id='type-id-850' 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-917' name='detailed'/>
-      <parameter type-id='type-id-848' name='url'/>
+      <parameter type-id='type-id-923' name='detailed'/>
+      <parameter type-id='type-id-850' 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-771' name='obj'/>
-      <parameter type-id='type-id-420' name='fmt'/>
+      <parameter type-id='type-id-773' name='obj'/>
+      <parameter type-id='type-id-421' name='fmt'/>
       <parameter type-id='type-id-275' 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-771' name='obj'/>
+      <parameter type-id='type-id-773' name='obj'/>
       <parameter type-id='type-id-275' 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-771' name='obj'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-773' name='obj'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-771' name='obj'/>
+      <parameter type-id='type-id-773' 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-771' name='obj'/>
+      <parameter type-id='type-id-773' name='obj'/>
       <parameter type-id='type-id-375' name='fn'/>
-      <parameter type-id='type-id-102' name='userdata'/>
+      <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-913' name='fn'/>
-      <parameter type-id='type-id-102' name='userdata'/>
+      <parameter type-id='type-id-919' name='fn'/>
+      <parameter type-id='type-id-101' name='userdata'/>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_reinit' mangled-name='gnutls_pkcs11_reinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_reinit@@GNUTLS_3_4'>
       <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-771' name='obj'/>
-      <parameter type-id='type-id-429' name='ptr'/>
-      <parameter type-id='type-id-429' name='session'/>
-      <parameter type-id='type-id-429' name='ohandle'/>
-      <parameter type-id='type-id-624' name='slot_id'/>
+      <parameter type-id='type-id-773' 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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-920'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-926'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_ID_HEX' value='1'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_LABEL' value='2'/>
@@ -11790,19 +12061,19 @@
       <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-920' id='type-id-921'/>
+    <typedef-decl name='gnutls_pkcs11_obj_info_t' type-id='type-id-926' id='type-id-927'/>
     <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-771' name='obj'/>
-      <parameter type-id='type-id-921' name='itype'/>
-      <parameter type-id='type-id-102' name='output'/>
-      <parameter type-id='type-id-421' name='output_size'/>
+      <parameter type-id='type-id-773' name='obj'/>
+      <parameter type-id='type-id-927' name='itype'/>
+      <parameter type-id='type-id-101' name='output'/>
+      <parameter type-id='type-id-422' 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-771' name='obj'/>
-      <parameter type-id='type-id-921' name='itype'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <parameter type-id='type-id-773' name='obj'/>
+      <parameter type-id='type-id-927' 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -11817,19 +12088,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-914' name='obj'/>
+      <parameter type-id='type-id-920' 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-771' name='obj'/>
+      <parameter type-id='type-id-773' 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-914' size-in-bits='64' id='type-id-922'/>
+    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-928'/>
     <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-922' name='p_list'/>
-      <parameter type-id='type-id-418' name='n_list'/>
+      <parameter type-id='type-id-928' name='p_list'/>
+      <parameter type-id='type-id-419' 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'/>
@@ -12002,15 +12273,15 @@
     <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-911'>
-      <parameter type-id='type-id-909'/>
-      <parameter type-id='type-id-910'/>
+    <function-type size-in-bits='64' id='type-id-917'>
+      <parameter type-id='type-id-915'/>
+      <parameter type-id='type-id-916'/>
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <class-decl name='gnutls_x509_ext_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-923'>
+  <abi-instr version='1.0' address-size='64' path='pkcs11x.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_x509_ext_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-929'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='oid' type-id='type-id-376' visibility='default'/>
       </data-member>
@@ -12021,13 +12292,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-923' id='type-id-924'/>
-    <pointer-type-def type-id='type-id-924' size-in-bits='64' id='type-id-925'/>
-    <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-926'/>
+    <typedef-decl name='gnutls_x509_ext_st' type-id='type-id-929' id='type-id-930'/>
+    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-931'/>
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-932'/>
     <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-771' name='obj'/>
-      <parameter type-id='type-id-926' name='exts'/>
-      <parameter type-id='type-id-418' name='exts_size'/>
+      <parameter type-id='type-id-773' name='obj'/>
+      <parameter type-id='type-id-932' name='exts'/>
+      <parameter type-id='type-id-419' name='exts_size'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -12053,16 +12324,16 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs11_privkey.c' comp-dir-path='/home/nmavrogi/cvs/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-102' name='userdata'/>
+      <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-420' name='fmt'/>
+      <parameter type-id='type-id-421' name='fmt'/>
       <parameter type-id='type-id-275' name='data'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
@@ -12073,7 +12344,7 @@
       <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-420' name='fmt'/>
+      <parameter type-id='type-id-421' name='fmt'/>
       <parameter type-id='type-id-275' name='pubkey'/>
       <parameter type-id='type-id-10' name='key_usage'/>
       <parameter type-id='type-id-10' name='flags'/>
@@ -12081,8 +12352,8 @@
     </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-917' name='detailed'/>
-      <parameter type-id='type-id-848' name='url'/>
+      <parameter type-id='type-id-923' name='detailed'/>
+      <parameter type-id='type-id-850' 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'>
@@ -12097,14 +12368,14 @@
     </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-921' name='itype'/>
-      <parameter type-id='type-id-102' name='output'/>
-      <parameter type-id='type-id-421' name='output_size'/>
+      <parameter type-id='type-id-927' name='itype'/>
+      <parameter type-id='type-id-101' name='output'/>
+      <parameter type-id='type-id-422' 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-418' name='bits'/>
+      <parameter type-id='type-id-419' 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'>
@@ -12117,7 +12388,7 @@
       <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-755' name='key'/>
+      <parameter type-id='type-id-757' 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'>
@@ -12178,11 +12449,11 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs11_write.c' comp-dir-path='/home/nmavrogi/cvs/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-102' name='rnddata'/>
-      <parameter type-id='type-id-100' name='len'/>
+      <parameter type-id='type-id-101' name='rnddata'/>
+      <parameter type-id='type-id-99' name='len'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_token_set_pin' mangled-name='gnutls_pkcs11_token_set_pin' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_token_set_pin@@GNUTLS_3_4'>
@@ -12214,7 +12485,7 @@
     </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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-275' name='data'/>
       <parameter type-id='type-id-27' name='label'/>
       <parameter type-id='type-id-10' name='flags'/>
@@ -12231,7 +12502,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-465' name='crt'/>
+      <parameter type-id='type-id-467' 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'/>
@@ -12267,15 +12538,15 @@
     <function-decl name='x509_crt_to_raw_pubkey' mangled-name='x509_crt_to_raw_pubkey' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-111'/>
-    </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'>
       <return type-id='type-id-111'/>
     </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'>
       <return type-id='type-id-111'/>
     </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'>
+      <return type-id='type-id-111'/>
+    </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'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -12289,7 +12560,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs11_secret.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -12299,8 +12570,8 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <class-decl name='gnutls_srp_server_credentials_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-927'>
+  <abi-instr version='1.0' address-size='64' path='srp.c' comp-dir-path='/home/nmavrogi/cvs/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-933'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='password_file' type-id='type-id-376' visibility='default'/>
       </data-member>
@@ -12308,21 +12579,24 @@
         <var-decl name='password_conf_file' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='pwd_callback' type-id='type-id-928' visibility='default'/>
+        <var-decl name='pwd_callback' type-id='type-id-934' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='fake_salt_seed' type-id='type-id-62' visibility='default'/>
+        <var-decl name='fake_salt_seed' type-id='type-id-490' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='fake_salt_seed_size' type-id='type-id-10' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='736'>
         <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-929' id='type-id-930'/>
-    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-928'/>
-    <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-931'/>
-    <typedef-decl name='gnutls_srp_server_credentials_t' type-id='type-id-931' id='type-id-932'/>
+    <typedef-decl name='gnutls_srp_server_credentials_function' type-id='type-id-935' id='type-id-936'/>
+    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-934'/>
+    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-937'/>
+    <typedef-decl name='gnutls_srp_server_credentials_t' type-id='type-id-937' id='type-id-938'/>
     <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-932' name='cred'/>
+      <parameter type-id='type-id-938' 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'/>
@@ -12345,7 +12619,7 @@
       <parameter type-id='type-id-236' 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-933'>
+    <class-decl name='gnutls_srp_client_credentials_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-939'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='username' type-id='type-id-376' visibility='default'/>
       </data-member>
@@ -12353,51 +12627,51 @@
         <var-decl name='password' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='get_function' type-id='type-id-934' visibility='default'/>
+        <var-decl name='get_function' type-id='type-id-940' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_srp_client_credentials_function' type-id='type-id-935' id='type-id-936'/>
-    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-934'/>
-    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-937'/>
-    <typedef-decl name='gnutls_srp_client_credentials_t' type-id='type-id-937' id='type-id-938'/>
+    <typedef-decl name='gnutls_srp_client_credentials_function' type-id='type-id-941' id='type-id-942'/>
+    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-940'/>
+    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-943'/>
+    <typedef-decl name='gnutls_srp_client_credentials_t' type-id='type-id-943' id='type-id-944'/>
     <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-938' name='cred'/>
-      <parameter type-id='type-id-934' name='func'/>
+      <parameter type-id='type-id-944' name='cred'/>
+      <parameter type-id='type-id-940' 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-932' name='cred'/>
-      <parameter type-id='type-id-928' name='func'/>
+      <parameter type-id='type-id-938' name='cred'/>
+      <parameter type-id='type-id-934' 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-932' name='res'/>
+      <parameter type-id='type-id-938' 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-932' size-in-bits='64' id='type-id-939'/>
+    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-945'/>
     <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-939' name='sc'/>
+      <parameter type-id='type-id-945' 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-932' name='sc'/>
+      <parameter type-id='type-id-938' 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-938' name='res'/>
+      <parameter type-id='type-id-944' 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-938' size-in-bits='64' id='type-id-940'/>
+    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-946'/>
     <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-940' name='sc'/>
+      <parameter type-id='type-id-946' 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-938' name='sc'/>
+      <parameter type-id='type-id-944' 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'>
@@ -12406,13 +12680,13 @@
     <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-935'>
+    <function-type size-in-bits='64' id='type-id-941'>
       <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-848'/>
-      <parameter type-id='type-id-848'/>
+      <parameter type-id='type-id-850'/>
+      <parameter type-id='type-id-850'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-929'>
+    <function-type size-in-bits='64' id='type-id-935'>
       <parameter type-id='type-id-236'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-275'/>
@@ -12422,16 +12696,16 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib' language='LANG_C99'>
-    <class-decl name='gnutls_psk_server_credentials_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-941'>
+  <abi-instr version='1.0' address-size='64' path='psk.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_psk_server_credentials_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-947'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='password_file' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='pwd_callback' type-id='type-id-942' visibility='default'/>
+        <var-decl name='pwd_callback' type-id='type-id-948' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='dh_params' type-id='type-id-417' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-418' 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'/>
@@ -12440,7 +12714,7 @@
         <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='params_func' type-id='type-id-432' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-433' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='hint' type-id='type-id-376' visibility='default'/>
@@ -12449,18 +12723,18 @@
         <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-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_psk_server_credentials_t' type-id='type-id-945' id='type-id-946'/>
+    <typedef-decl name='gnutls_psk_server_credentials_function' type-id='type-id-949' id='type-id-950'/>
+    <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-948'/>
+    <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-951'/>
+    <typedef-decl name='gnutls_psk_server_credentials_t' type-id='type-id-951' id='type-id-952'/>
     <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-946' name='res'/>
+      <parameter type-id='type-id-952' name='res'/>
       <parameter type-id='type-id-202' 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-946' name='res'/>
-      <parameter type-id='type-id-417' name='dh_params'/>
+      <parameter type-id='type-id-952' name='res'/>
+      <parameter type-id='type-id-418' 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'>
@@ -12471,7 +12745,7 @@
       <parameter type-id='type-id-236' 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-947'>
+    <class-decl name='gnutls_psk_client_credentials_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-953'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='username' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -12479,86 +12753,86 @@
         <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-948' visibility='default'/>
+        <var-decl name='get_function' type-id='type-id-954' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <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-949' id='type-id-950'/>
-    <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-948'/>
-    <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-951'/>
-    <typedef-decl name='gnutls_psk_client_credentials_t' type-id='type-id-951' id='type-id-952'/>
+    <typedef-decl name='gnutls_psk_client_credentials_function' type-id='type-id-955' id='type-id-956'/>
+    <pointer-type-def type-id='type-id-956' size-in-bits='64' id='type-id-954'/>
+    <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-957'/>
+    <typedef-decl name='gnutls_psk_client_credentials_t' type-id='type-id-957' id='type-id-958'/>
     <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-952' name='cred'/>
-      <parameter type-id='type-id-948' name='func'/>
+      <parameter type-id='type-id-958' 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_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-946' name='cred'/>
-      <parameter type-id='type-id-942' name='func'/>
+      <parameter type-id='type-id-952' name='cred'/>
+      <parameter type-id='type-id-948' 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-946' name='res'/>
+      <parameter type-id='type-id-952' 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-946' name='res'/>
+      <parameter type-id='type-id-952' 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-946' size-in-bits='64' id='type-id-953'/>
+    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-959'/>
     <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-953' name='sc'/>
+      <parameter type-id='type-id-959' 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-946' name='sc'/>
+      <parameter type-id='type-id-952' name='sc'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <enum-decl name='gnutls_psk_key_flags' id='type-id-954'>
+    <enum-decl name='gnutls_psk_key_flags' id='type-id-960'>
       <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-954' id='type-id-955'/>
+    <typedef-decl name='gnutls_psk_key_flags' type-id='type-id-960' id='type-id-961'/>
     <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-952' name='res'/>
+      <parameter type-id='type-id-958' name='res'/>
       <parameter type-id='type-id-27' name='username'/>
       <parameter type-id='type-id-57' name='key'/>
-      <parameter type-id='type-id-955' name='flags'/>
+      <parameter type-id='type-id-961' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-956'/>
+    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-962'/>
     <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-956' name='sc'/>
+      <parameter type-id='type-id-962' 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-952' name='sc'/>
+      <parameter type-id='type-id-958' 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-946' name='res'/>
-      <parameter type-id='type-id-432' name='func'/>
+      <parameter type-id='type-id-952' name='res'/>
+      <parameter type-id='type-id-433' name='func'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-949'>
+    <function-type size-in-bits='64' id='type-id-955'>
       <parameter type-id='type-id-236'/>
-      <parameter type-id='type-id-848'/>
+      <parameter type-id='type-id-850'/>
       <parameter type-id='type-id-275'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-943'>
+    <function-type size-in-bits='64' id='type-id-949'>
       <parameter type-id='type-id-236'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-275'/>
       <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/nmavrogi/cvs/gnutls-nmav/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='read-file.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -12578,12 +12852,12 @@
       <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/nmavrogi/cvs/gnutls-nmav/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='asnprintf.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='vasnprintf.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -12591,7 +12865,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='common.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -12653,7 +12927,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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='key_encode.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -12678,11 +12952,8 @@
     <function-decl name='asn1_length_der' mangled-name='asn1_length_der' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </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'>
-      <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='key_decode.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -12692,11 +12963,16 @@
     <function-decl name='gnutls_oid_to_ecc_curve' mangled-name='gnutls_oid_to_ecc_curve' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <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>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='time.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='time.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
+    </function-decl>
+    <function-decl name='_gnutls_utcTime2gtime' mangled-name='_gnutls_utcTime2gtime' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_utcTime2gtime@@GNUTLS_PRIVATE_3_4'>
+      <parameter type-id='type-id-27' name='ttime'/>
+      <return type-id='type-id-17'/>
+    </function-decl>
     <function-decl name='gmtime_r' mangled-name='gmtime_r' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -12704,84 +12980,84 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crl.c' comp-dir-path='/home/nmavrogi/cvs/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-727' name='crls'/>
-      <parameter type-id='type-id-418' name='crl_max'/>
+      <parameter type-id='type-id-729' name='crls'/>
+      <parameter type-id='type-id-419' name='crl_max'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-727' size-in-bits='64' id='type-id-957'/>
+    <pointer-type-def type-id='type-id-729' size-in-bits='64' id='type-id-963'/>
     <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-957' name='crls'/>
-      <parameter type-id='type-id-418' name='size'/>
+      <parameter type-id='type-id-963' name='crls'/>
+      <parameter type-id='type-id-419' name='size'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-421' name='sizeof_data'/>
+      <parameter type-id='type-id-101' name='data'/>
+      <parameter type-id='type-id-422' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-421' name='sizeof_oid'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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'/>
       <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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-421' name='sizeof_oid'/>
+      <parameter type-id='type-id-101' name='oid'/>
+      <parameter type-id='type-id-422' 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-726' name='crl'/>
-      <parameter type-id='type-id-102' name='ret'/>
-      <parameter type-id='type-id-421' name='ret_size'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-728' 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'/>
       <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-726' name='crl'/>
-      <parameter type-id='type-id-102' name='id'/>
-      <parameter type-id='type-id-421' name='id_size'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-728' 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'/>
       <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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-102' name='alt'/>
-      <parameter type-id='type-id-421' name='alt_size'/>
-      <parameter type-id='type-id-418' name='alt_type'/>
-      <parameter type-id='type-id-102' name='serial'/>
-      <parameter type-id='type-id-421' name='serial_size'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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-101' name='serial'/>
+      <parameter type-id='type-id-422' name='serial_size'/>
+      <parameter type-id='type-id-419' 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-726' name='crl'/>
-      <parameter type-id='type-id-420' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-728' name='crl'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-275' 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-958'>
+    <class-decl name='gnutls_x509_crl_iter' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-964'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='rcache' type-id='type-id-387' visibility='default'/>
       </data-member>
@@ -12789,111 +13065,111 @@
         <var-decl name='rcache_idx' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-959'/>
-    <typedef-decl name='gnutls_x509_crl_iter_t' type-id='type-id-959' id='type-id-960'/>
-    <pointer-type-def type-id='type-id-960' size-in-bits='64' id='type-id-961'/>
+    <pointer-type-def type-id='type-id-964' size-in-bits='64' id='type-id-965'/>
+    <typedef-decl name='gnutls_x509_crl_iter_t' type-id='type-id-965' id='type-id-966'/>
+    <pointer-type-def type-id='type-id-966' size-in-bits='64' id='type-id-967'/>
     <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-726' name='crl'/>
-      <parameter type-id='type-id-961' name='iter'/>
+      <parameter type-id='type-id-728' name='crl'/>
+      <parameter type-id='type-id-967' name='iter'/>
       <parameter type-id='type-id-64' name='serial'/>
-      <parameter type-id='type-id-421' name='serial_size'/>
-      <parameter type-id='type-id-512' name='t'/>
+      <parameter type-id='type-id-422' name='serial_size'/>
+      <parameter type-id='type-id-514' 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-960' name='iter'/>
+      <parameter type-id='type-id-966' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-64' name='serial'/>
-      <parameter type-id='type-id-421' name='serial_size'/>
-      <parameter type-id='type-id-512' name='t'/>
+      <parameter type-id='type-id-422' name='serial_size'/>
+      <parameter type-id='type-id-514' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-376' name='sig'/>
-      <parameter type-id='type-id-421' name='sizeof_sig'/>
+      <parameter type-id='type-id-422' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-376' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
+      <parameter type-id='type-id-422' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-275' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-275' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-421' name='sizeof_oid'/>
+      <parameter type-id='type-id-101' name='oid'/>
+      <parameter type-id='type-id-422' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' 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-102' name='buf'/>
-      <parameter type-id='type-id-421' name='sizeof_buf'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-421' name='sizeof_buf'/>
+      <parameter type-id='type-id-422' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' 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-727' name='crl'/>
+      <parameter type-id='type-id-729' 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-726' name='crl'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-728' name='crl'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-275' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -12943,66 +13219,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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crl_write.c' comp-dir-path='/home/nmavrogi/cvs/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-726' name='crl'/>
-      <parameter type-id='type-id-465' name='issuer'/>
+      <parameter type-id='type-id-728' 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-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-726' name='crl'/>
-      <parameter type-id='type-id-102' name='nr'/>
-      <parameter type-id='type-id-100' name='nr_size'/>
+      <parameter type-id='type-id-728' 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-726' name='crl'/>
-      <parameter type-id='type-id-102' name='nr'/>
-      <parameter type-id='type-id-100' name='nr_size'/>
+      <parameter type-id='type-id-728' 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-726' name='crl'/>
-      <parameter type-id='type-id-465' name='crt'/>
+      <parameter type-id='type-id-728' name='crl'/>
+      <parameter type-id='type-id-467' 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-726' name='crl'/>
-      <parameter type-id='type-id-102' name='serial'/>
-      <parameter type-id='type-id-100' name='serial_size'/>
+      <parameter type-id='type-id-728' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' 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-726' name='crl'/>
+      <parameter type-id='type-id-728' 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-726' name='crl'/>
-      <parameter type-id='type-id-465' name='issuer'/>
+      <parameter type-id='type-id-728' name='crl'/>
+      <parameter type-id='type-id-467' name='issuer'/>
       <parameter type-id='type-id-383' 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-726' name='crl'/>
-      <parameter type-id='type-id-465' name='issuer'/>
+      <parameter type-id='type-id-728' 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-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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-10' name='version'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -13022,107 +13298,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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crq.c' comp-dir-path='/home/nmavrogi/cvs/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-764' name='crq'/>
-      <parameter type-id='type-id-754' name='spki'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-756' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
-      <parameter type-id='type-id-102' name='buf'/>
-      <parameter type-id='type-id-100' name='sizeof_buf'/>
+      <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-962'>
+    <class-decl name='gnutls_x509_tlsfeatures_st' size-in-bits='544' is-struct='yes' visibility='default' id='type-id-968'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='feature' type-id='type-id-963' visibility='default'/>
+        <var-decl name='feature' type-id='type-id-969' 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-963'>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='512' id='type-id-969'>
       <subrange length='32' type-id='type-id-38' id='type-id-51'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-962' size-in-bits='64' id='type-id-964'/>
-    <typedef-decl name='gnutls_x509_tlsfeatures_t' type-id='type-id-964' id='type-id-965'/>
+    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-970'/>
+    <typedef-decl name='gnutls_x509_tlsfeatures_t' type-id='type-id-970' id='type-id-971'/>
     <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-764' name='crq'/>
-      <parameter type-id='type-id-965' name='features'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-971' 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-764' name='crq'/>
-      <parameter type-id='type-id-965' name='features'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-971' name='features'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-419' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-401' name='key'/>
       <parameter type-id='type-id-211' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-422' 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-764' name='crq'/>
-      <parameter type-id='type-id-102' name='oid'/>
+      <parameter type-id='type-id-766' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-421' name='sizeof_oid'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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'/>
       <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-764' name='crq'/>
+      <parameter type-id='type-id-766' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <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-966'>
+    <enum-decl name='gnutls_x509_subject_alt_name_t' id='type-id-972'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_SAN_DNSNAME' value='1'/>
       <enumerator name='GNUTLS_SAN_RFC822NAME' value='2'/>
@@ -13130,265 +13406,266 @@
       <enumerator name='GNUTLS_SAN_IPADDRESS' value='4'/>
       <enumerator name='GNUTLS_SAN_OTHERNAME' value='5'/>
       <enumerator name='GNUTLS_SAN_DN' value='6'/>
-      <enumerator name='GNUTLS_SAN_MAX' value='6'/>
+      <enumerator name='GNUTLS_SAN_REGISTERED_ID' value='7'/>
+      <enumerator name='GNUTLS_SAN_MAX' value='7'/>
       <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-966' id='type-id-967'/>
+    <typedef-decl name='gnutls_x509_subject_alt_name_t' type-id='type-id-972' id='type-id-973'/>
     <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-764' name='crq'/>
-      <parameter type-id='type-id-967' name='nt'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-973' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' 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-418' name='critical'/>
+      <parameter type-id='type-id-419' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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'/>
       <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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ret'/>
-      <parameter type-id='type-id-421' name='ret_size'/>
+      <parameter type-id='type-id-101' name='ret'/>
+      <parameter type-id='type-id-422' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ret'/>
-      <parameter type-id='type-id-421' name='ret_size'/>
-      <parameter type-id='type-id-418' name='ret_type'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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'/>
       <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-764' name='crq'/>
-      <parameter type-id='type-id-418' name='critical'/>
-      <parameter type-id='type-id-418' name='ca'/>
+      <parameter type-id='type-id-766' 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'/>
       <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-764' name='crq'/>
-      <parameter type-id='type-id-418' name='key_usage'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-419' name='key_usage'/>
+      <parameter type-id='type-id-419' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-275' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-421' name='sizeof_data'/>
+      <parameter type-id='type-id-101' name='data'/>
+      <parameter type-id='type-id-422' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-421' name='sizeof_oid'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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'/>
       <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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-421' name='sizeof_data'/>
+      <parameter type-id='type-id-101' name='data'/>
+      <parameter type-id='type-id-422' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-421' name='sizeof_data'/>
+      <parameter type-id='type-id-101' name='data'/>
+      <parameter type-id='type-id-422' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-376' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
+      <parameter type-id='type-id-422' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-376' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
+      <parameter type-id='type-id-422' 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-764' name='crq'/>
-      <parameter type-id='type-id-753' name='spki'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-755' 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-764' name='crq'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-275' 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-764' name='crq'/>
-      <parameter type-id='type-id-420' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-383' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-383' name='key'/>
       <parameter type-id='type-id-211' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-275' name='m'/>
       <parameter type-id='type-id-275' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-383' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-10' name='sizeof_data'/>
       <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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
-      <parameter type-id='type-id-102' name='buf'/>
-      <parameter type-id='type-id-100' name='buf_size'/>
+      <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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-376' name='pass'/>
-      <parameter type-id='type-id-421' name='pass_size'/>
+      <parameter type-id='type-id-422' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-421' name='sizeof_oid'/>
+      <parameter type-id='type-id-101' name='oid'/>
+      <parameter type-id='type-id-422' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' 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-102' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-275' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-275' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <parameter type-id='type-id-422' 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-764' name='crq'/>
-      <parameter type-id='type-id-512' name='activation'/>
-      <parameter type-id='type-id-512' name='expiration'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-766' 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'/>
       <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-764' name='crq'/>
+      <parameter type-id='type-id-766' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-968'/>
+    <pointer-type-def type-id='type-id-766' size-in-bits='64' id='type-id-974'/>
     <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-968' name='crq'/>
+      <parameter type-id='type-id-974' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' 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-764' name='crq'/>
-      <parameter type-id='type-id-418' name='bits'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-419' 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'>
@@ -13473,12 +13750,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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dn.c' comp-dir-path='/home/nmavrogi/cvs/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-102' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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'>
@@ -13486,8 +13763,8 @@
       <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-102' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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'>
@@ -13499,7 +13776,7 @@
     <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-421' name='buf_size'/>
+      <parameter type-id='type-id-422' 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'>
@@ -13524,20 +13801,15 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='attributes.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
-    <function-decl name='_gnutls_x509_write_value' mangled-name='_gnutls_x509_write_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='extensions.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='extensions.c' comp-dir-path='/home/nmavrogi/cvs/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-726' name='crl'/>
+      <parameter type-id='type-id-728' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-275' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-275' name='data'/>
       <return type-id='type-id-22'/>
@@ -13576,7 +13848,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='mpi.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -13590,8 +13862,8 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
-    <enum-decl name='gnutls_certificate_print_formats' id='type-id-969'>
+  <abi-instr version='1.0' address-size='64' path='output.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/x509' language='LANG_C99'>
+    <enum-decl name='gnutls_certificate_print_formats' id='type-id-975'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_CRT_PRINT_FULL' value='0'/>
       <enumerator name='GNUTLS_CRT_PRINT_ONELINE' value='1'/>
@@ -13599,35 +13871,35 @@
       <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-969' id='type-id-970'/>
+    <typedef-decl name='gnutls_certificate_print_formats_t' type-id='type-id-975' id='type-id-976'/>
     <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-925' name='exts'/>
+      <parameter type-id='type-id-931' name='exts'/>
       <parameter type-id='type-id-10' name='exts_size'/>
-      <parameter type-id='type-id-970' name='format'/>
+      <parameter type-id='type-id-976' name='format'/>
       <parameter type-id='type-id-275' 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-970' name='format'/>
+      <parameter type-id='type-id-976' name='format'/>
       <parameter type-id='type-id-275' 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-764' name='crq'/>
-      <parameter type-id='type-id-970' name='format'/>
+      <parameter type-id='type-id-766' name='crq'/>
+      <parameter type-id='type-id-976' name='format'/>
       <parameter type-id='type-id-275' 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-726' name='crl'/>
-      <parameter type-id='type-id-970' name='format'/>
+      <parameter type-id='type-id-728' name='crl'/>
+      <parameter type-id='type-id-976' name='format'/>
       <parameter type-id='type-id-275' 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-465' name='cert'/>
-      <parameter type-id='type-id-970' name='format'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-976' name='format'/>
       <parameter type-id='type-id-275' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -13890,8 +14162,8 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
-    <class-decl name='gnutls_pkcs12_int' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-971'>
+  <abi-instr version='1.0' address-size='64' path='pkcs12.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/x509' language='LANG_C99'>
+    <class-decl name='gnutls_pkcs12_int' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-977'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pkcs12' type-id='type-id-387' visibility='default'/>
       </data-member>
@@ -13899,59 +14171,59 @@
         <var-decl name='expanded' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-971' size-in-bits='64' id='type-id-972'/>
-    <typedef-decl name='gnutls_pkcs12_t' type-id='type-id-972' id='type-id-973'/>
+    <pointer-type-def type-id='type-id-977' size-in-bits='64' id='type-id-978'/>
+    <typedef-decl name='gnutls_pkcs12_t' type-id='type-id-978' id='type-id-979'/>
     <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-973' name='pkcs12'/>
-      <parameter type-id='type-id-418' name='mac'/>
-      <parameter type-id='type-id-102' name='salt'/>
-      <parameter type-id='type-id-418' name='salt_size'/>
-      <parameter type-id='type-id-418' name='iter_count'/>
-      <parameter type-id='type-id-848' name='oid'/>
+      <parameter type-id='type-id-979' name='pkcs12'/>
+      <parameter type-id='type-id-419' 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-850' 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-973' name='p12'/>
+      <parameter type-id='type-id-979' name='p12'/>
       <parameter type-id='type-id-27' name='password'/>
-      <parameter type-id='type-id-730' name='key'/>
-      <parameter type-id='type-id-729' name='chain'/>
-      <parameter type-id='type-id-418' name='chain_len'/>
-      <parameter type-id='type-id-729' name='extra_certs'/>
-      <parameter type-id='type-id-418' name='extra_certs_len'/>
-      <parameter type-id='type-id-727' name='crl'/>
+      <parameter type-id='type-id-732' name='key'/>
+      <parameter type-id='type-id-731' name='chain'/>
+      <parameter type-id='type-id-419' name='chain_len'/>
+      <parameter type-id='type-id-731' name='extra_certs'/>
+      <parameter type-id='type-id-419' name='extra_certs_len'/>
+      <parameter type-id='type-id-729' 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-973' name='pkcs12'/>
+      <parameter type-id='type-id-979' 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-973' name='pkcs12'/>
+      <parameter type-id='type-id-979' 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-973' name='pkcs12'/>
+      <parameter type-id='type-id-979' 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-974'>
+    <class-decl name='gnutls_pkcs12_bag_int' size-in-bits='12352' is-struct='yes' visibility='default' id='type-id-980'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='element' type-id='type-id-975' visibility='default'/>
+        <var-decl name='element' type-id='type-id-981' 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-976'>
+    <class-decl name='bag_element' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-982'>
       <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-977' visibility='default'/>
+        <var-decl name='type' type-id='type-id-983' 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'/>
@@ -13960,7 +14232,7 @@
         <var-decl name='friendly_name' type-id='type-id-376' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='gnutls_pkcs12_bag_type_t' id='type-id-978'>
+    <enum-decl name='gnutls_pkcs12_bag_type_t' id='type-id-984'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_BAG_EMPTY' value='0'/>
       <enumerator name='GNUTLS_BAG_PKCS8_ENCRYPTED_KEY' value='1'/>
@@ -13971,52 +14243,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-978' id='type-id-977'/>
+    <typedef-decl name='gnutls_pkcs12_bag_type_t' type-id='type-id-984' id='type-id-983'/>
 
-    <array-type-def dimensions='1' type-id='type-id-976' size-in-bits='12288' id='type-id-975'>
+    <array-type-def dimensions='1' type-id='type-id-982' size-in-bits='12288' id='type-id-981'>
       <subrange length='32' type-id='type-id-38' id='type-id-51'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-974' size-in-bits='64' id='type-id-979'/>
-    <typedef-decl name='gnutls_pkcs12_bag_t' type-id='type-id-979' id='type-id-980'/>
+    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-985'/>
+    <typedef-decl name='gnutls_pkcs12_bag_t' type-id='type-id-985' id='type-id-986'/>
     <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-973' name='pkcs12'/>
-      <parameter type-id='type-id-980' name='bag'/>
+      <parameter type-id='type-id-979' name='pkcs12'/>
+      <parameter type-id='type-id-986' 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-973' name='pkcs12'/>
+      <parameter type-id='type-id-979' name='pkcs12'/>
       <parameter type-id='type-id-22' name='indx'/>
-      <parameter type-id='type-id-980' name='bag'/>
+      <parameter type-id='type-id-986' 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-973' name='pkcs12'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-979' name='pkcs12'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-275' 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-973' name='pkcs12'/>
-      <parameter type-id='type-id-420' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-979' name='pkcs12'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-973' name='pkcs12'/>
+      <parameter type-id='type-id-979' name='pkcs12'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-973' name='pkcs12'/>
+      <parameter type-id='type-id-979' name='pkcs12'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-973' size-in-bits='64' id='type-id-981'/>
+    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-987'/>
     <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-981' name='pkcs12'/>
+      <parameter type-id='type-id-987' 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'>
@@ -14071,97 +14343,97 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs12_bag.c' comp-dir-path='/home/nmavrogi/cvs/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-980' name='bag'/>
+      <parameter type-id='type-id-986' name='bag'/>
       <parameter type-id='type-id-383' 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-980' name='bag'/>
-      <parameter type-id='type-id-418' name='schema'/>
-      <parameter type-id='type-id-418' name='cipher'/>
-      <parameter type-id='type-id-102' name='salt'/>
-      <parameter type-id='type-id-418' name='salt_size'/>
-      <parameter type-id='type-id-418' name='iter_count'/>
-      <parameter type-id='type-id-848' name='oid'/>
+      <parameter type-id='type-id-986' name='bag'/>
+      <parameter type-id='type-id-419' name='schema'/>
+      <parameter type-id='type-id-419' 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-850' 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-980' name='bag'/>
+      <parameter type-id='type-id-986' 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-980' name='bag'/>
+      <parameter type-id='type-id-986' 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-980' name='bag'/>
+      <parameter type-id='type-id-986' 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-980' name='bag'/>
+      <parameter type-id='type-id-986' name='bag'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-848' name='name'/>
+      <parameter type-id='type-id-850' 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-980' name='bag'/>
+      <parameter type-id='type-id-986' name='bag'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-275' 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-980' name='bag'/>
+      <parameter type-id='type-id-986' 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-980' name='bag'/>
-      <parameter type-id='type-id-726' name='crl'/>
+      <parameter type-id='type-id-986' name='bag'/>
+      <parameter type-id='type-id-728' 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-980' name='bag'/>
-      <parameter type-id='type-id-465' name='crt'/>
+      <parameter type-id='type-id-986' name='bag'/>
+      <parameter type-id='type-id-467' 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-980' name='bag'/>
-      <parameter type-id='type-id-977' name='type'/>
+      <parameter type-id='type-id-986' name='bag'/>
+      <parameter type-id='type-id-983' 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-980' name='bag'/>
+      <parameter type-id='type-id-986' name='bag'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-275' 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-980' name='bag'/>
+      <parameter type-id='type-id-986' 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-980' name='bag'/>
+      <parameter type-id='type-id-986' 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-980' name='bag'/>
+      <parameter type-id='type-id-986' name='bag'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-982'/>
+    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-988'/>
     <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-982' name='bag'/>
+      <parameter type-id='type-id-988' 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'>
@@ -14189,12 +14461,11 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-983'/>
+  <abi-instr version='1.0' address-size='64' path='pkcs12_encr.c' comp-dir-path='/home/nmavrogi/cvs/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-983' name='salt'/>
+      <parameter type-id='type-id-898' 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'/>
@@ -14206,13 +14477,13 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
-    <class-decl name='gnutls_pkcs7_int' size-in-bits='1344' is-struct='yes' visibility='default' id='type-id-984'>
+  <abi-instr version='1.0' address-size='64' path='pkcs7.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/x509' language='LANG_C99'>
+    <class-decl name='gnutls_pkcs7_int' size-in-bits='1344' is-struct='yes' visibility='default' id='type-id-989'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pkcs7' type-id='type-id-387' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='encap_data_oid' type-id='type-id-985' visibility='default'/>
+        <var-decl name='encap_data_oid' type-id='type-id-990' 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'/>
@@ -14225,13 +14496,13 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='1024' id='type-id-985'>
-      <subrange length='128' type-id='type-id-38' id='type-id-986'/>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='1024' id='type-id-990'>
+      <subrange length='128' type-id='type-id-38' id='type-id-991'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-984' size-in-bits='64' id='type-id-987'/>
-    <typedef-decl name='gnutls_pkcs7_t' type-id='type-id-987' id='type-id-988'/>
-    <class-decl name='gnutls_pkcs7_attrs_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-989'>
+    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-992'/>
+    <typedef-decl name='gnutls_pkcs7_t' type-id='type-id-992' id='type-id-993'/>
+    <class-decl name='gnutls_pkcs7_attrs_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-994'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='oid' type-id='type-id-376' visibility='default'/>
       </data-member>
@@ -14239,85 +14510,85 @@
         <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-990' visibility='default'/>
+        <var-decl name='next' type-id='type-id-995' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-990'/>
-    <typedef-decl name='gnutls_pkcs7_attrs_t' type-id='type-id-990' id='type-id-991'/>
+    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-995'/>
+    <typedef-decl name='gnutls_pkcs7_attrs_t' type-id='type-id-995' id='type-id-996'/>
     <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-988' name='pkcs7'/>
-      <parameter type-id='type-id-465' name='signer'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
+      <parameter type-id='type-id-467' name='signer'/>
       <parameter type-id='type-id-401' name='signer_key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-991' name='signed_attrs'/>
-      <parameter type-id='type-id-991' name='unsigned_attrs'/>
+      <parameter type-id='type-id-996' name='signed_attrs'/>
+      <parameter type-id='type-id-996' name='unsigned_attrs'/>
       <parameter type-id='type-id-211' 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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' 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-988' name='pkcs7'/>
-      <parameter type-id='type-id-726' name='crl'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
+      <parameter type-id='type-id-728' 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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' 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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' 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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='crl'/>
-      <parameter type-id='type-id-421' name='crl_size'/>
+      <parameter type-id='type-id-101' name='crl'/>
+      <parameter type-id='type-id-422' 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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-275' 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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' 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-988' name='pkcs7'/>
-      <parameter type-id='type-id-465' name='crt'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
+      <parameter type-id='type-id-467' 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-988' name='pkcs7'/>
-      <parameter type-id='type-id-57' name='crt'/>
+      <parameter type-id='type-id-993' 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-988' name='pkcs7'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-275' 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-988' name='pkcs7'/>
-      <parameter type-id='type-id-420' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-988' name='pkcs7'/>
-      <parameter type-id='type-id-713' name='tl'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
+      <parameter type-id='type-id-715' name='tl'/>
       <parameter type-id='type-id-172' name='vdata'/>
       <parameter type-id='type-id-10' name='vdata_size'/>
       <parameter type-id='type-id-10' name='idx'/>
@@ -14326,24 +14597,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-988' name='pkcs7'/>
-      <parameter type-id='type-id-465' name='signer'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
+      <parameter type-id='type-id-467' 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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' 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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-275' 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-992'>
+    <class-decl name='gnutls_pkcs7_signature_info_st' size-in-bits='1280' is-struct='yes' visibility='default' id='type-id-997'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='algo' type-id='type-id-21' visibility='default'/>
       </data-member>
@@ -14363,66 +14634,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-991' visibility='default'/>
+        <var-decl name='signed_attrs' type-id='type-id-996' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='unsigned_attrs' type-id='type-id-991' visibility='default'/>
+        <var-decl name='unsigned_attrs' type-id='type-id-996' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='pad' type-id='type-id-993' visibility='default'/>
+        <var-decl name='pad' type-id='type-id-998' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='512' id='type-id-993'>
-      <subrange length='64' type-id='type-id-38' id='type-id-93'/>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='512' id='type-id-998'>
+      <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-992' id='type-id-994'/>
-    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-995'/>
+    <typedef-decl name='gnutls_pkcs7_signature_info_st' type-id='type-id-997' id='type-id-999'/>
+    <pointer-type-def type-id='type-id-999' size-in-bits='64' id='type-id-1000'/>
     <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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-995' name='info'/>
+      <parameter type-id='type-id-1000' 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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' 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-995' name='info'/>
+      <parameter type-id='type-id-1000' 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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='certificate'/>
-      <parameter type-id='type-id-421' name='certificate_size'/>
+      <parameter type-id='type-id-101' name='certificate'/>
+      <parameter type-id='type-id-422' 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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-275' 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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-996'/>
+    <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-1001'/>
     <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-996' name='pkcs7'/>
+      <parameter type-id='type-id-1001' 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-988' name='pkcs7'/>
+      <parameter type-id='type-id-993' 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'>
@@ -14474,29 +14745,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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs7-attrs.c' comp-dir-path='/home/nmavrogi/cvs/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-991' name='list'/>
+      <parameter type-id='type-id-996' 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-991' name='list'/>
+      <parameter type-id='type-id-996' name='list'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-848' name='oid'/>
+      <parameter type-id='type-id-850' name='oid'/>
       <parameter type-id='type-id-275' 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-991' size-in-bits='64' id='type-id-997'/>
+    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-1002'/>
     <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-997' name='list'/>
+      <parameter type-id='type-id-1002' name='list'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-275' 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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs7-crypt.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -14524,7 +14795,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='privkey.c' comp-dir-path='/home/nmavrogi/cvs/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-10' name='flags'/>
@@ -14533,7 +14804,7 @@
     <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-102' name='userdata'/>
+      <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'>
@@ -14541,8 +14812,8 @@
       <parameter type-id='type-id-211' name='digest'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-102' name='signature'/>
-      <parameter type-id='type-id-421' name='signature_size'/>
+      <parameter type-id='type-id-101' name='signature'/>
+      <parameter type-id='type-id-422' 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'>
@@ -14555,7 +14826,7 @@
       <parameter type-id='type-id-383' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-422' 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'>
@@ -14565,20 +14836,20 @@
     <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-102' name='seed'/>
-      <parameter type-id='type-id-100' name='seed_size'/>
+      <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-430' name='digest'/>
-      <parameter type-id='type-id-102' name='seed'/>
-      <parameter type-id='type-id-421' name='seed_size'/>
+      <parameter type-id='type-id-431' name='digest'/>
+      <parameter type-id='type-id-101' name='seed'/>
+      <parameter type-id='type-id-422' 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-998'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-1003'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-758' visibility='default'/>
+        <var-decl name='type' type-id='type-id-760' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data' type-id='type-id-64' visibility='default'/>
@@ -14592,7 +14863,7 @@
       <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-761' name='data'/>
+      <parameter type-id='type-id-763' name='data'/>
       <parameter type-id='type-id-10' name='data_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -14636,9 +14907,9 @@
     </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-709' name='curve'/>
-      <parameter type-id='type-id-430' name='digest'/>
-      <parameter type-id='type-id-710' name='paramset'/>
+      <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'/>
@@ -14646,7 +14917,7 @@
     </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-709' name='curve'/>
+      <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'/>
@@ -14658,26 +14929,26 @@
     </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-420' name='format'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-275' 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-420' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-754' name='spki'/>
+      <parameter type-id='type-id-756' 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-753' name='spki'/>
+      <parameter type-id='type-id-755' name='spki'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -14737,7 +15008,7 @@
     <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-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
@@ -14745,7 +15016,7 @@
     <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-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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'>
@@ -14754,7 +15025,7 @@
       <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-730' name='key'/>
+      <parameter type-id='type-id-732' 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'>
@@ -14763,7 +15034,7 @@
     </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-418' name='bits'/>
+      <parameter type-id='type-id-419' 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'>
@@ -14783,18 +15054,18 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='privkey_pkcs8.c' comp-dir-path='/home/nmavrogi/cvs/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-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-420' name='format'/>
+      <parameter type-id='type-id-421' 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'/>
@@ -14802,22 +15073,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-420' name='format'/>
-      <parameter type-id='type-id-418' name='schema'/>
-      <parameter type-id='type-id-418' name='cipher'/>
-      <parameter type-id='type-id-102' name='salt'/>
-      <parameter type-id='type-id-418' name='salt_size'/>
-      <parameter type-id='type-id-418' name='iter_count'/>
-      <parameter type-id='type-id-848' name='oid'/>
+      <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-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-850' 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-420' name='format'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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'>
@@ -14844,6 +15115,9 @@
     <function-decl name='_gnutls_privkey_decode_pkcs1_rsa_key' mangled-name='_gnutls_privkey_decode_pkcs1_rsa_key' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='_x509_encode_provable_seed' mangled-name='_x509_encode_provable_seed' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_x509_read_key_int_le' mangled-name='_gnutls_x509_read_key_int_le' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -14859,11 +15133,8 @@
     <function-decl name='_gnutls_pkcs_raw_decrypt_data' mangled-name='_gnutls_pkcs_raw_decrypt_data' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_x509_encode_provable_seed' mangled-name='_x509_encode_provable_seed' 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='privkey_pkcs8_pbes1.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='privkey_pkcs8_pbes1.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -14874,7 +15145,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='privkey_openssl.c' comp-dir-path='/home/nmavrogi/cvs/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-57' name='data'/>
@@ -14891,22 +15162,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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='hostname-verify.c' comp-dir-path='/home/nmavrogi/cvs/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-465' name='cert'/>
+      <parameter type-id='type-id-467' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-346' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-27' name='hostname'/>
       <return type-id='type-id-10'/>
     </function-decl>
@@ -14917,51 +15188,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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='sign.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-465' const='yes' id='type-id-999'/>
-    <pointer-type-def type-id='type-id-999' size-in-bits='64' id='type-id-1000'/>
+  <abi-instr version='1.0' address-size='64' path='verify.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/x509' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-467' const='yes' id='type-id-1004'/>
+    <pointer-type-def type-id='type-id-1004' size-in-bits='64' id='type-id-1005'/>
     <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-726' name='crl'/>
-      <parameter type-id='type-id-1000' name='trusted_cas'/>
+      <parameter type-id='type-id-728' name='crl'/>
+      <parameter type-id='type-id-1005' 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-418' name='verify'/>
+      <parameter type-id='type-id-419' 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-726' name='crl'/>
-      <parameter type-id='type-id-465' name='issuer'/>
+      <parameter type-id='type-id-728' name='crl'/>
+      <parameter type-id='type-id-467' 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-465' name='cert'/>
-      <parameter type-id='type-id-1000' name='CA_list'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-1005' 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-418' name='verify'/>
+      <parameter type-id='type-id-419' name='verify'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-726' const='yes' id='type-id-1001'/>
-    <pointer-type-def type-id='type-id-1001' size-in-bits='64' id='type-id-1002'/>
+    <qualified-type-def type-id='type-id-728' const='yes' id='type-id-1006'/>
+    <pointer-type-def type-id='type-id-1006' size-in-bits='64' id='type-id-1007'/>
     <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-1000' name='cert_list'/>
+      <parameter type-id='type-id-1005' name='cert_list'/>
       <parameter type-id='type-id-10' name='cert_list_length'/>
-      <parameter type-id='type-id-1000' name='CA_list'/>
+      <parameter type-id='type-id-1005' name='CA_list'/>
       <parameter type-id='type-id-10' name='CA_list_length'/>
-      <parameter type-id='type-id-1002' name='CRL_list'/>
+      <parameter type-id='type-id-1007' 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-418' name='verify'/>
+      <parameter type-id='type-id-419' 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-465' name='cert'/>
-      <parameter type-id='type-id-465' name='issuer'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-467' 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'>
@@ -14995,14 +15266,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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509.c' comp-dir-path='/home/nmavrogi/cvs/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-465' name='cert'/>
+      <parameter type-id='type-id-467' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' 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'/>
@@ -15010,64 +15281,64 @@
       <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-729' name='certs'/>
-      <parameter type-id='type-id-418' name='size'/>
+      <parameter type-id='type-id-731' name='certs'/>
+      <parameter type-id='type-id-419' name='size'/>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-375' name='pin_fn'/>
-      <parameter type-id='type-id-102' name='pin_fn_userdata'/>
+      <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-465' name='crt'/>
+      <parameter type-id='type-id-467' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-375' name='fn'/>
-      <parameter type-id='type-id-102' name='userdata'/>
+      <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-465' name='crt'/>
+      <parameter type-id='type-id-467' 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-418' name='critical'/>
+      <parameter type-id='type-id-419' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <parameter type-id='type-id-422' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <parameter type-id='type-id-422' 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-456' name='certs'/>
-      <parameter type-id='type-id-418' name='cert_max'/>
+      <parameter type-id='type-id-458' name='certs'/>
+      <parameter type-id='type-id-419' name='cert_max'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-729' name='certs'/>
-      <parameter type-id='type-id-418' name='size'/>
+      <parameter type-id='type-id-731' name='certs'/>
+      <parameter type-id='type-id-419' name='size'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-465' name='crt'/>
+      <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'/>
@@ -15075,146 +15346,146 @@
       <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-465' name='crt'/>
-      <parameter type-id='type-id-709' name='curve'/>
-      <parameter type-id='type-id-430' name='digest'/>
-      <parameter type-id='type-id-710' name='paramset'/>
+      <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'/>
       <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-465' name='crt'/>
-      <parameter type-id='type-id-709' name='curve'/>
+      <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'/>
       <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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-275' name='m'/>
       <parameter type-id='type-id-275' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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'/>
       <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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-102' name='san'/>
-      <parameter type-id='type-id-421' name='san_size'/>
-      <parameter type-id='type-id-418' name='reason_flags'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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'/>
       <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-465' name='crt'/>
-      <parameter type-id='type-id-430' name='hash'/>
-      <parameter type-id='type-id-418' name='mand'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-431' name='hash'/>
+      <parameter type-id='type-id-419' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' 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-465' name='cert'/>
-      <parameter type-id='type-id-1002' name='crl_list'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-1007' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
-      <parameter type-id='type-id-420' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-211' name='algo'/>
-      <parameter type-id='type-id-102' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' name='buf_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-463' size-in-bits='64' id='type-id-1003'/>
-    <typedef-decl name='gnutls_x509_dn_t' type-id='type-id-1003' id='type-id-1004'/>
-    <pointer-type-def type-id='type-id-1004' size-in-bits='64' id='type-id-1005'/>
+    <pointer-type-def type-id='type-id-465' size-in-bits='64' id='type-id-1008'/>
+    <typedef-decl name='gnutls_x509_dn_t' type-id='type-id-1008' id='type-id-1009'/>
+    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1010'/>
     <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-465' name='cert'/>
-      <parameter type-id='type-id-1005' name='dn'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-1010' 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-465' name='cert'/>
-      <parameter type-id='type-id-1005' name='dn'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-1010' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-275' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-275' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-421' name='sizeof_data'/>
+      <parameter type-id='type-id-101' name='data'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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'/>
       <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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
+      <parameter type-id='type-id-101' name='oid'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' 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-418' name='critical'/>
+      <parameter type-id='type-id-419' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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'/>
       <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-1006'>
+    <class-decl name='gnutls_x509_policy_st' size-in-bits='1664' is-struct='yes' visibility='default' id='type-id-1011'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='oid' type-id='type-id-376' visibility='default'/>
       </data-member>
@@ -15222,12 +15493,12 @@
         <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-1007' visibility='default'/>
+        <var-decl name='qualifier' type-id='type-id-1012' 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-1008'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-1013'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-1009' visibility='default'/>
+        <var-decl name='type' type-id='type-id-1014' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data' type-id='type-id-376' visibility='default'/>
@@ -15236,288 +15507,288 @@
         <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-1010'>
+    <enum-decl name='gnutls_x509_qualifier_t' id='type-id-1015'>
       <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-1010' id='type-id-1009'/>
+    <typedef-decl name='gnutls_x509_qualifier_t' type-id='type-id-1015' id='type-id-1014'/>
 
-    <array-type-def dimensions='1' type-id='type-id-1008' size-in-bits='1536' id='type-id-1007'>
-      <subrange length='8' type-id='type-id-38' id='type-id-133'/>
+    <array-type-def dimensions='1' type-id='type-id-1013' size-in-bits='1536' id='type-id-1012'>
+      <subrange length='8' type-id='type-id-38' id='type-id-455'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-1006' size-in-bits='64' id='type-id-1011'/>
+    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-1016'/>
     <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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-1011' name='policy'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-1016' name='policy'/>
+      <parameter type-id='type-id-419' 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-1011' name='policy'/>
+      <parameter type-id='type-id-1016' 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-465' name='cert'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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-848' name='policyLanguage'/>
-      <parameter type-id='type-id-848' name='policy'/>
-      <parameter type-id='type-id-421' name='sizeof_policy'/>
+      <parameter type-id='type-id-850' name='policyLanguage'/>
+      <parameter type-id='type-id-850' name='policy'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
-      <parameter type-id='type-id-418' name='skipcerts'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-419' name='skipcerts'/>
+      <parameter type-id='type-id-419' 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-465' name='cert'/>
-      <parameter type-id='type-id-418' name='skipcerts'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-419' name='skipcerts'/>
+      <parameter type-id='type-id-419' 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-465' name='cert'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-419' 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-465' name='cert'/>
-      <parameter type-id='type-id-418' name='critical'/>
-      <parameter type-id='type-id-418' name='ca'/>
+      <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'/>
       <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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ret'/>
-      <parameter type-id='type-id-421' name='ret_size'/>
+      <parameter type-id='type-id-101' name='ret'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ret'/>
-      <parameter type-id='type-id-421' name='ret_size'/>
+      <parameter type-id='type-id-101' name='ret'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ian'/>
-      <parameter type-id='type-id-421' name='ian_size'/>
-      <parameter type-id='type-id-418' name='ian_type'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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'/>
       <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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ian'/>
-      <parameter type-id='type-id-421' name='ian_size'/>
-      <parameter type-id='type-id-418' name='ian_type'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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'/>
       <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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ian'/>
-      <parameter type-id='type-id-421' name='ian_size'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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'/>
       <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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ian'/>
-      <parameter type-id='type-id-421' name='ian_size'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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'/>
       <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-465' name='cert'/>
-      <parameter type-id='type-id-753' name='spki'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-755' 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-465' name='cert'/>
-      <parameter type-id='type-id-102' name='id'/>
-      <parameter type-id='type-id-421' name='id_size'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-467' 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'/>
       <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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-102' name='alt'/>
-      <parameter type-id='type-id-421' name='alt_size'/>
-      <parameter type-id='type-id-418' name='alt_type'/>
-      <parameter type-id='type-id-102' name='serial'/>
-      <parameter type-id='type-id-421' name='serial_size'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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-101' name='serial'/>
+      <parameter type-id='type-id-422' name='serial_size'/>
+      <parameter type-id='type-id-419' 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-465' name='cert'/>
-      <parameter type-id='type-id-102' name='ret'/>
-      <parameter type-id='type-id-421' name='ret_size'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-467' 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'/>
       <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-465' name='cert'/>
-      <parameter type-id='type-id-512' name='activation'/>
-      <parameter type-id='type-id-512' name='expiration'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <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'/>
       <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-465' name='cert'/>
+      <parameter type-id='type-id-467' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-376' name='sig'/>
-      <parameter type-id='type-id-421' name='sig_size'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-376' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-376' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
+      <parameter type-id='type-id-101' name='oid'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' 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-102' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-275' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-275' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-421' name='oid_size'/>
+      <parameter type-id='type-id-101' name='oid'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' 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-102' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-275' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-275' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-376' name='buf'/>
-      <parameter type-id='type-id-421' name='buf_size'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' name='cert'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' 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-456' name='cert'/>
+      <parameter type-id='type-id-458' 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-465' name='cert1'/>
-      <parameter type-id='type-id-465' name='cert2'/>
+      <parameter type-id='type-id-467' name='cert1'/>
+      <parameter type-id='type-id-467' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' 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-465' name='cert'/>
-      <parameter type-id='type-id-102' name='result'/>
-      <parameter type-id='type-id-421' name='result_size'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-101' name='result'/>
+      <parameter type-id='type-id-422' 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-465' name='cert'/>
-      <parameter type-id='type-id-418' name='bits'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-419' 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-465' name='cert'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-467' name='cert'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-275' 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-465' name='cert1'/>
-      <parameter type-id='type-id-275' name='der'/>
+      <parameter type-id='type-id-467' name='cert1'/>
+      <parameter type-id='type-id-57' name='der'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crt_import_system_url' mangled-name='_gnutls_x509_crt_import_system_url' visibility='default' binding='global' size-in-bits='64'>
@@ -15548,19 +15819,19 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509_dn.c' comp-dir-path='/home/nmavrogi/cvs/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-1004' name='dn'/>
+      <parameter type-id='type-id-1009' name='dn'/>
       <parameter type-id='type-id-275' 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-1004' name='dn'/>
+      <parameter type-id='type-id-1009' name='dn'/>
       <parameter type-id='type-id-275' 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-1012'>
+    <class-decl name='gnutls_x509_ava_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-1017'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='oid' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -15571,63 +15842,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-1012' id='type-id-1013'/>
-    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-1014'/>
+    <typedef-decl name='gnutls_x509_ava_st' type-id='type-id-1017' id='type-id-1018'/>
+    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-1019'/>
     <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-1004' name='dn'/>
+      <parameter type-id='type-id-1009' name='dn'/>
       <parameter type-id='type-id-22' name='irdn'/>
       <parameter type-id='type-id-22' name='iava'/>
-      <parameter type-id='type-id-1014' name='ava'/>
+      <parameter type-id='type-id-1019' 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-1004' name='dn'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-1009' name='dn'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-275' 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-1004' name='dn'/>
-      <parameter type-id='type-id-420' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-421' name='output_data_size'/>
+      <parameter type-id='type-id-1009' name='dn'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-1004' name='dn'/>
+      <parameter type-id='type-id-1009' 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-1004' name='dn'/>
+      <parameter type-id='type-id-1009' 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-1005' name='dn'/>
+      <parameter type-id='type-id-1010' 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-1004' name='dn'/>
+      <parameter type-id='type-id-1009' name='dn'/>
       <parameter type-id='type-id-27' name='str'/>
-      <parameter type-id='type-id-425' name='err'/>
+      <parameter type-id='type-id-426' 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-764' name='crq'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-27' name='dn'/>
-      <parameter type-id='type-id-425' name='err'/>
+      <parameter type-id='type-id-426' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-27' name='dn'/>
-      <parameter type-id='type-id-425' name='err'/>
+      <parameter type-id='type-id-426' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-27' name='dn'/>
-      <parameter type-id='type-id-425' name='err'/>
+      <parameter type-id='type-id-426' 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'>
@@ -15643,243 +15914,243 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509_write.c' comp-dir-path='/home/nmavrogi/cvs/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-465' name='crt'/>
-      <parameter type-id='type-id-754' name='spki'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-756' 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-1006' const='yes' id='type-id-1015'/>
-    <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-1016'/>
+    <qualified-type-def type-id='type-id-1011' const='yes' 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_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-465' name='crt'/>
-      <parameter type-id='type-id-1016' name='policy'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-1021' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-22' name='what'/>
       <parameter type-id='type-id-275' 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-465' name='crt'/>
-      <parameter type-id='type-id-465' name='issuer'/>
+      <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-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-465' name='cert'/>
-      <parameter type-id='type-id-102' name='oid'/>
+      <parameter type-id='type-id-467' 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-465' name='cert'/>
-      <parameter type-id='type-id-102' name='id'/>
-      <parameter type-id='type-id-100' name='id_size'/>
+      <parameter type-id='type-id-467' 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-465' name='cert'/>
-      <parameter type-id='type-id-102' name='id'/>
-      <parameter type-id='type-id-100' name='id_size'/>
+      <parameter type-id='type-id-467' 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-465' name='dst'/>
-      <parameter type-id='type-id-465' name='src'/>
+      <parameter type-id='type-id-467' name='dst'/>
+      <parameter type-id='type-id-467' 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-465' name='crt'/>
-      <parameter type-id='type-id-967' name='type'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-973' 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-465' name='crt'/>
-      <parameter type-id='type-id-967' name='type'/>
-      <parameter type-id='type-id-102' name='data_string'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-973' 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-465' name='cert'/>
-      <parameter type-id='type-id-102' name='id'/>
-      <parameter type-id='type-id-100' name='id_size'/>
+      <parameter type-id='type-id-467' 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-465' name='cert'/>
-      <parameter type-id='type-id-102' name='id'/>
-      <parameter type-id='type-id-100' name='id_size'/>
+      <parameter type-id='type-id-467' 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-465' name='cert'/>
-      <parameter type-id='type-id-102' name='serial'/>
-      <parameter type-id='type-id-100' name='serial_size'/>
+      <parameter type-id='type-id-467' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' 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-465' name='cert'/>
+      <parameter type-id='type-id-467' 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-465' name='crt'/>
-      <parameter type-id='type-id-465' name='issuer'/>
+      <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'/>
       <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-465' name='crt'/>
-      <parameter type-id='type-id-465' name='issuer'/>
+      <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-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-465' name='crt'/>
+      <parameter type-id='type-id-467' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' 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'/>
-      <parameter type-id='type-id-100' name='sizeof_policy'/>
+      <parameter type-id='type-id-99' name='sizeof_policy'/>
       <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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-27' name='oid'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <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_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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-27' name='oid'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <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_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-465' name='crt'/>
-      <parameter type-id='type-id-967' name='type'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-973' 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-465' name='crt'/>
-      <parameter type-id='type-id-967' name='type'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-973' 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-465' name='crt'/>
-      <parameter type-id='type-id-967' name='type'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-973' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-27' name='oid'/>
-      <parameter type-id='type-id-102' name='buf'/>
-      <parameter type-id='type-id-100' name='sizeof_buf'/>
+      <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>
     <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-465' name='crt'/>
-      <parameter type-id='type-id-764' name='crq'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-766' 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-465' name='crt'/>
-      <parameter type-id='type-id-764' name='crq'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-766' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-383' 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-465' name='crt'/>
+      <parameter type-id='type-id-467' 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-465' name='crt'/>
-      <parameter type-id='type-id-465' name='eecrt'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-467' name='eecrt'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
-      <parameter type-id='type-id-102' name='name'/>
+      <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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
-      <parameter type-id='type-id-102' name='name'/>
+      <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_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-465' name='crt'/>
+      <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
-      <parameter type-id='type-id-102' name='name'/>
+      <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_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-465' name='crt'/>
-      <parameter type-id='type-id-764' name='crq'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
@@ -15930,16 +16201,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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
-    <class-decl name='gnutls_name_constraints_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1017'>
+  <abi-instr version='1.0' address-size='64' path='name_constraints.c' comp-dir-path='/home/nmavrogi/cvs/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-1022'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='permitted' type-id='type-id-1018' visibility='default'/>
+        <var-decl name='permitted' type-id='type-id-1023' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='excluded' type-id='type-id-1018' visibility='default'/>
+        <var-decl name='excluded' type-id='type-id-1023' 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-1019'>
+    <class-decl name='name_constraints_node_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-1024'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -15947,74 +16218,74 @@
         <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-1018' visibility='default'/>
+        <var-decl name='next' type-id='type-id-1023' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1019' size-in-bits='64' id='type-id-1018'/>
-    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1020'/>
-    <typedef-decl name='gnutls_x509_name_constraints_t' type-id='type-id-1020' id='type-id-1021'/>
+    <pointer-type-def type-id='type-id-1024' size-in-bits='64' id='type-id-1023'/>
+    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-1025'/>
+    <typedef-decl name='gnutls_x509_name_constraints_t' type-id='type-id-1025' id='type-id-1026'/>
     <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-1021' name='nc'/>
-      <parameter type-id='type-id-967' name='type'/>
-      <parameter type-id='type-id-465' name='cert'/>
+      <parameter type-id='type-id-1026' name='nc'/>
+      <parameter type-id='type-id-973' name='type'/>
+      <parameter type-id='type-id-467' 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-1021' name='nc'/>
-      <parameter type-id='type-id-967' name='type'/>
+      <parameter type-id='type-id-1026' name='nc'/>
+      <parameter type-id='type-id-973' 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-465' name='crt'/>
-      <parameter type-id='type-id-1021' name='nc'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-1026' 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-1021' name='nc'/>
-      <parameter type-id='type-id-967' name='type'/>
+      <parameter type-id='type-id-1026' name='nc'/>
+      <parameter type-id='type-id-973' 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-1021' name='nc'/>
-      <parameter type-id='type-id-967' name='type'/>
+      <parameter type-id='type-id-1026' name='nc'/>
+      <parameter type-id='type-id-973' 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-1021' name='nc'/>
-      <parameter type-id='type-id-1021' name='nc2'/>
+      <parameter type-id='type-id-1026' name='nc'/>
+      <parameter type-id='type-id-1026' name='nc2'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1021' size-in-bits='64' id='type-id-1022'/>
+    <pointer-type-def type-id='type-id-1026' size-in-bits='64' id='type-id-1027'/>
     <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-1022' name='nc'/>
+      <parameter type-id='type-id-1027' 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-1021' name='nc'/>
+      <parameter type-id='type-id-1026' 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-465' name='crt'/>
-      <parameter type-id='type-id-1021' name='nc'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-1026' name='nc'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-419' 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-1021' name='nc'/>
+      <parameter type-id='type-id-1026' name='nc'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-418' name='type'/>
+      <parameter type-id='type-id-419' name='type'/>
       <parameter type-id='type-id-275' 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-1021' name='nc'/>
+      <parameter type-id='type-id-1026' name='nc'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-418' name='type'/>
+      <parameter type-id='type-id-419' name='type'/>
       <parameter type-id='type-id-275' name='name'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -16034,30 +16305,30 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
-    <class-decl name='node_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-457'>
+  <abi-instr version='1.0' address-size='64' path='verify-high.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/x509' language='LANG_C99'>
+    <class-decl name='node_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-459'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='trusted_cas' type-id='type-id-456' visibility='default'/>
+        <var-decl name='trusted_cas' type-id='type-id-458' 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-1023' visibility='default'/>
+        <var-decl name='named_certs' type-id='type-id-1028' 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-727' visibility='default'/>
+        <var-decl name='crls' type-id='type-id-729' 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-1024'>
+    <class-decl name='named_cert_st' size-in-bits='2176' is-struct='yes' visibility='default' id='type-id-1029'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cert' type-id='type-id-465' visibility='default'/>
+        <var-decl name='cert' type-id='type-id-467' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='name' type-id='type-id-316' visibility='default'/>
@@ -16066,84 +16337,84 @@
         <var-decl name='name_size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1024' size-in-bits='64' id='type-id-1023'/>
-    <typedef-decl name='gnutls_verify_output_function' type-id='type-id-1025' id='type-id-1026'/>
-    <pointer-type-def type-id='type-id-1026' size-in-bits='64' id='type-id-1027'/>
+    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1028'/>
+    <typedef-decl name='gnutls_verify_output_function' type-id='type-id-1030' 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_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-434' name='list'/>
-      <parameter type-id='type-id-465' name='cert'/>
-      <parameter type-id='type-id-102' name='name'/>
-      <parameter type-id='type-id-100' name='name_size'/>
+      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-467' 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-418' name='voutput'/>
-      <parameter type-id='type-id-1027' name='func'/>
+      <parameter type-id='type-id-419' name='voutput'/>
+      <parameter type-id='type-id-1032' 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-434' name='list'/>
-      <parameter type-id='type-id-456' name='cert_list'/>
+      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-458' 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-10' name='elements'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-418' name='voutput'/>
-      <parameter type-id='type-id-1027' name='func'/>
+      <parameter type-id='type-id-419' name='voutput'/>
+      <parameter type-id='type-id-1032' 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-434' name='list'/>
-      <parameter type-id='type-id-456' name='cert_list'/>
+      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-458' 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-418' name='voutput'/>
-      <parameter type-id='type-id-1027' name='func'/>
+      <parameter type-id='type-id-419' name='voutput'/>
+      <parameter type-id='type-id-1032' 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-434' name='list'/>
+      <parameter type-id='type-id-435' name='list'/>
       <parameter type-id='type-id-57' name='dn'/>
       <parameter type-id='type-id-57' name='spki'/>
-      <parameter type-id='type-id-456' name='issuer'/>
+      <parameter type-id='type-id-458' 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-434' name='list'/>
+      <parameter type-id='type-id-435' name='list'/>
       <parameter type-id='type-id-57' name='dn'/>
-      <parameter type-id='type-id-456' name='issuer'/>
+      <parameter type-id='type-id-458' 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-434' name='list'/>
-      <parameter type-id='type-id-465' name='cert'/>
-      <parameter type-id='type-id-456' name='issuer'/>
+      <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-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-434' name='list'/>
-      <parameter type-id='type-id-1002' name='crl_list'/>
+      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-1007' 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-434' name='list'/>
-      <parameter type-id='type-id-465' name='cert'/>
-      <parameter type-id='type-id-102' name='name'/>
-      <parameter type-id='type-id-100' name='name_size'/>
+      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-467' 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-434' name='list'/>
-      <parameter type-id='type-id-1000' name='clist'/>
+      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-1005' 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-1028'>
+    <class-decl name='gnutls_x509_trust_list_iter' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-1033'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='node_index' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -16151,7 +16422,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-914' visibility='default'/>
+        <var-decl name='pkcs11_list' type-id='type-id-920' 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'/>
@@ -16160,34 +16431,34 @@
         <var-decl name='pkcs11_size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-1029'/>
-    <typedef-decl name='gnutls_x509_trust_list_iter_t' type-id='type-id-1029' id='type-id-1030'/>
+    <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1034'/>
+    <typedef-decl name='gnutls_x509_trust_list_iter_t' type-id='type-id-1034' id='type-id-1035'/>
     <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-1030' name='iter'/>
+      <parameter type-id='type-id-1035' name='iter'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1030' size-in-bits='64' id='type-id-1031'/>
+    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1036'/>
     <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-434' name='list'/>
-      <parameter type-id='type-id-1031' name='iter'/>
-      <parameter type-id='type-id-456' name='crt'/>
+      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-1036' name='iter'/>
+      <parameter type-id='type-id-458' 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-434' name='list'/>
-      <parameter type-id='type-id-1000' name='clist'/>
+      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-1005' 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-434' name='list'/>
+      <parameter type-id='type-id-435' 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-434' size-in-bits='64' id='type-id-1032'/>
+    <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-1037'/>
     <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-1032' name='list'/>
+      <parameter type-id='type-id-1037' name='list'/>
       <parameter type-id='type-id-10' name='size'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -16227,50 +16498,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-1025'>
-      <parameter type-id='type-id-465'/>
-      <parameter type-id='type-id-465'/>
-      <parameter type-id='type-id-726'/>
+    <function-type size-in-bits='64' id='type-id-1030'>
+      <parameter type-id='type-id-467'/>
+      <parameter type-id='type-id-467'/>
+      <parameter type-id='type-id-728'/>
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='verify-high2.c' comp-dir-path='/home/nmavrogi/cvs/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-434' name='list'/>
+      <parameter type-id='type-id-435' name='list'/>
       <parameter type-id='type-id-27' name='ca_file'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-421' 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-434' name='list'/>
+      <parameter type-id='type-id-435' 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-420' name='type'/>
+      <parameter type-id='type-id-421' 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-434' name='list'/>
+      <parameter type-id='type-id-435' 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-420' name='type'/>
+      <parameter type-id='type-id-421' 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-434' name='list'/>
+      <parameter type-id='type-id-435' name='list'/>
       <parameter type-id='type-id-57' name='cas'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-421' 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-434' name='list'/>
+      <parameter type-id='type-id-435' name='list'/>
       <parameter type-id='type-id-57' name='cas'/>
       <parameter type-id='type-id-57' name='crls'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-421' 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'/>
@@ -16297,82 +16568,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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509_ext.c' comp-dir-path='/home/nmavrogi/cvs/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-965' name='f'/>
+      <parameter type-id='type-id-971' 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-965' name='f'/>
+      <parameter type-id='type-id-971' name='f'/>
       <parameter type-id='type-id-275' 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-965' name='f'/>
+      <parameter type-id='type-id-971' 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-925' name='ext'/>
+      <parameter type-id='type-id-931' 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-1033'>
+    <class-decl name='gnutls_x509_key_purposes_st' size-in-bits='8256' is-struct='yes' visibility='default' id='type-id-1038'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='oid' type-id='type-id-1034' visibility='default'/>
+        <var-decl name='oid' type-id='type-id-1039' 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-1034'>
-      <subrange length='64' type-id='type-id-38' id='type-id-93'/>
+    <array-type-def dimensions='1' type-id='type-id-62' size-in-bits='8192' id='type-id-1039'>
+      <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1035'/>
-    <typedef-decl name='gnutls_x509_key_purposes_t' type-id='type-id-1035' id='type-id-1036'/>
+    <pointer-type-def type-id='type-id-1038' size-in-bits='64' id='type-id-1040'/>
+    <typedef-decl name='gnutls_x509_key_purposes_t' type-id='type-id-1040' id='type-id-1041'/>
     <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-1036' name='p'/>
+      <parameter type-id='type-id-1041' name='p'/>
       <parameter type-id='type-id-275' 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-1036' name='p'/>
+      <parameter type-id='type-id-1041' 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-1036' name='p'/>
+      <parameter type-id='type-id-1041' name='p'/>
       <parameter type-id='type-id-10' name='idx'/>
       <parameter type-id='type-id-275' 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-1036' name='p'/>
+      <parameter type-id='type-id-1041' 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-1036' name='p'/>
+      <parameter type-id='type-id-1041' name='p'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1036' size-in-bits='64' id='type-id-1037'/>
+    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-1042'/>
     <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-1037' name='p'/>
+      <parameter type-id='type-id-1042' 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-1038'>
+    <class-decl name='gnutls_x509_aia_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1043'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='aia' type-id='type-id-1039' visibility='default'/>
+        <var-decl name='aia' type-id='type-id-1044' 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-1040'>
+    <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-1045'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='oid' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -16383,53 +16654,53 @@
         <var-decl name='san' type-id='type-id-62' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1039'/>
-    <pointer-type-def type-id='type-id-1038' size-in-bits='64' id='type-id-1041'/>
-    <typedef-decl name='gnutls_x509_aia_t' type-id='type-id-1041' id='type-id-1042'/>
+    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1044'/>
+    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1046'/>
+    <typedef-decl name='gnutls_x509_aia_t' type-id='type-id-1046' id='type-id-1047'/>
     <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-1042' name='aia'/>
+      <parameter type-id='type-id-1047' name='aia'/>
       <parameter type-id='type-id-275' 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-1042' name='aia'/>
+      <parameter type-id='type-id-1047' 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-1042' name='aia'/>
+      <parameter type-id='type-id-1047' 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-1042' name='aia'/>
+      <parameter type-id='type-id-1047' name='aia'/>
       <parameter type-id='type-id-10' name='seq'/>
       <parameter type-id='type-id-275' name='oid'/>
-      <parameter type-id='type-id-418' name='san_type'/>
+      <parameter type-id='type-id-419' name='san_type'/>
       <parameter type-id='type-id-275' 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-1042' name='aia'/>
+      <parameter type-id='type-id-1047' name='aia'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-1043'/>
+    <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1048'/>
     <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-1043' name='aia'/>
+      <parameter type-id='type-id-1048' 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-1044'>
+    <class-decl name='gnutls_x509_crl_dist_points_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1049'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='points' type-id='type-id-1045' visibility='default'/>
+        <var-decl name='points' type-id='type-id-1050' 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-1046'>
+    <class-decl name='crl_dist_point_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-1051'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -16440,104 +16711,104 @@
         <var-decl name='reasons' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1045'/>
-    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-1047'/>
-    <typedef-decl name='gnutls_x509_crl_dist_points_t' type-id='type-id-1047' id='type-id-1048'/>
+    <pointer-type-def type-id='type-id-1051' size-in-bits='64' id='type-id-1050'/>
+    <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1052'/>
+    <typedef-decl name='gnutls_x509_crl_dist_points_t' type-id='type-id-1052' id='type-id-1053'/>
     <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-1048' name='cdp'/>
+      <parameter type-id='type-id-1053' name='cdp'/>
       <parameter type-id='type-id-275' 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-1048' name='cdp'/>
+      <parameter type-id='type-id-1053' 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-1048' name='cdp'/>
-      <parameter type-id='type-id-967' name='type'/>
+      <parameter type-id='type-id-1053' name='cdp'/>
+      <parameter type-id='type-id-973' 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-1048' name='cdp'/>
+      <parameter type-id='type-id-1053' name='cdp'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-418' name='type'/>
+      <parameter type-id='type-id-419' name='type'/>
       <parameter type-id='type-id-275' name='san'/>
-      <parameter type-id='type-id-418' name='reasons'/>
+      <parameter type-id='type-id-419' 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-1048' name='cdp'/>
+      <parameter type-id='type-id-1053' name='cdp'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1048' size-in-bits='64' id='type-id-1049'/>
+    <pointer-type-def type-id='type-id-1053' size-in-bits='64' id='type-id-1054'/>
     <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-1049' name='cdp'/>
+      <parameter type-id='type-id-1054' 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-1050'>
+    <class-decl name='gnutls_x509_policies_st' size-in-bits='106560' is-struct='yes' visibility='default' id='type-id-1055'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='policy' type-id='type-id-1051' visibility='default'/>
+        <var-decl name='policy' type-id='type-id-1056' 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-1006' size-in-bits='106496' id='type-id-1051'>
-      <subrange length='64' type-id='type-id-38' id='type-id-93'/>
+    <array-type-def dimensions='1' type-id='type-id-1011' size-in-bits='106496' id='type-id-1056'>
+      <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-1050' size-in-bits='64' id='type-id-1052'/>
-    <typedef-decl name='gnutls_x509_policies_t' type-id='type-id-1052' id='type-id-1053'/>
+    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-1057'/>
+    <typedef-decl name='gnutls_x509_policies_t' type-id='type-id-1057' id='type-id-1058'/>
     <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-1053' name='policies'/>
+      <parameter type-id='type-id-1058' name='policies'/>
       <parameter type-id='type-id-275' 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-1053' name='policies'/>
+      <parameter type-id='type-id-1058' 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-1053' name='policies'/>
-      <parameter type-id='type-id-1016' name='policy'/>
+      <parameter type-id='type-id-1058' name='policies'/>
+      <parameter type-id='type-id-1021' 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-1053' name='policies'/>
+      <parameter type-id='type-id-1058' name='policies'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-1011' name='policy'/>
+      <parameter type-id='type-id-1016' 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-1053' name='policies'/>
+      <parameter type-id='type-id-1058' name='policies'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1053' size-in-bits='64' id='type-id-1054'/>
+    <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-1059'/>
     <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-1054' name='policies'/>
+      <parameter type-id='type-id-1059' 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'>
       <parameter type-id='type-id-22' name='pathLenConstraint'/>
       <parameter type-id='type-id-27' name='policyLanguage'/>
       <parameter type-id='type-id-27' name='policy'/>
-      <parameter type-id='type-id-100' name='sizeof_policy'/>
+      <parameter type-id='type-id-99' name='sizeof_policy'/>
       <parameter type-id='type-id-275' 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-848' name='policyLanguage'/>
-      <parameter type-id='type-id-848' name='policy'/>
-      <parameter type-id='type-id-421' name='sizeof_policy'/>
+      <parameter type-id='type-id-850' name='policyLanguage'/>
+      <parameter type-id='type-id-850' name='policy'/>
+      <parameter type-id='type-id-422' 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'>
@@ -16548,7 +16819,7 @@
     </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-418' name='ca'/>
+      <parameter type-id='type-id-419' name='ca'/>
       <parameter type-id='type-id-364' name='pathlen'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -16560,8 +16831,8 @@
     </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-512' name='activation'/>
-      <parameter type-id='type-id-512' name='expiration'/>
+      <parameter type-id='type-id-514' name='activation'/>
+      <parameter type-id='type-id-514' 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'>
@@ -16571,7 +16842,7 @@
     </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-418' name='skipcerts'/>
+      <parameter type-id='type-id-419' 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'>
@@ -16581,29 +16852,29 @@
     </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-418' name='key_usage'/>
+      <parameter type-id='type-id-419' 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-1055'>
+    <class-decl name='gnutls_x509_aki_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1060'>
       <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-461' visibility='default'/>
+        <var-decl name='cert_issuer' type-id='type-id-463' 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-461'>
+    <class-decl name='gnutls_subject_alt_names_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-463'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='names' type-id='type-id-1056' visibility='default'/>
+        <var-decl name='names' 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='name_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-1057'>
+    <class-decl name='name_st' size-in-bits='320' 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>
@@ -16614,31 +16885,31 @@
         <var-decl name='othername_oid' type-id='type-id-62' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1057' size-in-bits='64' id='type-id-1056'/>
-    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-1058'/>
-    <typedef-decl name='gnutls_x509_aki_t' type-id='type-id-1058' id='type-id-1059'/>
+    <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_aki_t' type-id='type-id-1063' id='type-id-1064'/>
     <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-1059' name='aki'/>
+      <parameter type-id='type-id-1064' name='aki'/>
       <parameter type-id='type-id-275' 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-1059' name='aki'/>
+      <parameter type-id='type-id-1064' 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-1059' name='aki'/>
+      <parameter type-id='type-id-1064' name='aki'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-418' name='san_type'/>
+      <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'/>
       <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-1059' name='aki'/>
+      <parameter type-id='type-id-1064' 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'/>
@@ -16646,22 +16917,22 @@
       <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-1059' name='aki'/>
+      <parameter type-id='type-id-1064' 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-1059' name='aki'/>
+      <parameter type-id='type-id-1064' name='aki'/>
       <parameter type-id='type-id-275' 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-1059' name='aki'/>
+      <parameter type-id='type-id-1064' name='aki'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1059' size-in-bits='64' id='type-id-1060'/>
+    <pointer-type-def type-id='type-id-1064' size-in-bits='64' id='type-id-1065'/>
     <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-1060' name='aki'/>
+      <parameter type-id='type-id-1065' 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'>
@@ -16675,49 +16946,49 @@
       <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-1021' name='nc'/>
+      <parameter type-id='type-id-1026' name='nc'/>
       <parameter type-id='type-id-275' 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-1021' name='nc'/>
+      <parameter type-id='type-id-1026' 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-459' name='sans'/>
+      <parameter type-id='type-id-461' name='sans'/>
       <parameter type-id='type-id-275' 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-459' name='sans'/>
+      <parameter type-id='type-id-461' 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-459' name='sans'/>
+      <parameter type-id='type-id-461' 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-459' name='sans'/>
+      <parameter type-id='type-id-461' name='sans'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-418' name='san_type'/>
+      <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'/>
       <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-459' name='sans'/>
+      <parameter type-id='type-id-461' name='sans'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-459' size-in-bits='64' id='type-id-1061'/>
+    <pointer-type-def type-id='type-id-461' size-in-bits='64' id='type-id-1066'/>
     <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-1061' name='sans'/>
+      <parameter type-id='type-id-1066' 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'>
@@ -16751,18 +17022,18 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='email-verify.c' comp-dir-path='/home/nmavrogi/cvs/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-465' name='cert'/>
+      <parameter type-id='type-id-467' 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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs7-output.c' comp-dir-path='/home/nmavrogi/cvs/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-988' name='pkcs7'/>
-      <parameter type-id='type-id-970' name='format'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
+      <parameter type-id='type-id-976' name='format'/>
       <parameter type-id='type-id-275' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -16794,11 +17065,11 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='virt-san.c' comp-dir-path='/home/nmavrogi/cvs/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-418' name='virt_type'/>
+      <parameter type-id='type-id-419' name='virt_type'/>
       <parameter type-id='type-id-275' name='virt'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -16812,78 +17083,78 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='spki.c' comp-dir-path='/home/nmavrogi/cvs/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-753' name='spki'/>
-      <parameter type-id='type-id-430' name='dig'/>
-      <parameter type-id='type-id-418' name='salt_size'/>
+      <parameter type-id='type-id-755' name='spki'/>
+      <parameter type-id='type-id-431' name='dig'/>
+      <parameter type-id='type-id-419' 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-753' name='spki'/>
+      <parameter type-id='type-id-755' name='spki'/>
       <parameter type-id='type-id-211' 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-753' name='spki'/>
+      <parameter type-id='type-id-755' name='spki'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-753' size-in-bits='64' id='type-id-1062'/>
+    <pointer-type-def type-id='type-id-755' size-in-bits='64' id='type-id-1067'/>
     <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-1062' name='spki'/>
+      <parameter type-id='type-id-1067' 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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls_features.c' comp-dir-path='/home/nmavrogi/cvs/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-965' name='feat'/>
-      <parameter type-id='type-id-465' name='cert'/>
+      <parameter type-id='type-id-971' name='feat'/>
+      <parameter type-id='type-id-467' 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-465' name='crt'/>
-      <parameter type-id='type-id-965' name='features'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-971' 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-465' name='crt'/>
-      <parameter type-id='type-id-965' name='features'/>
+      <parameter type-id='type-id-467' name='crt'/>
+      <parameter type-id='type-id-971' name='features'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-419' 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-965' name='f'/>
+      <parameter type-id='type-id-971' name='f'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-418' name='feature'/>
+      <parameter type-id='type-id-419' 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-965' name='f'/>
+      <parameter type-id='type-id-971' name='f'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-965' size-in-bits='64' id='type-id-1063'/>
+    <pointer-type-def type-id='type-id-971' size-in-bits='64' id='type-id-1068'/>
     <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-1063' name='f'/>
+      <parameter type-id='type-id-1068' 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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ip.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <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-102' name='_ip'/>
+      <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-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-102' name='_ip'/>
+      <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-10' name='out_size'/>
@@ -16893,8 +17164,8 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
-    <class-decl name='gnutls_ocsp_resp_int' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-1064'>
+  <abi-instr version='1.0' address-size='64' path='ocsp.c' comp-dir-path='/home/nmavrogi/cvs/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-1069'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='resp' type-id='type-id-387' visibility='default'/>
       </data-member>
@@ -16911,106 +17182,109 @@
         <var-decl name='init' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1064' size-in-bits='64' id='type-id-1065'/>
-    <typedef-decl name='gnutls_ocsp_resp_t' type-id='type-id-1065' id='type-id-1066'/>
-    <pointer-type-def type-id='type-id-1066' size-in-bits='64' id='type-id-1067'/>
-    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-1068'/>
+    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-1070'/>
+    <typedef-decl name='gnutls_ocsp_resp_t' type-id='type-id-1070' id='type-id-1071'/>
+    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-1072'/>
+    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-1073'/>
     <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-1068' name='ocsps'/>
-      <parameter type-id='type-id-418' name='size'/>
+      <parameter type-id='type-id-1073' name='ocsps'/>
+      <parameter type-id='type-id-419' name='size'/>
       <parameter type-id='type-id-57' name='resp_data'/>
-      <parameter type-id='type-id-420' name='format'/>
+      <parameter type-id='type-id-421' 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-1069' const='yes' id='type-id-1074'/>
+    <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-1075'/>
+    <typedef-decl name='gnutls_ocsp_resp_const_t' type-id='type-id-1075' id='type-id-1076'/>
     <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-1066' name='resp'/>
-      <parameter type-id='type-id-434' name='trustlist'/>
-      <parameter type-id='type-id-418' name='verify'/>
+      <parameter type-id='type-id-1076' name='resp'/>
+      <parameter type-id='type-id-435' name='trustlist'/>
+      <parameter type-id='type-id-419' 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-1066' name='resp'/>
-      <parameter type-id='type-id-465' name='issuer'/>
-      <parameter type-id='type-id-418' name='verify'/>
+      <parameter type-id='type-id-1076' name='resp'/>
+      <parameter type-id='type-id-467' name='issuer'/>
+      <parameter type-id='type-id-419' name='verify'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <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-1066' name='resp'/>
-      <parameter type-id='type-id-729' name='certs'/>
-      <parameter type-id='type-id-421' name='ncerts'/>
+      <parameter type-id='type-id-1076' name='resp'/>
+      <parameter type-id='type-id-731' name='certs'/>
+      <parameter type-id='type-id-422' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1076' 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-1066' name='resp'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-1076' name='resp'/>
+      <parameter type-id='type-id-419' name='critical'/>
       <parameter type-id='type-id-275' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-275' name='oid'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-419' name='critical'/>
       <parameter type-id='type-id-275' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-430' name='digest'/>
+      <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-418' name='cert_status'/>
-      <parameter type-id='type-id-512' name='this_update'/>
-      <parameter type-id='type-id-512' name='next_update'/>
-      <parameter type-id='type-id-512' name='revocation_time'/>
-      <parameter type-id='type-id-418' name='revocation_reason'/>
+      <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'/>
       <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-1066' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-465' name='crt'/>
+      <parameter type-id='type-id-467' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1076' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-10' name='type'/>
       <parameter type-id='type-id-275' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-275' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1076' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-275' name='response_type_oid'/>
       <parameter type-id='type-id-275' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1076' 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-1069'>
+    <class-decl name='gnutls_ocsp_req_int' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1077'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='req' type-id='type-id-387' visibility='default'/>
       </data-member>
@@ -17018,48 +17292,51 @@
         <var-decl name='init' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-1070'/>
-    <typedef-decl name='gnutls_ocsp_req_t' type-id='type-id-1070' id='type-id-1071'/>
+    <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-1078'/>
+    <typedef-decl name='gnutls_ocsp_req_t' type-id='type-id-1078' id='type-id-1079'/>
     <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-1071' name='req'/>
+      <parameter type-id='type-id-1079' 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-1071' name='req'/>
+      <parameter type-id='type-id-1079' 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-1077' const='yes' id='type-id-1080'/>
+    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1081'/>
+    <typedef-decl name='gnutls_ocsp_req_const_t' type-id='type-id-1081' id='type-id-1082'/>
     <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-1071' name='req'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-1082' name='req'/>
+      <parameter type-id='type-id-419' name='critical'/>
       <parameter type-id='type-id-275' 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-1071' name='req'/>
+      <parameter type-id='type-id-1079' 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-1071' name='req'/>
+      <parameter type-id='type-id-1082' name='req'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-275' name='oid'/>
-      <parameter type-id='type-id-418' name='critical'/>
+      <parameter type-id='type-id-419' name='critical'/>
       <parameter type-id='type-id-275' 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-1071' name='req'/>
+      <parameter type-id='type-id-1079' name='req'/>
       <parameter type-id='type-id-211' name='digest'/>
-      <parameter type-id='type-id-465' name='issuer'/>
-      <parameter type-id='type-id-465' name='cert'/>
+      <parameter type-id='type-id-467' name='issuer'/>
+      <parameter type-id='type-id-467' 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-1071' name='req'/>
+      <parameter type-id='type-id-1079' name='req'/>
       <parameter type-id='type-id-211' name='digest'/>
       <parameter type-id='type-id-57' name='issuer_name_hash'/>
       <parameter type-id='type-id-57' name='issuer_key_hash'/>
@@ -17067,75 +17344,75 @@
       <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-1071' name='req'/>
+      <parameter type-id='type-id-1082' name='req'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-430' name='digest'/>
+      <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'/>
       <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-1071' name='req'/>
+      <parameter type-id='type-id-1082' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-275' name='data'/>
-      <parameter type-id='type-id-420' name='fmt'/>
+      <parameter type-id='type-id-421' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-275' 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-1071' name='req'/>
+      <parameter type-id='type-id-1082' name='req'/>
       <parameter type-id='type-id-275' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1071' name='resp'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-420' name='fmt'/>
+      <parameter type-id='type-id-421' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1071' 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-1071' name='req'/>
+      <parameter type-id='type-id-1079' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1071' 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-1067' name='resp'/>
+      <parameter type-id='type-id-1072' 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-1071' name='req'/>
+      <parameter type-id='type-id-1079' name='req'/>
       <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-1072'/>
+    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-1083'/>
     <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-1072' name='req'/>
+      <parameter type-id='type-id-1083' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-275' 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-1066' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-275' name='sig'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -17155,22 +17432,22 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/x509' language='LANG_C99'>
-    <enum-decl name='gnutls_ocsp_print_formats_t' id='type-id-1073'>
+  <abi-instr version='1.0' address-size='64' path='ocsp_output.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/x509' language='LANG_C99'>
+    <enum-decl name='gnutls_ocsp_print_formats_t' id='type-id-1084'>
       <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-1073' id='type-id-1074'/>
+    <typedef-decl name='gnutls_ocsp_print_formats_t' type-id='type-id-1084' id='type-id-1085'/>
     <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-1066' name='resp'/>
-      <parameter type-id='type-id-1074' name='format'/>
+      <parameter type-id='type-id-1076' name='resp'/>
+      <parameter type-id='type-id-1085' name='format'/>
       <parameter type-id='type-id-275' 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-1071' name='req'/>
-      <parameter type-id='type-id-1074' name='format'/>
+      <parameter type-id='type-id-1082' name='req'/>
+      <parameter type-id='type-id-1085' name='format'/>
       <parameter type-id='type-id-275' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -17223,46 +17500,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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <typedef-decl name='hello_ext_entry_st' type-id='type-id-296' id='type-id-1075'/>
-    <qualified-type-def type-id='type-id-1075' const='yes' id='type-id-1076'/>
-    <var-decl name='ext_mod_max_record_size' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='max_record.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <typedef-decl name='hello_ext_entry_st' type-id='type-id-296' id='type-id-1086'/>
+    <qualified-type-def type-id='type-id-1086' const='yes' id='type-id-1087'/>
+    <var-decl name='ext_mod_max_record_size' type-id='type-id-1087' 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-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-100' name='size'/>
+      <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'/>
-      <return type-id='type-id-100'/>
+      <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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_server_name' type-id='type-id-1076' visibility='default'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1077'>
+  <abi-instr version='1.0' address-size='64' path='server_name.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_server_name' type-id='type-id-1087' visibility='default'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1088'>
       <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-1077' id='type-id-1078'/>
+    <typedef-decl name='gnutls_server_name_type_t' type-id='type-id-1088' id='type-id-1089'/>
     <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-1078' name='type'/>
-      <parameter type-id='type-id-102' name='name'/>
-      <parameter type-id='type-id-100' name='name_length'/>
+      <parameter type-id='type-id-1089' 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-1078' name='type'/>
-      <parameter type-id='type-id-102' name='name'/>
-      <parameter type-id='type-id-100' name='name_length'/>
+      <parameter type-id='type-id-1089' 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-102' name='data'/>
-      <parameter type-id='type-id-421' name='data_length'/>
-      <parameter type-id='type-id-418' name='type'/>
+      <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-10' name='indx'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -17279,8 +17561,8 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_sig' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='signature.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_sig' type-id='type-id-1087' 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'/>
       <return type-id='type-id-22'/>
@@ -17289,11 +17571,11 @@
       <parameter type-id='type-id-413' 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-1079'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-1090'/>
     <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-100' name='indx'/>
-      <parameter type-id='type-id-1079' name='algo'/>
+      <parameter type-id='type-id-99' name='indx'/>
+      <parameter type-id='type-id-1090' 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'>
@@ -17303,15 +17585,15 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_sr' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='safe_renegotiation.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_sr' type-id='type-id-1087' 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'/>
       <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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_session_ticket' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='session_ticket.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_session_ticket' type-id='type-id-1087' 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-57' name='key'/>
@@ -17341,11 +17623,11 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_srp' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='srp.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_srp' type-id='type-id-1087' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='heartbeat.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_heartbeat' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='heartbeat.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_heartbeat' type-id='type-id-1087' 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-10' name='retrans_timeout'/>
@@ -17363,7 +17645,7 @@
     </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-100' name='data_size'/>
+      <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'/>
@@ -17379,43 +17661,43 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_status_request' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='status_request.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_status_request' type-id='type-id-1087' 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-100' name='responder_id_size'/>
+      <parameter type-id='type-id-99' name='responder_id_size'/>
       <parameter type-id='type-id-275' 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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_dumbfw' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='dumbfw.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_dumbfw' type-id='type-id-1087' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ext_master_secret.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_ext_master_secret' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='ext_master_secret.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_ext_master_secret' type-id='type-id-1087' 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'/>
       <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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_etm' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='etm.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_etm' type-id='type-id-1087' 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'/>
       <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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_supported_versions' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='supported_versions.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_supported_versions' type-id='type-id-1087' 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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_post_handshake' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='post_handshake.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_post_handshake' type-id='type-id-1087' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='key_share.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='key_share.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -17426,14 +17708,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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_cookie' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='cookie.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_cookie' type-id='type-id-1087' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='psk_ke_modes.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_psk_ke_modes' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='psk_ke_modes.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_psk_ke_modes' type-id='type-id-1087' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pre_shared_key.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_pre_shared_key' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='pre_shared_key.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_pre_shared_key' type-id='type-id-1087' 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>
@@ -17455,36 +17737,39 @@
     <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>
+    <function-decl name='_tls13_init_secret2' mangled-name='_tls13_init_secret2' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_find_psk_key' mangled-name='_gnutls_find_psk_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='supported_groups.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_supported_groups' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='supported_groups.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_supported_groups' type-id='type-id-1087' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ec_point_formats.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_supported_ec_point_formats' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='ec_point_formats.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_supported_ec_point_formats' type-id='type-id-1087' 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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_early_data' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='early_data.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_early_data' type-id='type-id-1087' 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-100' name='size'/>
+      <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'/>
-      <return type-id='type-id-100'/>
+      <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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_record_size_limit' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='record_size_limit.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_record_size_limit' type-id='type-id-1087' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='client_cert_type.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_client_cert_type' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='client_cert_type.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_client_cert_type' type-id='type-id-1087' 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>
@@ -17492,14 +17777,14 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_server_cert_type' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='server_cert_type.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_server_cert_type' type-id='type-id-1087' 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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_alpn' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='alpn.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_alpn' type-id='type-id-1087' 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-57' name='protocols'/>
@@ -17513,11 +17798,11 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_srtp' type-id='type-id-1076' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='srtp.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_srtp' type-id='type-id-1087' 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-102' name='key_material'/>
+      <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'/>
@@ -17528,20 +17813,20 @@
     <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-27' name='profiles'/>
-      <parameter type-id='type-id-425' name='err_pos'/>
+      <parameter type-id='type-id-426' name='err_pos'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1080'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1091'>
       <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-1080' id='type-id-1081'/>
+    <typedef-decl name='gnutls_srtp_profile_t' type-id='type-id-1091' id='type-id-1092'/>
     <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-1081' name='profile'/>
+      <parameter type-id='type-id-1092' 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'>
@@ -17555,25 +17840,25 @@
       <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-1081' name='profile'/>
+      <parameter type-id='type-id-1092' name='profile'/>
       <return type-id='type-id-27'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-1082'/>
+    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-1093'/>
     <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-1082' name='profile'/>
+      <parameter type-id='type-id-1093' 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-1082' name='profile'/>
+      <parameter type-id='type-id-1093' 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/nmavrogi/cvs/gnutls-nmav/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='anon.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -17587,7 +17872,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/nmavrogi/cvs/gnutls-nmav/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cert.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -17625,7 +17910,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/nmavrogi/cvs/gnutls-nmav/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dh_common.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -17639,7 +17924,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/nmavrogi/cvs/gnutls-nmav/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dhe.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -17647,12 +17932,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/nmavrogi/cvs/gnutls-nmav/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='rsa_psk.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dhe_psk.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -17669,7 +17954,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/nmavrogi/cvs/gnutls-nmav/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='srp_kx.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -17710,12 +17995,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/nmavrogi/cvs/gnutls-nmav/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='srp_passwd.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='srp_rsa.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -17723,7 +18008,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='srp_sb64.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -17732,7 +18017,7 @@
     <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-421' name='result_size'/>
+      <parameter type-id='type-id-422' 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'>
@@ -17743,15 +18028,26 @@
     <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-421' name='result_size'/>
+      <parameter type-id='type-id-422' name='result_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cert_types.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/algorithms' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-1083'/>
-    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-1084'/>
+  <abi-instr version='1.0' address-size='64' path='vko_gost.c' comp-dir-path='/home/nmavrogi/cvs/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>
+    <function-decl name='_gnutls_gost_keytrans_encrypt' mangled-name='_gnutls_gost_keytrans_encrypt' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gost_keytrans_decrypt' mangled-name='_gnutls_gost_keytrans_decrypt' 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_types.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/algorithms' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-1094'/>
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-1095'/>
     <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-1084'/>
+      <return type-id='type-id-1095'/>
     </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'/>
@@ -17762,11 +18058,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/nmavrogi/cvs/gnutls-nmav/lib/algorithms' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-29' const='yes' id='type-id-1085'/>
-    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-1086'/>
+  <abi-instr version='1.0' address-size='64' path='ciphers.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/algorithms' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-29' const='yes' id='type-id-1096'/>
+    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-1097'/>
     <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-1086'/>
+      <return type-id='type-id-1097'/>
     </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'/>
@@ -17778,7 +18074,7 @@
     </function-decl>
     <function-decl name='gnutls_cipher_get_key_size' mangled-name='gnutls_cipher_get_key_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_get_key_size@@GNUTLS_3_4'>
       <parameter type-id='type-id-29' name='algorithm'/>
-      <return type-id='type-id-100'/>
+      <return type-id='type-id-99'/>
     </function-decl>
     <function-decl name='gnutls_cipher_get_iv_size' mangled-name='gnutls_cipher_get_iv_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_get_iv_size@@GNUTLS_3_4'>
       <parameter type-id='type-id-29' name='algorithm'/>
@@ -17797,24 +18093,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/nmavrogi/cvs/gnutls-nmav/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ciphersuites.c' comp-dir-path='/home/nmavrogi/cvs/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-423' name='pcache'/>
+      <parameter type-id='type-id-424' name='pcache'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-418' name='sidx'/>
+      <parameter type-id='type-id-419' 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-1087'/>
-    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-1088'/>
-    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-1089'/>
-    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-1090'/>
+    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-1098'/>
+    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-1099'/>
+    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-1100'/>
+    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-1101'/>
     <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-100' name='idx'/>
+      <parameter type-id='type-id-99' name='idx'/>
       <parameter type-id='type-id-64' name='cs_id'/>
-      <parameter type-id='type-id-1087' name='kx'/>
-      <parameter type-id='type-id-1088' name='cipher'/>
-      <parameter type-id='type-id-1089' name='mac'/>
-      <parameter type-id='type-id-1090' name='min_version'/>
+      <parameter type-id='type-id-1098' name='kx'/>
+      <parameter type-id='type-id-1099' name='cipher'/>
+      <parameter type-id='type-id-1100' name='mac'/>
+      <parameter type-id='type-id-1101' 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'>
@@ -17833,7 +18129,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/nmavrogi/cvs/gnutls-nmav/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ecc.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -17858,17 +18154,21 @@
       <parameter type-id='type-id-27' name='name'/>
       <return type-id='type-id-59'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-59' const='yes' id='type-id-1091'/>
-    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-1092'/>
+    <function-decl name='_gnutls_ecc_curve_is_supported' mangled-name='_gnutls_ecc_curve_is_supported' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_ecc_curve_is_supported@@GNUTLS_PRIVATE_3_4'>
+      <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-1102'/>
+    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1103'/>
     <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-1092'/>
+      <return type-id='type-id-1103'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='kx.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/algorithms' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-1093'/>
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-1094'/>
+  <abi-instr version='1.0' address-size='64' path='kx.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/algorithms' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-1104'/>
+    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-1105'/>
     <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-1094'/>
+      <return type-id='type-id-1105'/>
     </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'/>
@@ -17879,7 +18179,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='mac.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <return type-id='type-id-27'/>
@@ -17892,23 +18192,23 @@
       <parameter type-id='type-id-27' name='oid'/>
       <return type-id='type-id-211'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-211' const='yes' id='type-id-1095'/>
-    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-1096'/>
+    <qualified-type-def type-id='type-id-211' const='yes' id='type-id-1106'/>
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1107'/>
     <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-1096'/>
+      <return type-id='type-id-1107'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-1097'/>
-    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-1098'/>
+    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-1108'/>
+    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-1109'/>
     <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-1098'/>
+      <return type-id='type-id-1109'/>
     </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'/>
-      <return type-id='type-id-100'/>
+      <return type-id='type-id-99'/>
     </function-decl>
     <function-decl name='gnutls_mac_get_key_size' mangled-name='gnutls_mac_get_key_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_mac_get_key_size@@GNUTLS_3_4'>
       <parameter type-id='type-id-31' name='algorithm'/>
-      <return type-id='type-id-100'/>
+      <return type-id='type-id-99'/>
     </function-decl>
     <function-decl name='gnutls_mac_get_id' mangled-name='gnutls_mac_get_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_mac_get_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='name'/>
@@ -17931,11 +18231,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/nmavrogi/cvs/gnutls-nmav/lib/algorithms' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-32' const='yes' id='type-id-1099'/>
-    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-1100'/>
+  <abi-instr version='1.0' address-size='64' path='protocols.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/algorithms' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-32' const='yes' id='type-id-1110'/>
+    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-1111'/>
     <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-1100'/>
+      <return type-id='type-id-1111'/>
     </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'/>
@@ -17950,7 +18250,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/nmavrogi/cvs/gnutls-nmav/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='publickey.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -17968,14 +18268,14 @@
       <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-468'/>
+      <return type-id='type-id-470'/>
     </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/nmavrogi/cvs/gnutls-nmav/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='secparams.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -17995,7 +18295,7 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='sign.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -18026,10 +18326,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-1101'/>
-    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-1102'/>
+    <qualified-type-def type-id='type-id-21' const='yes' id='type-id-1112'/>
+    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-1113'/>
     <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-1102'/>
+      <return type-id='type-id-1113'/>
     </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'/>
@@ -18044,8 +18344,11 @@
       <parameter type-id='type-id-21' name='algorithm'/>
       <return type-id='type-id-27'/>
     </function-decl>
+    <function-decl name='_gnutls_digest_is_insecure' mangled-name='_gnutls_digest_is_insecure' 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='groups.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='groups.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -18054,59 +18357,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-1103'/>
-    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-1104'/>
+    <qualified-type-def type-id='type-id-56' const='yes' id='type-id-1114'/>
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-1115'/>
     <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-1104'/>
+      <return type-id='type-id-1115'/>
+    </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/nmavrogi/cvs/gnutls-nmav/lib/accelerated' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='accelerated.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib/accelerated/x86' language='LANG_C99'>
-    <class-decl name='__anonymous_struct__' size-in-bits='704' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1105' visibility='default' id='type-id-1106'>
+  <abi-instr version='1.0' address-size='64' path='aes-cbc-x86-aesni.c' comp-dir-path='/home/nmavrogi/cvs/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-1116' visibility='default' id='type-id-1117'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='init' type-id='type-id-804' visibility='default'/>
+        <var-decl name='init' type-id='type-id-806' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='setkey' type-id='type-id-805' visibility='default'/>
+        <var-decl name='setkey' type-id='type-id-807' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='setiv' type-id='type-id-809' visibility='default'/>
+        <var-decl name='setiv' type-id='type-id-811' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='encrypt' type-id='type-id-810' visibility='default'/>
+        <var-decl name='getiv' type-id='type-id-1118' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='decrypt' type-id='type-id-811' visibility='default'/>
+        <var-decl name='encrypt' type-id='type-id-812' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='aead_encrypt' type-id='type-id-806' visibility='default'/>
+        <var-decl name='decrypt' type-id='type-id-813' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='aead_decrypt' type-id='type-id-807' visibility='default'/>
+        <var-decl name='aead_encrypt' type-id='type-id-808' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='deinit' type-id='type-id-808' visibility='default'/>
+        <var-decl name='aead_decrypt' type-id='type-id-809' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='auth' type-id='type-id-1107' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-810' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='tag' type-id='type-id-1108' visibility='default'/>
+        <var-decl name='auth' type-id='type-id-1119' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='exists' type-id='type-id-1109' visibility='default'/>
+        <var-decl name='tag' type-id='type-id-1120' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='exists' type-id='type-id-1121' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_cipher_auth_func' type-id='type-id-117' id='type-id-1107'/>
-    <typedef-decl name='gnutls_cipher_tag_func' type-id='type-id-119' id='type-id-1108'/>
-    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-1109'/>
-    <typedef-decl name='gnutls_crypto_cipher_st' type-id='type-id-1106' id='type-id-1105'/>
-    <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-1111'/>
-    <var-decl name='_gnutls_aesni_x86' type-id='type-id-1111' visibility='default'/>
+    <typedef-decl name='gnutls_cipher_getiv_func' type-id='type-id-117' id='type-id-1118'/>
+    <typedef-decl name='gnutls_cipher_auth_func' type-id='type-id-117' id='type-id-1119'/>
+    <typedef-decl name='gnutls_cipher_tag_func' type-id='type-id-119' id='type-id-1120'/>
+    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-1121'/>
+    <typedef-decl name='gnutls_crypto_cipher_st' type-id='type-id-1117' id='type-id-1116'/>
+    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1123'/>
+    <var-decl name='_gnutls_aesni_x86' type-id='type-id-1123' 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>
@@ -18116,13 +18426,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-1110'>
+    <function-type size-in-bits='64' id='type-id-1122'>
       <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/nmavrogi/cvs/gnutls-nmav/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_ssse3' type-id='type-id-1111' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-cbc-x86-ssse3.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_ssse3' type-id='type-id-1123' 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>
@@ -18133,8 +18443,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/nmavrogi/cvs/gnutls-nmav/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_ccm_x86_aesni' type-id='type-id-1111' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-ccm-x86-aesni.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_ccm_x86_aesni' type-id='type-id-1123' 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>
@@ -18145,8 +18455,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/nmavrogi/cvs/gnutls-nmav/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_padlock' type-id='type-id-1111' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-padlock.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_padlock' type-id='type-id-1123' 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>
@@ -18172,11 +18482,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/nmavrogi/cvs/gnutls-nmav/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_x86_aesni' type-id='type-id-1111' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-aesni.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_x86_aesni' type-id='type-id-1123' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-pclmul-avx.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_pclmul_avx' type-id='type-id-1111' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-pclmul-avx.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_pclmul_avx' type-id='type-id-1123' 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>
@@ -18196,8 +18506,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/nmavrogi/cvs/gnutls-nmav/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_pclmul' type-id='type-id-1111' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-pclmul.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_pclmul' type-id='type-id-1123' 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>
@@ -18208,14 +18518,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/nmavrogi/cvs/gnutls-nmav/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_x86_ssse3' type-id='type-id-1111' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-ssse3.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_x86_ssse3' type-id='type-id-1123' 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/nmavrogi/cvs/gnutls-nmav/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_padlock' type-id='type-id-1111' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-padlock.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_padlock' type-id='type-id-1123' 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>
@@ -18229,38 +18539,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/nmavrogi/cvs/gnutls-nmav/lib/accelerated/x86' language='LANG_C99'>
-    <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1112' visibility='default' id='type-id-1113'>
+  <abi-instr version='1.0' address-size='64' path='hmac-padlock.c' comp-dir-path='/home/nmavrogi/cvs/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-1124' visibility='default' id='type-id-1125'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='init' type-id='type-id-793' visibility='default'/>
+        <var-decl name='init' type-id='type-id-795' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='setkey' type-id='type-id-794' visibility='default'/>
+        <var-decl name='setkey' type-id='type-id-796' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='setnonce' type-id='type-id-795' visibility='default'/>
+        <var-decl name='setnonce' type-id='type-id-797' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='hash' type-id='type-id-796' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-798' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='output' type-id='type-id-797' visibility='default'/>
+        <var-decl name='output' type-id='type-id-799' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='deinit' type-id='type-id-798' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-800' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='fast' type-id='type-id-801' visibility='default'/>
+        <var-decl name='fast' type-id='type-id-803' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='exists' type-id='type-id-1114' visibility='default'/>
+        <var-decl name='copy' type-id='type-id-1126' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='exists' type-id='type-id-1127' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-1114'/>
-    <typedef-decl name='gnutls_crypto_mac_st' type-id='type-id-1113' id='type-id-1112'/>
-    <qualified-type-def type-id='type-id-1112' const='yes' id='type-id-1116'/>
-    <var-decl name='_gnutls_hmac_sha_padlock' type-id='type-id-1116' visibility='default'/>
-    <var-decl name='_gnutls_hmac_sha_padlock_nano' type-id='type-id-1116' visibility='default'/>
+    <typedef-decl name='gnutls_mac_copy_func' type-id='type-id-130' id='type-id-1126'/>
+    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-1127'/>
+    <typedef-decl name='gnutls_crypto_mac_st' type-id='type-id-1125' id='type-id-1124'/>
+    <qualified-type-def type-id='type-id-1124' const='yes' id='type-id-1129'/>
+    <var-decl name='_gnutls_hmac_sha_padlock' type-id='type-id-1129' visibility='default'/>
+    <var-decl name='_gnutls_hmac_sha_padlock_nano' type-id='type-id-1129' 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>
@@ -18279,13 +18593,16 @@
     <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-1115'>
+    <function-type size-in-bits='64' id='type-id-1128'>
       <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/nmavrogi/cvs/gnutls-nmav/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_hmac_sha_x86_ssse3' type-id='type-id-1116' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='hmac-x86-ssse3.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_hmac_sha_x86_ssse3' type-id='type-id-1129' 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>
     <function-decl name='x86_sha256_update' mangled-name='x86_sha256_update' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18293,8 +18610,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/nmavrogi/cvs/gnutls-nmav/lib/accelerated/x86' language='LANG_C99'>
-    <class-decl name='nettle_hash' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1117'>
+  <abi-instr version='1.0' address-size='64' path='sha-padlock.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <class-decl name='nettle_hash' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1130'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
@@ -18308,52 +18625,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-1118' visibility='default'/>
+        <var-decl name='init' type-id='type-id-1131' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='update' type-id='type-id-1119' visibility='default'/>
+        <var-decl name='update' type-id='type-id-1132' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='digest' type-id='type-id-1120' visibility='default'/>
+        <var-decl name='digest' type-id='type-id-1133' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='nettle_hash_init_func' type-id='type-id-120' id='type-id-1121'/>
-    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-1118'/>
-    <typedef-decl name='nettle_hash_update_func' type-id='type-id-1122' id='type-id-1123'/>
-    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-1119'/>
-    <typedef-decl name='nettle_hash_digest_func' type-id='type-id-1124' id='type-id-1125'/>
-    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-1120'/>
-    <qualified-type-def type-id='type-id-1117' const='yes' id='type-id-1126'/>
-    <var-decl name='padlock_sha1' type-id='type-id-1126' visibility='default'/>
-    <var-decl name='padlock_sha224' type-id='type-id-1126' visibility='default'/>
-    <var-decl name='padlock_sha256' type-id='type-id-1126' visibility='default'/>
-    <var-decl name='padlock_sha384' type-id='type-id-1126' visibility='default'/>
-    <var-decl name='padlock_sha512' type-id='type-id-1126' visibility='default'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='384' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1127' visibility='default' id='type-id-1128'>
+    <typedef-decl name='nettle_hash_init_func' type-id='type-id-120' id='type-id-1134'/>
+    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-1131'/>
+    <typedef-decl name='nettle_hash_update_func' type-id='type-id-1135' id='type-id-1136'/>
+    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-1132'/>
+    <typedef-decl name='nettle_hash_digest_func' type-id='type-id-1137' id='type-id-1138'/>
+    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-1133'/>
+    <qualified-type-def type-id='type-id-1130' const='yes' id='type-id-1139'/>
+    <var-decl name='padlock_sha1' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='padlock_sha224' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='padlock_sha256' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='padlock_sha384' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='padlock_sha512' type-id='type-id-1139' visibility='default'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='448' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1140' visibility='default' id='type-id-1141'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='init' type-id='type-id-784' visibility='default'/>
+        <var-decl name='init' type-id='type-id-786' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='hash' type-id='type-id-785' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-787' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='output' type-id='type-id-786' visibility='default'/>
+        <var-decl name='output' type-id='type-id-788' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='deinit' type-id='type-id-787' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-789' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='fast' type-id='type-id-790' visibility='default'/>
+        <var-decl name='fast' type-id='type-id-792' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='exists' type-id='type-id-1129' visibility='default'/>
+        <var-decl name='copy' type-id='type-id-1142' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='exists' type-id='type-id-1143' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1130' size-in-bits='64' id='type-id-1129'/>
-    <typedef-decl name='gnutls_crypto_digest_st' type-id='type-id-1128' id='type-id-1127'/>
-    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1131'/>
-    <var-decl name='_gnutls_sha_padlock' type-id='type-id-1131' visibility='default'/>
-    <var-decl name='_gnutls_sha_padlock_nano' type-id='type-id-1131' visibility='default'/>
+    <typedef-decl name='gnutls_digest_copy_func' type-id='type-id-130' id='type-id-1142'/>
+    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-1143'/>
+    <typedef-decl name='gnutls_crypto_digest_st' type-id='type-id-1141' id='type-id-1140'/>
+    <qualified-type-def type-id='type-id-1140' const='yes' id='type-id-1145'/>
+    <var-decl name='_gnutls_sha_padlock' type-id='type-id-1145' visibility='default'/>
+    <var-decl name='_gnutls_sha_padlock_nano' type-id='type-id-1145' 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>
@@ -18384,28 +18705,36 @@
     <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-1130'>
+    <function-type size-in-bits='64' id='type-id-1144'>
       <parameter type-id='type-id-211'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1122'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-983'/>
+    <function-type size-in-bits='64' id='type-id-1135'>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-898'/>
       <return type-id='type-id-111'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1124'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
+    <function-type size-in-bits='64' id='type-id-1137'>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
       <parameter type-id='type-id-191'/>
       <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/nmavrogi/cvs/gnutls-nmav/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='x86_sha1' type-id='type-id-1126' visibility='default'/>
-    <var-decl name='x86_sha224' type-id='type-id-1126' visibility='default'/>
-    <var-decl name='x86_sha256' type-id='type-id-1126' visibility='default'/>
-    <var-decl name='_gnutls_sha_x86_ssse3' type-id='type-id-1131' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='sha-x86-ssse3.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='x86_sha1' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='x86_sha224' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='x86_sha256' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='x86_sha384' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='x86_sha512' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='_gnutls_sha_x86_ssse3' type-id='type-id-1145' 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>
+    <function-decl name='sha512_block_data_order' mangled-name='sha512_block_data_order' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='nettle_sha256_update' mangled-name='nettle_sha256_update' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18419,10 +18748,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/nmavrogi/cvs/gnutls-nmav/lib/accelerated/x86' language='LANG_C99'>
-    <function-decl name='gnutls_cpuid' mangled-name='gnutls_cpuid' 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='x86-common.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -18439,76 +18765,76 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pk.c' comp-dir-path='/home/nmavrogi/cvs/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-1132'>
+    <class-decl name='gnutls_crypto_pk' size-in-bits='768' is-struct='yes' visibility='default' id='type-id-1146'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='encrypt' type-id='type-id-1133' visibility='default'/>
+        <var-decl name='encrypt' type-id='type-id-1147' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='decrypt' type-id='type-id-1133' visibility='default'/>
+        <var-decl name='decrypt' type-id='type-id-1147' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='decrypt2' type-id='type-id-1134' visibility='default'/>
+        <var-decl name='decrypt2' type-id='type-id-1148' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='sign' type-id='type-id-1135' visibility='default'/>
+        <var-decl name='sign' type-id='type-id-1149' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='verify' type-id='type-id-1136' visibility='default'/>
+        <var-decl name='verify' type-id='type-id-1150' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='verify_priv_params' type-id='type-id-1137' visibility='default'/>
+        <var-decl name='verify_priv_params' type-id='type-id-1151' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='verify_pub_params' type-id='type-id-1137' visibility='default'/>
+        <var-decl name='verify_pub_params' type-id='type-id-1151' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='generate_keys' type-id='type-id-1138' visibility='default'/>
+        <var-decl name='generate_keys' type-id='type-id-1152' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='generate_params' type-id='type-id-1139' visibility='default'/>
+        <var-decl name='generate_params' type-id='type-id-1153' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='pk_fixup_private_params' type-id='type-id-1140' visibility='default'/>
+        <var-decl name='pk_fixup_private_params' type-id='type-id-1154' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='derive' type-id='type-id-1141' visibility='default'/>
+        <var-decl name='derive' type-id='type-id-1155' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='curve_exists' type-id='type-id-1142' visibility='default'/>
+        <var-decl name='curve_exists' type-id='type-id-1156' visibility='default'/>
       </data-member>
     </class-decl>
-    <qualified-type-def type-id='type-id-312' const='yes' id='type-id-1143'/>
-    <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-1144'/>
-    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-1133'/>
-    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-1134'/>
-    <qualified-type-def type-id='type-id-317' const='yes' id='type-id-1147'/>
-    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-1148'/>
-    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-1135'/>
-    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-1136'/>
-    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-1137'/>
-    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-1152'/>
-    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-1138'/>
-    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-1139'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1155'>
+    <qualified-type-def type-id='type-id-312' const='yes' id='type-id-1157'/>
+    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-1158'/>
+    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-1147'/>
+    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-1148'/>
+    <qualified-type-def type-id='type-id-317' const='yes' id='type-id-1161'/>
+    <pointer-type-def type-id='type-id-1161' size-in-bits='64' id='type-id-1162'/>
+    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-1149'/>
+    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-1150'/>
+    <pointer-type-def type-id='type-id-1165' size-in-bits='64' id='type-id-1151'/>
+    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-1166'/>
+    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-1152'/>
+    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-1153'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1169'>
       <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-1155' id='type-id-1156'/>
-    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-1140'/>
-    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-1141'/>
-    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-1142'/>
-    <typedef-decl name='gnutls_crypto_pk_st' type-id='type-id-1132' id='type-id-1160'/>
-    <var-decl name='_gnutls_pk_ops' type-id='type-id-1160' visibility='default'/>
-    <function-decl name='nettle_get_secp_521r1' mangled-name='nettle_get_secp_521r1' visibility='default' binding='global' size-in-bits='64'>
+    <typedef-decl name='gnutls_direction_t' type-id='type-id-1169' id='type-id-1170'/>
+    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-1154'/>
+    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-1155'/>
+    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-1156'/>
+    <typedef-decl name='gnutls_crypto_pk_st' type-id='type-id-1146' id='type-id-1174'/>
+    <var-decl name='_gnutls_pk_ops' type-id='type-id-1174' visibility='default'/>
+    <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_384r1' mangled-name='nettle_get_secp_384r1' visibility='default' binding='global' size-in-bits='64'>
+    <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'>
+    <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>
     <function-decl name='nettle_ecc_point_init' mangled-name='nettle_ecc_point_init' visibility='default' binding='global' size-in-bits='64'>
@@ -18625,15 +18951,15 @@
     <function-decl name='nettle_dsa_params_clear' mangled-name='nettle_dsa_params_clear' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='nettle_dsa_generate_params' mangled-name='nettle_dsa_generate_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
     <function-decl name='_dsa_generate_dss_pqg' mangled-name='_dsa_generate_dss_pqg' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='dsa_validate_dss_pqg' mangled-name='dsa_validate_dss_pqg' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='nettle_dsa_generate_params' mangled-name='nettle_dsa_generate_params' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='dsa_generate_dss_pqg' mangled-name='dsa_generate_dss_pqg' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18682,9 +19008,15 @@
     <function-decl name='_gnutls_encode_ber_rs' mangled-name='_gnutls_encode_ber_rs' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='_gnutls_ecdsa_compute_k' mangled-name='_gnutls_ecdsa_compute_k' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='nettle_dsa_sign' mangled-name='nettle_dsa_sign' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='_gnutls_dsa_compute_k' mangled-name='_gnutls_dsa_compute_k' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='nettle_rsa_pkcs1_sign_tr' mangled-name='nettle_rsa_pkcs1_sign_tr' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18712,6 +19044,9 @@
     <function-decl name='_gnutls_mem_is_zero' mangled-name='_gnutls_mem_is_zero' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='_gnutls_gostdsa_vko' mangled-name='_gnutls_gostdsa_vko' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='nettle_mpz_sizeinbase_256_u' mangled-name='nettle_mpz_sizeinbase_256_u' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -18733,179 +19068,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-1159'>
+    <function-type size-in-bits='64' id='type-id-1173'>
       <parameter type-id='type-id-59'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1150'>
+    <function-type size-in-bits='64' id='type-id-1164'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-1144'/>
-      <parameter type-id='type-id-1148'/>
+      <parameter type-id='type-id-1158'/>
+      <parameter type-id='type-id-1162'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1146'>
+    <function-type size-in-bits='64' id='type-id-1160'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-1144'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-1158'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1151'>
+    <function-type size-in-bits='64' id='type-id-1165'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-1144'/>
+      <parameter type-id='type-id-1158'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1145'>
+    <function-type size-in-bits='64' id='type-id-1159'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-275'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-1144'/>
+      <parameter type-id='type-id-1158'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1149'>
+    <function-type size-in-bits='64' id='type-id-1163'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-275'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-1144'/>
-      <parameter type-id='type-id-1148'/>
+      <parameter type-id='type-id-1158'/>
+      <parameter type-id='type-id-1162'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1158'>
+    <function-type size-in-bits='64' id='type-id-1172'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-275'/>
-      <parameter type-id='type-id-1144'/>
-      <parameter type-id='type-id-1144'/>
+      <parameter type-id='type-id-1158'/>
+      <parameter type-id='type-id-1158'/>
+      <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-1157'>
+    <function-type size-in-bits='64' id='type-id-1171'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-1156'/>
-      <parameter type-id='type-id-1152'/>
+      <parameter type-id='type-id-1170'/>
+      <parameter type-id='type-id-1166'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1154'>
+    <function-type size-in-bits='64' id='type-id-1168'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-1152'/>
+      <parameter type-id='type-id-1166'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1153'>
+    <function-type size-in-bits='64' id='type-id-1167'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-1152'/>
+      <parameter type-id='type-id-1166'/>
       <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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='mpi.c' comp-dir-path='/home/nmavrogi/cvs/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-1161'>
+    <class-decl name='gnutls_crypto_bigint' size-in-bits='1600' is-struct='yes' visibility='default' id='type-id-1175'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='bigint_init' type-id='type-id-1162' visibility='default'/>
+        <var-decl name='bigint_init' type-id='type-id-1176' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='bigint_init_multi' type-id='type-id-1163' visibility='default'/>
+        <var-decl name='bigint_init_multi' type-id='type-id-1177' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='bigint_release' type-id='type-id-1164' visibility='default'/>
+        <var-decl name='bigint_release' type-id='type-id-1178' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='bigint_clear' type-id='type-id-1164' visibility='default'/>
+        <var-decl name='bigint_clear' type-id='type-id-1178' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='bigint_cmp' type-id='type-id-1165' visibility='default'/>
+        <var-decl name='bigint_cmp' type-id='type-id-1179' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='bigint_cmp_ui' type-id='type-id-1166' visibility='default'/>
+        <var-decl name='bigint_cmp_ui' type-id='type-id-1180' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='bigint_modm' type-id='type-id-1167' visibility='default'/>
+        <var-decl name='bigint_modm' type-id='type-id-1181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='bigint_set' type-id='type-id-1168' visibility='default'/>
+        <var-decl name='bigint_set' type-id='type-id-1182' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='bigint_copy' type-id='type-id-1169' visibility='default'/>
+        <var-decl name='bigint_copy' type-id='type-id-1183' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='bigint_set_ui' type-id='type-id-1170' visibility='default'/>
+        <var-decl name='bigint_set_ui' type-id='type-id-1184' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='bigint_get_nbits' type-id='type-id-1171' visibility='default'/>
+        <var-decl name='bigint_get_nbits' type-id='type-id-1185' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='bigint_powm' type-id='type-id-1172' visibility='default'/>
+        <var-decl name='bigint_powm' type-id='type-id-1186' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='bigint_addm' type-id='type-id-1172' visibility='default'/>
+        <var-decl name='bigint_addm' type-id='type-id-1186' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='bigint_subm' type-id='type-id-1172' visibility='default'/>
+        <var-decl name='bigint_subm' type-id='type-id-1186' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='bigint_mulm' type-id='type-id-1172' visibility='default'/>
+        <var-decl name='bigint_mulm' type-id='type-id-1186' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='bigint_add' type-id='type-id-1167' visibility='default'/>
+        <var-decl name='bigint_add' type-id='type-id-1181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='bigint_sub' type-id='type-id-1167' visibility='default'/>
+        <var-decl name='bigint_sub' type-id='type-id-1181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='bigint_mul' type-id='type-id-1167' visibility='default'/>
+        <var-decl name='bigint_mul' type-id='type-id-1181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='bigint_add_ui' type-id='type-id-1173' visibility='default'/>
+        <var-decl name='bigint_add_ui' type-id='type-id-1187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='bigint_sub_ui' type-id='type-id-1173' visibility='default'/>
+        <var-decl name='bigint_sub_ui' type-id='type-id-1187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='bigint_mul_ui' type-id='type-id-1173' visibility='default'/>
+        <var-decl name='bigint_mul_ui' type-id='type-id-1187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='bigint_div' type-id='type-id-1167' visibility='default'/>
+        <var-decl name='bigint_div' type-id='type-id-1181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='bigint_prime_check' type-id='type-id-1174' visibility='default'/>
+        <var-decl name='bigint_prime_check' type-id='type-id-1188' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='bigint_scan' type-id='type-id-1175' visibility='default'/>
+        <var-decl name='bigint_scan' type-id='type-id-1189' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='bigint_print' type-id='type-id-1176' visibility='default'/>
+        <var-decl name='bigint_print' type-id='type-id-1190' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-318' size-in-bits='64' id='type-id-1177'/>
-    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-1162'/>
-    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-1163'/>
-    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-1164'/>
-    <qualified-type-def type-id='type-id-318' const='yes' 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'/>
-    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-1168'/>
-    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-1169'/>
-    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-1170'/>
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-1171'/>
-    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1172'/>
-    <pointer-type-def type-id='type-id-1190' size-in-bits='64' id='type-id-1173'/>
-    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-1174'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1192'>
+    <pointer-type-def type-id='type-id-318' size-in-bits='64' id='type-id-1191'/>
+    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-1176'/>
+    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-1177'/>
+    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-1178'/>
+    <qualified-type-def type-id='type-id-318' const='yes' id='type-id-1195'/>
+    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-1179'/>
+    <pointer-type-def type-id='type-id-1197' size-in-bits='64' id='type-id-1180'/>
+    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-1181'/>
+    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-1182'/>
+    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-1183'/>
+    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-1184'/>
+    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-1185'/>
+    <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'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1206'>
       <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-1192' id='type-id-1193'/>
-    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-1175'/>
-    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-1176'/>
-    <typedef-decl name='gnutls_crypto_bigint_st' type-id='type-id-1161' id='type-id-1196'/>
-    <var-decl name='_gnutls_mpi_ops' type-id='type-id-1196' 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-1206' id='type-id-1207'/>
+    <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-1189'/>
+    <pointer-type-def type-id='type-id-1209' size-in-bits='64' id='type-id-1190'/>
+    <typedef-decl name='gnutls_crypto_bigint_st' type-id='type-id-1175' id='type-id-1210'/>
+    <var-decl name='_gnutls_mpi_ops' type-id='type-id-1210' 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>
@@ -18942,88 +19278,88 @@
     <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-1178'>
-      <parameter type-id='type-id-1177'/>
+    <function-type size-in-bits='64' id='type-id-1192'>
+      <parameter type-id='type-id-1191'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1179'>
-      <parameter type-id='type-id-1177'/>
+    <function-type size-in-bits='64' id='type-id-1193'>
+      <parameter type-id='type-id-1191'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1191'>
-      <parameter type-id='type-id-1181'/>
+    <function-type size-in-bits='64' id='type-id-1205'>
+      <parameter type-id='type-id-1195'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1182'>
-      <parameter type-id='type-id-1181'/>
-      <parameter type-id='type-id-1181'/>
+    <function-type size-in-bits='64' id='type-id-1196'>
+      <parameter type-id='type-id-1195'/>
+      <parameter type-id='type-id-1195'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1183'>
-      <parameter type-id='type-id-1181'/>
+    <function-type size-in-bits='64' id='type-id-1197'>
+      <parameter type-id='type-id-1195'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1195'>
-      <parameter type-id='type-id-1181'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-421'/>
-      <parameter type-id='type-id-1193'/>
+    <function-type size-in-bits='64' id='type-id-1209'>
+      <parameter type-id='type-id-1195'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-422'/>
+      <parameter type-id='type-id-1207'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1185'>
+    <function-type size-in-bits='64' id='type-id-1199'>
       <parameter type-id='type-id-318'/>
-      <parameter type-id='type-id-1181'/>
+      <parameter type-id='type-id-1195'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1184'>
+    <function-type size-in-bits='64' id='type-id-1198'>
       <parameter type-id='type-id-318'/>
-      <parameter type-id='type-id-1181'/>
-      <parameter type-id='type-id-1181'/>
+      <parameter type-id='type-id-1195'/>
+      <parameter type-id='type-id-1195'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1189'>
+    <function-type size-in-bits='64' id='type-id-1203'>
       <parameter type-id='type-id-318'/>
-      <parameter type-id='type-id-1181'/>
-      <parameter type-id='type-id-1181'/>
-      <parameter type-id='type-id-1181'/>
+      <parameter type-id='type-id-1195'/>
+      <parameter type-id='type-id-1195'/>
+      <parameter type-id='type-id-1195'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1190'>
+    <function-type size-in-bits='64' id='type-id-1204'>
       <parameter type-id='type-id-318'/>
-      <parameter type-id='type-id-1181'/>
+      <parameter type-id='type-id-1195'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1187'>
+    <function-type size-in-bits='64' id='type-id-1201'>
       <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1194'>
+    <function-type size-in-bits='64' id='type-id-1208'>
       <parameter type-id='type-id-318'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-1193'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-1207'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1186'>
-      <parameter type-id='type-id-1181'/>
+    <function-type size-in-bits='64' id='type-id-1200'>
+      <parameter type-id='type-id-1195'/>
       <return type-id='type-id-318'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1188'>
-      <parameter type-id='type-id-1181'/>
+    <function-type size-in-bits='64' id='type-id-1202'>
+      <parameter type-id='type-id-1195'/>
       <return type-id='type-id-10'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1180'>
+    <function-type size-in-bits='64' id='type-id-1194'>
       <parameter type-id='type-id-318'/>
       <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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
-    <var-decl name='_gnutls_mac_ops' type-id='type-id-1112' visibility='default'/>
-    <var-decl name='_gnutls_digest_ops' type-id='type-id-1127' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='mac.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <var-decl name='_gnutls_mac_ops' type-id='type-id-1124' visibility='default'/>
+    <var-decl name='_gnutls_digest_ops' type-id='type-id-1140' visibility='default'/>
     <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>
@@ -19048,10 +19384,16 @@
     <function-decl name='_gnutls_streebog256_init' mangled-name='_gnutls_streebog256_init' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_backport_nettle_cmac_aes256_set_key' mangled-name='_gnutls_backport_nettle_cmac_aes256_set_key' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nettle_aes192_set_encrypt_key' mangled-name='nettle_aes192_set_encrypt_key' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='nettle_aes128_set_encrypt_key' mangled-name='nettle_aes128_set_encrypt_key' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_backport_nettle_cmac_aes128_set_key' mangled-name='_gnutls_backport_nettle_cmac_aes128_set_key' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nettle_cmac_aes256_set_key' mangled-name='nettle_cmac_aes256_set_key' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='nettle_cmac_aes128_set_key' mangled-name='nettle_cmac_aes128_set_key' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_umac128_set_key' mangled-name='nettle_umac128_set_key' visibility='default' binding='global' size-in-bits='64'>
@@ -19060,12 +19402,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'>
+      <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'>
+      <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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
-    <var-decl name='_gnutls_cipher_ops' type-id='type-id-1105' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='cipher.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <var-decl name='_gnutls_cipher_ops' type-id='type-id-1116' 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>
@@ -19093,6 +19441,15 @@
     <function-decl name='nettle_chacha_poly1305_set_nonce' mangled-name='nettle_chacha_poly1305_set_nonce' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
+    <function-decl name='_gnutls_gost28147_cnt_crypt' mangled-name='_gnutls_gost28147_cnt_crypt' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gost28147_cnt_set_iv' mangled-name='_gnutls_gost28147_cnt_set_iv' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <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'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19112,42 +19469,38 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='prf.c' comp-dir-path='/home/nmavrogi/cvs/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-100' name='master_size'/>
-      <parameter type-id='type-id-102' name='master'/>
-      <parameter type-id='type-id-100' name='label_size'/>
+      <parameter type-id='type-id-99' name='master_size'/>
+      <parameter type-id='type-id-101' name='master'/>
+      <parameter type-id='type-id-99' name='label_size'/>
       <parameter type-id='type-id-27' name='label'/>
-      <parameter type-id='type-id-100' name='seed_size'/>
-      <parameter type-id='type-id-983' name='seed'/>
-      <parameter type-id='type-id-100' name='outsize'/>
+      <parameter type-id='type-id-99' name='seed_size'/>
+      <parameter type-id='type-id-898' name='seed'/>
+      <parameter type-id='type-id-99' name='outsize'/>
       <parameter type-id='type-id-376' name='out'/>
       <return type-id='type-id-22'/>
     </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_tls10_prf' mangled-name='nettle_tls10_prf' visibility='default' binding='global' size-in-bits='64'>
+    <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>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='backport/cfb8.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
-    <function-decl name='nettle_memxor3' mangled-name='nettle_memxor3' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='_gnutls_hmac_streebog512_set_key' mangled-name='_gnutls_hmac_streebog512_set_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='backport/cmac.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
-    <function-decl name='nettle_aes128_set_encrypt_key' mangled-name='nettle_aes128_set_encrypt_key' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nettle_tls10_prf' mangled-name='nettle_tls10_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='backport/xts.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
-    <function-decl name='nettle_aes128_set_decrypt_key' mangled-name='nettle_aes128_set_decrypt_key' visibility='default' binding='global' size-in-bits='64'>
+  <abi-instr version='1.0' address-size='64' path='backport/cfb8.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='rnd.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -19158,19 +19511,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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
-    <class-decl name='rsa_public_key' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-1197'>
+  <abi-instr version='1.0' address-size='64' path='int/rsa-keygen-fips186.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <class-decl name='rsa_public_key' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-1211'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='size' type-id='type-id-100' visibility='default'/>
+        <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-1198' visibility='default'/>
+        <var-decl name='n' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='e' type-id='type-id-1198' visibility='default'/>
+        <var-decl name='e' type-id='type-id-1212' 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-1199' visibility='default' id='type-id-1200'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1213' visibility='default' id='type-id-1214'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='_mp_alloc' type-id='type-id-22' visibility='default'/>
       </data-member>
@@ -19178,52 +19531,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-1201' visibility='default'/>
+        <var-decl name='_mp_d' type-id='type-id-1215' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='mp_limb_t' type-id='type-id-38' id='type-id-1202'/>
-    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-1201'/>
-    <typedef-decl name='__mpz_struct' type-id='type-id-1200' id='type-id-1199'/>
+    <typedef-decl name='mp_limb_t' type-id='type-id-38' id='type-id-1216'/>
+    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-1215'/>
+    <typedef-decl name='__mpz_struct' type-id='type-id-1214' id='type-id-1213'/>
 
-    <array-type-def dimensions='1' type-id='type-id-1199' size-in-bits='128' id='type-id-1203'>
-      <subrange length='1' type-id='type-id-38' id='type-id-1204'/>
+    <array-type-def dimensions='1' type-id='type-id-1213' size-in-bits='128' id='type-id-1217'>
+      <subrange length='1' type-id='type-id-38' id='type-id-1218'/>
 
     </array-type-def>
-    <typedef-decl name='mpz_t' type-id='type-id-1203' id='type-id-1198'/>
-    <pointer-type-def type-id='type-id-1197' size-in-bits='64' id='type-id-1205'/>
-    <class-decl name='rsa_private_key' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-1206'>
+    <typedef-decl name='mpz_t' type-id='type-id-1217' id='type-id-1212'/>
+    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-1219'/>
+    <class-decl name='rsa_private_key' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-1220'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='size' type-id='type-id-100' visibility='default'/>
+        <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-1198' visibility='default'/>
+        <var-decl name='d' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='p' type-id='type-id-1198' visibility='default'/>
+        <var-decl name='p' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='q' type-id='type-id-1198' visibility='default'/>
+        <var-decl name='q' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='a' type-id='type-id-1198' visibility='default'/>
+        <var-decl name='a' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='b' type-id='type-id-1198' visibility='default'/>
+        <var-decl name='b' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='c' type-id='type-id-1198' visibility='default'/>
+        <var-decl name='c' type-id='type-id-1212' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-1207'/>
-    <typedef-decl name='nettle_progress_func' type-id='type-id-1208' id='type-id-1209'/>
-    <pointer-type-def type-id='type-id-1209' size-in-bits='64' id='type-id-1210'/>
+    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-1221'/>
+    <typedef-decl name='nettle_progress_func' type-id='type-id-1222' id='type-id-1223'/>
+    <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-1224'/>
     <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-1205' name='pub'/>
-      <parameter type-id='type-id-1207' name='key'/>
+      <parameter type-id='type-id-1219' name='pub'/>
+      <parameter type-id='type-id-1221' name='key'/>
       <parameter type-id='type-id-10' name='seed_length'/>
       <parameter type-id='type-id-191' name='seed'/>
-      <parameter type-id='type-id-102' name='progress_ctx'/>
-      <parameter type-id='type-id-1210' name='progress'/>
+      <parameter type-id='type-id-101' name='progress_ctx'/>
+      <parameter type-id='type-id-1224' name='progress'/>
       <parameter type-id='type-id-10' name='n_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -19236,9 +19589,6 @@
     <function-decl name='__gmpz_lcm' mangled-name='__gmpz_lcm' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <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>
     <function-decl name='nettle_sha384_digest' mangled-name='nettle_sha384_digest' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
@@ -19254,13 +19604,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-1208'>
-      <parameter type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-1222'>
+      <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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='int/provable-prime.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -19268,50 +19618,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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
-    <class-decl name='dsa_params' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1211'>
+  <abi-instr version='1.0' address-size='64' path='int/dsa-keygen-fips186.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <class-decl name='dsa_params' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1225'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='p' type-id='type-id-1198' visibility='default'/>
+        <var-decl name='p' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='q' type-id='type-id-1198' visibility='default'/>
+        <var-decl name='q' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='g' type-id='type-id-1198' visibility='default'/>
+        <var-decl name='g' type-id='type-id-1212' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-1212'/>
-    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-1213'/>
-    <typedef-decl name='nettle_random_func' type-id='type-id-1124' id='type-id-1214'/>
-    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-1215'/>
+    <pointer-type-def type-id='type-id-1225' size-in-bits='64' id='type-id-1226'/>
+    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-1227'/>
+    <typedef-decl name='nettle_random_func' type-id='type-id-1137' id='type-id-1228'/>
+    <pointer-type-def type-id='type-id-1228' size-in-bits='64' id='type-id-1229'/>
     <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-1212' name='params'/>
-      <parameter type-id='type-id-1213' name='y'/>
-      <parameter type-id='type-id-1213' name='x'/>
-      <parameter type-id='type-id-102' name='random_ctx'/>
-      <parameter type-id='type-id-1215' name='random'/>
-      <parameter type-id='type-id-102' name='progress_ctx'/>
-      <parameter type-id='type-id-1210' name='progress'/>
+      <parameter type-id='type-id-1226' name='params'/>
+      <parameter type-id='type-id-1227' name='y'/>
+      <parameter type-id='type-id-1227' name='x'/>
+      <parameter type-id='type-id-101' name='random_ctx'/>
+      <parameter type-id='type-id-1229' name='random'/>
+      <parameter type-id='type-id-101' name='progress_ctx'/>
+      <parameter type-id='type-id-1224' 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-1216'>
+    <class-decl name='dss_params_validation_seeds' size-in-bits='6400' is-struct='yes' visibility='default' id='type-id-1230'>
       <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-1217' visibility='default'/>
+        <var-decl name='seed' type-id='type-id-1231' 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-1217' visibility='default'/>
+        <var-decl name='pseed' type-id='type-id-1231' 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-1217' visibility='default'/>
+        <var-decl name='qseed' type-id='type-id-1231' 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'/>
@@ -19321,28 +19671,28 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2056' id='type-id-1217'>
-      <subrange length='257' type-id='type-id-38' id='type-id-1218'/>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2056' id='type-id-1231'>
+      <subrange length='257' type-id='type-id-38' id='type-id-1232'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-1219'/>
+    <pointer-type-def type-id='type-id-1230' size-in-bits='64' id='type-id-1233'/>
     <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-1212' name='params'/>
-      <parameter type-id='type-id-1219' name='cert'/>
+      <parameter type-id='type-id-1226' name='params'/>
+      <parameter type-id='type-id-1233' name='cert'/>
       <parameter type-id='type-id-10' name='seed_length'/>
-      <parameter type-id='type-id-102' name='seed'/>
-      <parameter type-id='type-id-102' name='progress_ctx'/>
-      <parameter type-id='type-id-1210' name='progress'/>
+      <parameter type-id='type-id-101' name='seed'/>
+      <parameter type-id='type-id-101' name='progress_ctx'/>
+      <parameter type-id='type-id-1224' 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-1212' name='params'/>
+      <parameter type-id='type-id-1226' name='params'/>
       <parameter type-id='type-id-10' name='domain_seed_size'/>
-      <parameter type-id='type-id-983' name='domain_seed'/>
-      <parameter type-id='type-id-102' name='progress_ctx'/>
-      <parameter type-id='type-id-1210' name='progress'/>
+      <parameter type-id='type-id-898' name='domain_seed'/>
+      <parameter type-id='type-id-101' name='progress_ctx'/>
+      <parameter type-id='type-id-1224' name='progress'/>
       <parameter type-id='type-id-10' name='index'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -19350,16 +19700,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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='int/dsa-validate.c' comp-dir-path='/home/nmavrogi/cvs/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-1212' name='pub'/>
-      <parameter type-id='type-id-1219' name='cert'/>
+      <parameter type-id='type-id-1226' name='pub'/>
+      <parameter type-id='type-id-1233' 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-1212' name='pub'/>
+      <parameter type-id='type-id-1226' name='pub'/>
       <parameter type-id='type-id-10' name='domain_seed_size'/>
-      <parameter type-id='type-id-983' name='domain_seed'/>
+      <parameter type-id='type-id-898' name='domain_seed'/>
       <parameter type-id='type-id-10' name='index'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -19373,7 +19723,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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='int/tls1-prf.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -19381,10 +19731,47 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-1221'/>
-    <typedef-decl name='get_entropy_func' type-id='type-id-1221' id='type-id-1222'/>
-    <var-decl name='_rnd_get_system_entropy' type-id='type-id-1222' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='int/dsa-compute-k.c' comp-dir-path='/home/nmavrogi/cvs/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>
+    <function-decl name='__gmpn_copyi' mangled-name='__gmpn_copyi' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='mpn_set_base256' mangled-name='mpn_set_base256' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpz_limbs_read' mangled-name='__gmpz_limbs_read' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpz_limbs_write' mangled-name='__gmpz_limbs_write' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpz_limbs_finish' mangled-name='__gmpz_limbs_finish' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='mpn_get_base256' mangled-name='mpn_get_base256' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpn_sub_n' mangled-name='__gmpn_sub_n' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpn_cnd_add_n' mangled-name='__gmpn_cnd_add_n' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpn_zero' mangled-name='__gmpn_zero' 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='int/ecdsa-compute-k.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-1235'/>
+    <typedef-decl name='get_entropy_func' type-id='type-id-1235' id='type-id-1236'/>
+    <var-decl name='_rnd_get_system_entropy' type-id='type-id-1236' 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>
@@ -19403,62 +19790,85 @@
     <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-1220'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
+    <function-type size-in-bits='64' id='type-id-1234'>
+      <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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
-    <class-decl name='gost28147_param' size-in-bits='32800' is-struct='yes' visibility='default' id='type-id-1223'>
+  <abi-instr version='1.0' address-size='64' path='gost/gost28147.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <class-decl name='gost28147_param' size-in-bits='32800' is-struct='yes' visibility='default' id='type-id-1237'>
       <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-1224' visibility='default'/>
+        <var-decl name='sbox' type-id='type-id-1238' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='32768' id='type-id-1224'>
-      <subrange length='1024' type-id='type-id-38' id='type-id-1225'/>
+    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='32768' id='type-id-1238'>
+      <subrange length='1024' type-id='type-id-38' id='type-id-1239'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-1223' const='yes' id='type-id-1226'/>
-    <var-decl name='_gnutls_gost28147_param_test_3411' type-id='type-id-1226' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_3411' type-id='type-id-1226' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_Test_89' type-id='type-id-1226' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_A' type-id='type-id-1226' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_B' type-id='type-id-1226' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_C' type-id='type-id-1226' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_D' type-id='type-id-1226' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_TC26_Z' type-id='type-id-1226' visibility='default'/>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/gosthash94.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1240'/>
+    <var-decl name='_gnutls_gost28147_param_test_3411' type-id='type-id-1240' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_3411' type-id='type-id-1240' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_Test_89' type-id='type-id-1240' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_A' type-id='type-id-1240' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_B' type-id='type-id-1240' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_C' type-id='type-id-1240' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_D' type-id='type-id-1240' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_TC26_Z' type-id='type-id-1240' 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/nmavrogi/cvs/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>
+    <function-decl name='_gnutls_gost28147_imit_update' mangled-name='_gnutls_gost28147_imit_update' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gost28147_imit_digest' mangled-name='_gnutls_gost28147_imit_digest' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='nettle_memeql_sec' mangled-name='nettle_memeql_sec' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gost28147_encrypt' mangled-name='_gnutls_gost28147_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='gost/gosthash94.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
-    <var-decl name='_gnutls_gosthash94cp' type-id='type-id-1126' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='gost/gosthash94-meta.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <var-decl name='_gnutls_gosthash94cp' type-id='type-id-1139' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/streebog-meta.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
-    <var-decl name='_gnutls_streebog512' type-id='type-id-1126' visibility='default'/>
-    <var-decl name='_gnutls_streebog256' type-id='type-id-1126' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='gost/streebog-meta.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <var-decl name='_gnutls_streebog512' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='_gnutls_streebog256' type-id='type-id-1139' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/hmac-gosthash94.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/hmac-gosthash94.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/hmac-streebog.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/bignum-le.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -19466,7 +19876,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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/pbkdf2-hmac-gosthash94.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/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>
@@ -19474,15 +19884,7 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/pbkdf2-hmac-streebog.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
-    <function-decl name='_gnutls_hmac_streebog512_set_key' mangled-name='_gnutls_hmac_streebog512_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>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/ecc-gostdsa-sign.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/ecc-gostdsa-sign.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -19492,14 +19894,11 @@
     <function-decl name='_nettle_ecc_mod_add' mangled-name='_nettle_ecc_mod_add' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='__gmpn_sub_n' mangled-name='__gmpn_sub_n' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-111'/>
-    </function-decl>
     <function-decl name='_nettle_cnd_copy' mangled-name='_nettle_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='gost/gostdsa-mask.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-mask.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -19510,21 +19909,15 @@
       <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/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
-    <function-decl name='__gmpz_limbs_write' mangled-name='__gmpz_limbs_write' 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='gost/gostdsa-sign.c' comp-dir-path='/home/nmavrogi/cvs/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>
     <function-decl name='_gnutls_ecc_gostdsa_sign' mangled-name='_gnutls_ecc_gostdsa_sign' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='__gmpz_limbs_finish' mangled-name='__gmpz_limbs_finish' 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-verify.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-verify.c' comp-dir-path='/home/nmavrogi/cvs/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>
@@ -19541,11 +19934,19 @@
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/ecc-gost-hash.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-nmav/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-vko.c' comp-dir-path='/home/nmavrogi/cvs/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>
-    <function-decl name='__gmpn_rshift' mangled-name='__gmpn_rshift' visibility='default' binding='global' size-in-bits='64'>
+    <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/nmavrogi/cvs/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>
+    <function-decl name='_gnutls_gost28147_key_wrap_cryptopro' mangled-name='_gnutls_gost28147_key_wrap_cryptopro' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
diff --git a/devel/libgnutls-latest-x86_64.abi b/devel/libgnutls-latest-x86_64.abi
index cd7467d067..3e0142397c 100644
--- a/devel/libgnutls-latest-x86_64.abi
+++ b/devel/libgnutls-latest-x86_64.abi
@@ -5,8 +5,8 @@
     <dependency name='libunistring.so.2'/>
     <dependency name='libdl.so.2'/>
     <dependency name='libtasn1.so.6'/>
-    <dependency name='libnettle.so.6'/>
-    <dependency name='libhogweed.so.4'/>
+    <dependency name='libnettle.so.7'/>
+    <dependency name='libhogweed.so.5'/>
     <dependency name='libgmp.so.10'/>
     <dependency name='libc.so.6'/>
     <dependency name='ld-linux-x86-64.so.2'/>
@@ -22,8 +22,11 @@
     <elf-symbol name='_gnutls_anti_replay_check' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_bin2hex' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_buffer_append_str' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_buffer_clear' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_buffer_init' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_buffer_pop_datum' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_buffer_to_datum' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_buffer_unescape' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_cidr_to_string' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_cipher_get_iv' version='GNUTLS_FIPS140_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_cipher_to_entry' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -34,6 +37,9 @@
     <elf-symbol name='_gnutls_global_init_skip' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_global_set_gettime_function' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_hello_set_default_version' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_iov_iter_init' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_iov_iter_next' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_gnutls_iov_iter_sync' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_ip_to_string' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_lib_force_operational' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_gnutls_lib_simulate_error' version='GNUTLS_PRIVATE_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -62,8 +68,8 @@
     <elf-symbol name='gnutls_aead_cipher_decryptv2' version='GNUTLS_3_6_10' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_aead_cipher_deinit' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_aead_cipher_encrypt' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='gnutls_aead_cipher_encryptv' version='GNUTLS_3_6_3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_aead_cipher_encryptv2' version='GNUTLS_3_6_10' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='gnutls_aead_cipher_encryptv' version='GNUTLS_3_6_3' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_aead_cipher_init' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_alert_get' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gnutls_alert_get_name' version='GNUTLS_3_4' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -1292,11 +1298,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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='range.c' comp-dir-path='/home/nmavrogi/cvs/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='52416' is-struct='yes' visibility='default' id='type-id-4'>
+    <class-decl name='gnutls_session_int' size-in-bits='52736' 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>
@@ -1604,7 +1610,7 @@
         <var-decl name='block_size' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='preimage_insecure' type-id='type-id-10' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
     <typedef-decl name='mac_entry_st' type-id='type-id-47' id='type-id-48'/>
@@ -1864,7 +1870,7 @@
     <qualified-type-def type-id='type-id-72' const='yes' id='type-id-77'/>
     <pointer-type-def type-id='type-id-77' size-in-bits='64' id='type-id-23'/>
     <typedef-decl name='security_parameters_st' type-id='type-id-9' id='type-id-5'/>
-    <class-decl name='record_parameters_st' size-in-bits='5376' is-struct='yes' visibility='default' id='type-id-78'>
+    <class-decl name='record_parameters_st' size-in-bits='5504' is-struct='yes' visibility='default' id='type-id-78'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='epoch' type-id='type-id-11' visibility='default'/>
       </data-member>
@@ -1892,10 +1898,10 @@
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='read' type-id='type-id-81' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2880'>
+      <data-member access='public' layout-offset-in-bits='2944'>
         <var-decl name='write' type-id='type-id-81' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='5312'>
+      <data-member access='public' layout-offset-in-bits='5440'>
         <var-decl name='usage_cnt' type-id='type-id-22' visibility='default'/>
       </data-member>
     </class-decl>
@@ -1928,13 +1934,7 @@
         <var-decl name='tagsize' type-id='type-id-11' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='xor_nonce' type-id='type-id-75' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='232'>
-        <var-decl name='only_aead' type-id='type-id-75' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='240'>
-        <var-decl name='no_rekey' type-id='type-id-75' visibility='default'/>
+        <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-84'>
@@ -1949,7 +1949,7 @@
     <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-79'/>
     <typedef-decl name='__uint64_t' type-id='type-id-38' id='type-id-87'/>
     <typedef-decl name='uint64_t' type-id='type-id-87' id='type-id-80'/>
-    <class-decl name='record_state_st' size-in-bits='2432' is-struct='yes' visibility='default' id='type-id-88'>
+    <class-decl name='record_state_st' size-in-bits='2496' is-struct='yes' visibility='default' id='type-id-88'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='mac_key' type-id='type-id-89' visibility='default'/>
       </data-member>
@@ -1971,143 +1971,151 @@
       <data-member access='public' layout-offset-in-bits='1024'>
         <var-decl name='ctx' type-id='type-id-91' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2304'>
+      <data-member access='public' layout-offset-in-bits='2368'>
         <var-decl name='aead_tag_size' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2336'>
+      <data-member access='public' layout-offset-in-bits='2400'>
         <var-decl name='is_aead' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='sequence_number' type-id='type-id-92' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='2432'>
+        <var-decl name='sequence_number' type-id='type-id-80' visibility='default'/>
       </data-member>
     </class-decl>
 
     <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='512' id='type-id-89'>
-      <subrange length='64' type-id='type-id-38' id='type-id-93'/>
+      <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
 
     <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='128' id='type-id-90'>
-      <subrange length='16' type-id='type-id-38' id='type-id-94'/>
+      <subrange length='16' type-id='type-id-38' id='type-id-93'/>
 
     </array-type-def>
-    <union-decl name='__anonymous_union__' size-in-bits='1280' is-anonymous='yes' visibility='default' id='type-id-91'>
+    <union-decl name='__anonymous_union__' size-in-bits='1344' is-anonymous='yes' visibility='default' id='type-id-91'>
       <data-member access='private'>
-        <var-decl name='tls12' type-id='type-id-95' visibility='default'/>
+        <var-decl name='tls12' type-id='type-id-94' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='aead' type-id='type-id-96' visibility='default'/>
+        <var-decl name='aead' type-id='type-id-95' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='1280' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-95' visibility='default' id='type-id-97'>
+    <class-decl name='__anonymous_struct__' size-in-bits='1344' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-94' visibility='default' id='type-id-96'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cipher' type-id='type-id-98' visibility='default'/>
+        <var-decl name='cipher' type-id='type-id-97' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='mac' type-id='type-id-99' visibility='default'/>
+        <var-decl name='mac' type-id='type-id-98' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='is_mac' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='30'>
-        <var-decl name='non_null' type-id='type-id-10' visibility='default'/>
+        <var-decl name='continuous_mac' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='29'>
+        <var-decl name='non_null' type-id='type-id-10' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='28'>
         <var-decl name='etm' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='tag_size' type-id='type-id-100' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='1280'>
+        <var-decl name='tag_size' type-id='type-id-99' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='704' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-98' visibility='default' id='type-id-101'>
+    <class-decl name='__anonymous_struct__' size-in-bits='704' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-97' visibility='default' id='type-id-100'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='handle' type-id='type-id-102' visibility='default'/>
+        <var-decl name='handle' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='e' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='encrypt' type-id='type-id-103' visibility='default'/>
+        <var-decl name='encrypt' type-id='type-id-102' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='decrypt' type-id='type-id-104' visibility='default'/>
+        <var-decl name='decrypt' type-id='type-id-103' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='aead_encrypt' type-id='type-id-105' visibility='default'/>
+        <var-decl name='aead_encrypt' type-id='type-id-104' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='aead_decrypt' type-id='type-id-106' visibility='default'/>
+        <var-decl name='aead_decrypt' type-id='type-id-105' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='auth' type-id='type-id-107' visibility='default'/>
+        <var-decl name='auth' type-id='type-id-106' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='tag' type-id='type-id-108' visibility='default'/>
+        <var-decl name='tag' type-id='type-id-107' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='setiv' type-id='type-id-109' visibility='default'/>
+        <var-decl name='setiv' type-id='type-id-108' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='getiv' type-id='type-id-110' visibility='default'/>
+        <var-decl name='getiv' type-id='type-id-109' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='deinit' type-id='type-id-111' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-110' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='void' id='type-id-112'/>
-    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-102'/>
-    <typedef-decl name='size_t' type-id='type-id-38' id='type-id-100'/>
-    <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-114'/>
-    <typedef-decl name='cipher_encrypt_func' type-id='type-id-114' id='type-id-103'/>
-    <typedef-decl name='cipher_decrypt_func' type-id='type-id-114' id='type-id-104'/>
-    <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-116'/>
-    <typedef-decl name='aead_cipher_encrypt_func' type-id='type-id-116' id='type-id-105'/>
-    <typedef-decl name='aead_cipher_decrypt_func' type-id='type-id-116' id='type-id-106'/>
-    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-118'/>
-    <typedef-decl name='cipher_auth_func' type-id='type-id-118' id='type-id-107'/>
-    <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-120'/>
-    <typedef-decl name='cipher_tag_func' type-id='type-id-120' id='type-id-108'/>
-    <typedef-decl name='cipher_setiv_func' type-id='type-id-118' id='type-id-109'/>
-    <typedef-decl name='cipher_getiv_func' type-id='type-id-118' id='type-id-110'/>
-    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-122'/>
-    <typedef-decl name='cipher_deinit_func' type-id='type-id-122' id='type-id-111'/>
-    <typedef-decl name='cipher_hd_st' type-id='type-id-101' id='type-id-98'/>
-    <union-decl name='__anonymous_union__' size-in-bits='448' is-anonymous='yes' visibility='default' id='type-id-99'>
+    <type-decl name='void' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-101'/>
+    <typedef-decl name='size_t' type-id='type-id-38' id='type-id-99'/>
+    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-113'/>
+    <typedef-decl name='cipher_encrypt_func' type-id='type-id-113' id='type-id-102'/>
+    <typedef-decl name='cipher_decrypt_func' type-id='type-id-113' id='type-id-103'/>
+    <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-115'/>
+    <typedef-decl name='aead_cipher_encrypt_func' type-id='type-id-115' id='type-id-104'/>
+    <typedef-decl name='aead_cipher_decrypt_func' type-id='type-id-115' id='type-id-105'/>
+    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-117'/>
+    <typedef-decl name='cipher_auth_func' type-id='type-id-117' id='type-id-106'/>
+    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-119'/>
+    <typedef-decl name='cipher_tag_func' type-id='type-id-119' id='type-id-107'/>
+    <typedef-decl name='cipher_setiv_func' type-id='type-id-117' id='type-id-108'/>
+    <typedef-decl name='cipher_getiv_func' type-id='type-id-117' id='type-id-109'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-121'/>
+    <typedef-decl name='cipher_deinit_func' type-id='type-id-121' id='type-id-110'/>
+    <typedef-decl name='cipher_hd_st' type-id='type-id-100' id='type-id-97'/>
+    <union-decl name='__anonymous_union__' size-in-bits='512' is-anonymous='yes' visibility='default' id='type-id-98'>
       <data-member access='private'>
-        <var-decl name='dig' type-id='type-id-123' visibility='default'/>
+        <var-decl name='dig' type-id='type-id-122' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='mac' type-id='type-id-124' visibility='default'/>
+        <var-decl name='mac' type-id='type-id-123' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='448' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-123' visibility='default' id='type-id-125'>
+    <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-122' visibility='default' id='type-id-124'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='e' type-id='type-id-13' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='hash' type-id='type-id-126' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-125' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='output' type-id='type-id-127' visibility='default'/>
+        <var-decl name='output' type-id='type-id-126' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='deinit' type-id='type-id-128' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-127' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='key' type-id='type-id-102' visibility='default'/>
+        <var-decl name='copy' type-id='type-id-128' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='keysize' type-id='type-id-22' visibility='default'/>
+        <var-decl name='key' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='handle' type-id='type-id-102' visibility='default'/>
+        <var-decl name='keysize' type-id='type-id-22' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='handle' type-id='type-id-101' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='hash_func' type-id='type-id-118' id='type-id-126'/>
-    <typedef-decl name='output_func' type-id='type-id-118' id='type-id-127'/>
-    <typedef-decl name='hash_deinit_func' type-id='type-id-122' id='type-id-128'/>
-    <typedef-decl name='digest_hd_st' type-id='type-id-125' id='type-id-123'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='448' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-124' visibility='default' id='type-id-129'>
+    <typedef-decl name='hash_func' type-id='type-id-117' id='type-id-125'/>
+    <typedef-decl name='output_func' type-id='type-id-117' id='type-id-126'/>
+    <typedef-decl name='hash_deinit_func' type-id='type-id-121' id='type-id-127'/>
+    <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-130'/>
+    <typedef-decl name='copy_func' type-id='type-id-130' id='type-id-128'/>
+    <typedef-decl name='digest_hd_st' type-id='type-id-124' id='type-id-122'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-123' visibility='default' id='type-id-131'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='e' type-id='type-id-13' visibility='default'/>
       </data-member>
@@ -2115,52 +2123,44 @@
         <var-decl name='mac_len' type-id='type-id-22' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='hash' type-id='type-id-126' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-125' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='setnonce' type-id='type-id-130' visibility='default'/>
+        <var-decl name='setnonce' type-id='type-id-132' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='output' type-id='type-id-127' visibility='default'/>
+        <var-decl name='output' type-id='type-id-126' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='deinit' type-id='type-id-128' visibility='default'/>
+        <var-decl name='deinit' type-id='type-id-127' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='handle' type-id='type-id-102' visibility='default'/>
+        <var-decl name='copy' type-id='type-id-128' visibility='default'/>
       </data-member>
-    </class-decl>
-    <typedef-decl name='nonce_func' type-id='type-id-118' id='type-id-130'/>
-    <typedef-decl name='mac_hd_st' type-id='type-id-129' id='type-id-124'/>
-    <typedef-decl name='auth_cipher_hd_st' type-id='type-id-97' id='type-id-95'/>
-    <class-decl name='api_aead_cipher_hd_st' size-in-bits='704' is-struct='yes' visibility='default' id='type-id-131'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ctx_enc' type-id='type-id-98' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='handle' type-id='type-id-101' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='api_aead_cipher_hd_st' type-id='type-id-131' id='type-id-96'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-92' visibility='default' id='type-id-132'>
+    <typedef-decl name='nonce_func' type-id='type-id-117' id='type-id-132'/>
+    <typedef-decl name='mac_hd_st' type-id='type-id-131' id='type-id-123'/>
+    <typedef-decl name='auth_cipher_hd_st' type-id='type-id-96' id='type-id-94'/>
+    <class-decl name='api_aead_cipher_hd_st' size-in-bits='704' is-struct='yes' visibility='default' id='type-id-133'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='i' type-id='type-id-133' visibility='default'/>
+        <var-decl name='ctx_enc' type-id='type-id-97' visibility='default'/>
       </data-member>
     </class-decl>
-
-    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='64' id='type-id-133'>
-      <subrange length='8' type-id='type-id-38' id='type-id-134'/>
-
-    </array-type-def>
-    <typedef-decl name='gnutls_uint64' type-id='type-id-132' id='type-id-92'/>
+    <typedef-decl name='api_aead_cipher_hd_st' type-id='type-id-133' id='type-id-95'/>
     <typedef-decl name='record_state_st' type-id='type-id-88' id='type-id-81'/>
-    <typedef-decl name='record_parameters_st' type-id='type-id-78' id='type-id-135'/>
-    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-136'/>
+    <typedef-decl name='record_parameters_st' type-id='type-id-78' id='type-id-134'/>
+    <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-135'/>
 
-    <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='256' id='type-id-6'>
-      <subrange length='4' type-id='type-id-38' id='type-id-137'/>
+    <array-type-def dimensions='1' type-id='type-id-135' size-in-bits='256' id='type-id-6'>
+      <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-138'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='record_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='record_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='handshake_hash_buffer_prev_len' type-id='type-id-22' visibility='default'/>
@@ -2178,25 +2178,25 @@
         <var-decl name='handshake_hash_buffer_client_finished_len' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='handshake_hash_buffer' type-id='type-id-140' visibility='default'/>
+        <var-decl name='handshake_hash_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <var-decl name='resumable' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='736'>
-        <var-decl name='ticket_state' type-id='type-id-141' visibility='default'/>
+        <var-decl name='ticket_state' type-id='type-id-140' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='bye_state' type-id='type-id-142' visibility='default'/>
+        <var-decl name='bye_state' type-id='type-id-141' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='reauth_state' type-id='type-id-143' visibility='default'/>
+        <var-decl name='reauth_state' type-id='type-id-142' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='handshake_final_state' type-id='type-id-144' visibility='default'/>
+        <var-decl name='handshake_final_state' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='864'>
-        <var-decl name='handshake_state' type-id='type-id-144' visibility='default'/>
+        <var-decl name='handshake_state' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <var-decl name='invalid_connection' type-id='type-id-75' visibility='default'/>
@@ -2220,7 +2220,7 @@
         <var-decl name='last_handshake_out' type-id='type-id-22' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='priorities' type-id='type-id-145' visibility='default'/>
+        <var-decl name='priorities' type-id='type-id-144' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <var-decl name='allow_large_records' type-id='type-id-75' visibility='default'/>
@@ -2259,49 +2259,49 @@
         <var-decl name='resumption_data' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
-        <var-decl name='handshake_send_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='handshake_send_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3648'>
-        <var-decl name='handshake_header_recv_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='handshake_header_recv_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='handshake_recv_buffer' type-id='type-id-146' visibility='default'/>
+        <var-decl name='handshake_recv_buffer' type-id='type-id-145' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7360'>
         <var-decl name='handshake_recv_buffer_size' type-id='type-id-22' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7424'>
-        <var-decl name='record_recv_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='record_recv_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7680'>
-        <var-decl name='record_send_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='record_send_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7936'>
-        <var-decl name='record_send_buffer_user_size' type-id='type-id-100' visibility='default'/>
+        <var-decl name='record_send_buffer_user_size' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8000'>
-        <var-decl name='early_data_recv_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='early_data_recv_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
-        <var-decl name='early_data_presend_buffer' type-id='type-id-140' visibility='default'/>
+        <var-decl name='early_data_presend_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8512'>
-        <var-decl name='rsend_state' type-id='type-id-147' visibility='default'/>
+        <var-decl name='rsend_state' type-id='type-id-146' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8576'>
-        <var-decl name='record_key_update_buffer' type-id='type-id-140' visibility='default'/>
+        <var-decl name='record_key_update_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8832'>
-        <var-decl name='record_presend_buffer' type-id='type-id-140' visibility='default'/>
+        <var-decl name='record_presend_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9088'>
-        <var-decl name='reauth_buffer' type-id='type-id-140' visibility='default'/>
+        <var-decl name='reauth_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9344'>
         <var-decl name='expire_time' type-id='type-id-17' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9408'>
-        <var-decl name='auth_struct' type-id='type-id-148' visibility='default'/>
+        <var-decl name='auth_struct' type-id='type-id-147' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9472'>
         <var-decl name='adv_version_major' type-id='type-id-16' visibility='default'/>
@@ -2310,88 +2310,88 @@
         <var-decl name='adv_version_minor' type-id='type-id-16' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9504'>
-        <var-decl name='send_cert_req' type-id='type-id-149' visibility='default'/>
+        <var-decl name='send_cert_req' type-id='type-id-148' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9536'>
-        <var-decl name='max_handshake_data_buffer_size' type-id='type-id-100' visibility='default'/>
+        <var-decl name='max_handshake_data_buffer_size' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9600'>
-        <var-decl name='pull_timeout_func' type-id='type-id-150' visibility='default'/>
+        <var-decl name='pull_timeout_func' type-id='type-id-149' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
-        <var-decl name='pull_func' type-id='type-id-151' visibility='default'/>
+        <var-decl name='pull_func' type-id='type-id-150' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
-        <var-decl name='push_func' type-id='type-id-152' visibility='default'/>
+        <var-decl name='push_func' type-id='type-id-151' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9792'>
-        <var-decl name='vec_push_func' type-id='type-id-153' visibility='default'/>
+        <var-decl name='vec_push_func' type-id='type-id-152' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9856'>
-        <var-decl name='errno_func' type-id='type-id-154' visibility='default'/>
+        <var-decl name='errno_func' type-id='type-id-153' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9920'>
-        <var-decl name='transport_recv_ptr' type-id='type-id-155' visibility='default'/>
+        <var-decl name='transport_recv_ptr' type-id='type-id-154' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
-        <var-decl name='transport_send_ptr' type-id='type-id-155' visibility='default'/>
+        <var-decl name='transport_send_ptr' type-id='type-id-154' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10048'>
-        <var-decl name='db_store_func' type-id='type-id-156' visibility='default'/>
+        <var-decl name='db_store_func' type-id='type-id-155' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10112'>
-        <var-decl name='db_retrieve_func' type-id='type-id-157' visibility='default'/>
+        <var-decl name='db_retrieve_func' type-id='type-id-156' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
-        <var-decl name='db_remove_func' type-id='type-id-158' visibility='default'/>
+        <var-decl name='db_remove_func' type-id='type-id-157' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
-        <var-decl name='db_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='db_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
-        <var-decl name='user_hello_func' type-id='type-id-159' visibility='default'/>
+        <var-decl name='user_hello_func' type-id='type-id-158' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10368'>
-        <var-decl name='h_hook' type-id='type-id-160' visibility='default'/>
+        <var-decl name='h_hook' type-id='type-id-159' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10432'>
         <var-decl name='h_type' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10464'>
-        <var-decl name='h_post' type-id='type-id-161' visibility='default'/>
+        <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-162' visibility='default'/>
+        <var-decl name='selected_cert_list' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10624'>
-        <var-decl name='selected_key' type-id='type-id-163' visibility='default'/>
+        <var-decl name='selected_key' type-id='type-id-162' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10688'>
-        <var-decl name='selected_ocsp' type-id='type-id-164' visibility='default'/>
+        <var-decl name='selected_ocsp' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10816'>
-        <var-decl name='selected_ocsp_func' type-id='type-id-165' visibility='default'/>
+        <var-decl name='selected_ocsp_func' type-id='type-id-164' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10880'>
-        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10944'>
         <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-166' visibility='default'/>
+        <var-decl name='default_record_version' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10968'>
-        <var-decl name='default_hello_version' type-id='type-id-166' visibility='default'/>
+        <var-decl name='default_hello_version' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11008'>
-        <var-decl name='user_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='user_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11072'>
         <var-decl name='direction' type-id='type-id-75' visibility='default'/>
@@ -2400,7 +2400,7 @@
         <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-166' visibility='default'/>
+        <var-decl name='rsa_pms_version' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11104'>
         <var-decl name='errnum' type-id='type-id-22' visibility='default'/>
@@ -2409,13 +2409,13 @@
         <var-decl name='initial_negotiation_completed' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11200'>
-        <var-decl name='post_negotiation_lock' type-id='type-id-102' visibility='default'/>
+        <var-decl name='post_negotiation_lock' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11264'>
         <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-167' visibility='default'/>
+        <var-decl name='dtls' type-id='type-id-166' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11904'>
         <var-decl name='handshake_suspicious_loops' type-id='type-id-10' visibility='default'/>
@@ -2430,13 +2430,13 @@
         <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-168' visibility='default'/>
+        <var-decl name='cb_tls_unique' type-id='type-id-167' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12288'>
-        <var-decl name='handshake_start_time' type-id='type-id-169' visibility='default'/>
+        <var-decl name='handshake_start_time' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12416'>
-        <var-decl name='handshake_abs_timeout' type-id='type-id-169' visibility='default'/>
+        <var-decl name='handshake_abs_timeout' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12544'>
         <var-decl name='ertt' type-id='type-id-10' visibility='default'/>
@@ -2451,34 +2451,34 @@
         <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'>
-        <var-decl name='post_handshake_hash_buffer' type-id='type-id-140' visibility='default'/>
+        <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'>
         <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-169' visibility='default'/>
+        <var-decl name='last_key_update' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13248'>
         <var-decl name='key_update_count' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13312'>
-        <var-decl name='full_client_hello' type-id='type-id-140' visibility='default'/>
+        <var-decl name='full_client_hello' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13568'>
         <var-decl name='extensions_offset' type-id='type-id-22' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13632'>
-        <var-decl name='hb_local_data' type-id='type-id-140' visibility='default'/>
+        <var-decl name='hb_local_data' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13888'>
-        <var-decl name='hb_remote_data' type-id='type-id-140' visibility='default'/>
+        <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-169' visibility='default'/>
+        <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-169' visibility='default'/>
+        <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'/>
@@ -2493,10 +2493,10 @@
         <var-decl name='ocsp_check_ok' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14528'>
-        <var-decl name='hb_state' type-id='type-id-170' visibility='default'/>
+        <var-decl name='hb_state' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14560'>
-        <var-decl name='recv_state' type-id='type-id-171' visibility='default'/>
+        <var-decl name='recv_state' type-id='type-id-170' 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'/>
@@ -2505,13 +2505,13 @@
         <var-decl name='flags' type-id='type-id-80' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14720'>
-        <var-decl name='verify_callback' type-id='type-id-172' visibility='default'/>
+        <var-decl name='verify_callback' type-id='type-id-171' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14784'>
-        <var-decl name='vc_data' type-id='type-id-173' visibility='default'/>
+        <var-decl name='vc_data' 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-174' visibility='default'/>
+        <var-decl name='vc_sdata' type-id='type-id-173' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='15040'>
         <var-decl name='vc_elements' type-id='type-id-10' visibility='default'/>
@@ -2529,34 +2529,34 @@
         <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-175' visibility='default'/>
+        <var-decl name='saved_username' type-id='type-id-174' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16432'>
         <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-176' visibility='default'/>
+        <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-177' visibility='default'/>
+        <var-decl name='rsup' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17792'>
-        <var-decl name='rexts' type-id='type-id-178' visibility='default'/>
+        <var-decl name='rexts' type-id='type-id-177' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17920'>
-        <var-decl name='ext_data' type-id='type-id-179' visibility='default'/>
+        <var-decl name='ext_data' type-id='type-id-178' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24064'>
         <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-180' visibility='default'/>
+        <var-decl name='ext_msg' type-id='type-id-179' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24128'>
         <var-decl name='max_recv_size' type-id='type-id-10' visibility='default'/>
@@ -2571,75 +2571,75 @@
         <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-166' visibility='default'/>
+        <var-decl name='hrr_cs' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24416'>
         <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-181' visibility='default'/>
+        <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>
       <data-member access='public' layout-offset-in-bits='27648'>
-        <var-decl name='anti_replay' type-id='type-id-182' visibility='default'/>
+        <var-decl name='anti_replay' type-id='type-id-181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27712'>
-        <var-decl name='epoch_lock' type-id='type-id-102' visibility='default'/>
+        <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-183'>
+    <class-decl name='mbuffer_head_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-182'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-184' visibility='default'/>
+        <var-decl name='head' type-id='type-id-183' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tail' type-id='type-id-184' visibility='default'/>
+        <var-decl name='tail' type-id='type-id-183' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='length' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='byte_length' type-id='type-id-100' visibility='default'/>
+        <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-185'>
+    <class-decl name='mbuffer_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-184'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-184' visibility='default'/>
+        <var-decl name='next' type-id='type-id-183' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-184' visibility='default'/>
+        <var-decl name='prev' type-id='type-id-183' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='mark' type-id='type-id-100' visibility='default'/>
+        <var-decl name='mark' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='msg' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='maximum_size' type-id='type-id-100' visibility='default'/>
+        <var-decl name='maximum_size' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <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-186' visibility='default'/>
+        <var-decl name='type' type-id='type-id-185' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='record_sequence' type-id='type-id-92' visibility='default'/>
+        <var-decl name='record_sequence' type-id='type-id-80' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <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-187' visibility='default'/>
+        <var-decl name='htype' type-id='type-id-186' 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-185' size-in-bits='64' id='type-id-184'/>
-    <enum-decl name='content_type_t' id='type-id-188'>
+    <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'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_CHANGE_CIPHER_SPEC' value='20'/>
       <enumerator name='GNUTLS_ALERT' value='21'/>
@@ -2647,8 +2647,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-188' id='type-id-186'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-189'>
+    <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'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_HANDSHAKE_HELLO_REQUEST' value='0'/>
       <enumerator name='GNUTLS_HANDSHAKE_CLIENT_HELLO' value='1'/>
@@ -2671,39 +2671,39 @@
       <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-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-139'/>
-    <class-decl name='gnutls_buffer_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-191'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='allocd' type-id='type-id-192' visibility='default'/>
+        <var-decl name='allocd' type-id='type-id-191' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='data' type-id='type-id-192' visibility='default'/>
+        <var-decl name='data' type-id='type-id-191' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='max_length' type-id='type-id-100' visibility='default'/>
+        <var-decl name='max_length' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='length' type-id='type-id-100' visibility='default'/>
+        <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-192'/>
-    <typedef-decl name='gnutls_buffer_st' type-id='type-id-191' id='type-id-140'/>
-    <enum-decl name='send_ticket_state_t' id='type-id-193'>
+    <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'>
       <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-193' id='type-id-141'/>
-    <enum-decl name='bye_state_t' id='type-id-194'>
+    <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'>
       <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-194' id='type-id-142'/>
-    <enum-decl name='reauth_state_t' id='type-id-195'>
+    <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'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='REAUTH_STATE0' value='0'/>
       <enumerator name='REAUTH_STATE1' value='1'/>
@@ -2712,8 +2712,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-195' id='type-id-143'/>
-    <enum-decl name='handshake_state_t' id='type-id-196'>
+    <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'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='STATE0' value='0'/>
       <enumerator name='STATE1' value='1'/>
@@ -2767,46 +2767,46 @@
       <enumerator name='STATE115' value='115'/>
       <enumerator name='STATE150' value='116'/>
     </enum-decl>
-    <typedef-decl name='handshake_state_t' type-id='type-id-196' id='type-id-144'/>
-    <class-decl name='gnutls_priority_st' size-in-bits='41792' is-struct='yes' visibility='default' id='type-id-197'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='protocol' type-id='type-id-198' visibility='default'/>
+        <var-decl name='protocol' type-id='type-id-197' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2080'>
-        <var-decl name='client_ctype' type-id='type-id-198' visibility='default'/>
+        <var-decl name='client_ctype' type-id='type-id-197' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4160'>
-        <var-decl name='server_ctype' type-id='type-id-198' visibility='default'/>
+        <var-decl name='server_ctype' type-id='type-id-197' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6240'>
-        <var-decl name='_cipher' type-id='type-id-198' visibility='default'/>
+        <var-decl name='_cipher' type-id='type-id-197' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
-        <var-decl name='_mac' type-id='type-id-198' visibility='default'/>
+        <var-decl name='_mac' type-id='type-id-197' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10400'>
-        <var-decl name='_kx' type-id='type-id-198' visibility='default'/>
+        <var-decl name='_kx' type-id='type-id-197' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12480'>
-        <var-decl name='_sign_algo' type-id='type-id-198' visibility='default'/>
+        <var-decl name='_sign_algo' type-id='type-id-197' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14560'>
-        <var-decl name='_supported_ecc' type-id='type-id-198' visibility='default'/>
+        <var-decl name='_supported_ecc' type-id='type-id-197' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16640'>
-        <var-decl name='groups' type-id='type-id-199' visibility='default'/>
+        <var-decl name='groups' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='20800'>
-        <var-decl name='sigalg' type-id='type-id-200' visibility='default'/>
+        <var-decl name='sigalg' type-id='type-id-199' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24960'>
-        <var-decl name='cs' type-id='type-id-201' visibility='default'/>
+        <var-decl name='cs' type-id='type-id-200' 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-202' visibility='default'/>
+        <var-decl name='sr' type-id='type-id-201' 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'/>
@@ -2836,7 +2836,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-203' visibility='default'/>
+        <var-decl name='level' type-id='type-id-202' 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'/>
@@ -2863,26 +2863,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-204' visibility='default'/>
+        <var-decl name='usage_cnt' type-id='type-id-203' 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-198' visibility='default' id='type-id-205'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='priorities' type-id='type-id-206' visibility='default'/>
+        <var-decl name='priorities' type-id='type-id-205' 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-206'>
-      <subrange length='64' type-id='type-id-38' id='type-id-93'/>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='2048' id='type-id-205'>
+      <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
-    <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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-208' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-207' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
@@ -2892,20 +2892,20 @@
       </data-member>
     </class-decl>
 
-    <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-93'/>
+    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='4096' id='type-id-207'>
+      <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-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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-210' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-209' 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-211'>
+    <class-decl name='gnutls_sign_entry_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-210'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
@@ -2919,7 +2919,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-212' visibility='default'/>
+        <var-decl name='hash' type-id='type-id-211' 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'/>
@@ -2928,19 +2928,19 @@
         <var-decl name='cert_pk' type-id='type-id-60' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='tls13_ok' type-id='type-id-10' visibility='default'/>
+        <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='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-213' visibility='default'/>
+        <var-decl name='aid' type-id='type-id-212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='slevel' type-id='type-id-214' visibility='default'/>
+        <var-decl name='slevel' type-id='type-id-213' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-215'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-214'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_DIG_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_DIG_NULL' value='1'/>
@@ -2961,61 +2961,61 @@
       <enumerator name='GNUTLS_DIG_STREEBOG_256' value='16'/>
       <enumerator name='GNUTLS_DIG_STREEBOG_512' value='17'/>
     </enum-decl>
-    <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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='id' type-id='type-id-166' visibility='default'/>
+        <var-decl name='id' type-id='type-id-165' 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-166'>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='16' id='type-id-165'>
       <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-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'>
+    <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'>
       <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-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'/>
+    <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'/>
 
-    <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-93'/>
+    <array-type-def dimensions='1' type-id='type-id-219' size-in-bits='4096' id='type-id-209'>
+      <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-209' id='type-id-200'/>
-    <class-decl name='ciphersuite_list_st' size-in-bits='16448' is-struct='yes' visibility='default' id='type-id-221'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entry' type-id='type-id-222' visibility='default'/>
+        <var-decl name='entry' type-id='type-id-221' 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-223'/>
+    <typedef-decl name='gnutls_cipher_suite_entry_st' type-id='type-id-26' id='type-id-222'/>
 
-    <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 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>
-    <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'>
+    <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'>
       <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-225' id='type-id-202'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-226'>
+    <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'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_SEC_PARAM_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_SEC_PARAM_INSECURE' value='5'/>
@@ -3030,15 +3030,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-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-145'/>
-    <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'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='htype' type-id='type-id-187' visibility='default'/>
+        <var-decl name='htype' type-id='type-id-186' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='rtype' type-id='type-id-187' visibility='default'/>
+        <var-decl name='rtype' type-id='type-id-186' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='length' type-id='type-id-18' visibility='default'/>
@@ -3053,27 +3053,27 @@
         <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-229' visibility='default'/>
+        <var-decl name='header' type-id='type-id-228' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='data' type-id='type-id-140' visibility='default'/>
+        <var-decl name='data' type-id='type-id-139' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <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 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>
-    <typedef-decl name='handshake_buffer_st' type-id='type-id-228' id='type-id-227'/>
+    <typedef-decl name='handshake_buffer_st' type-id='type-id-227' id='type-id-226'/>
 
-    <array-type-def dimensions='1' type-id='type-id-227' size-in-bits='3456' id='type-id-146'>
-      <subrange length='6' type-id='type-id-38' id='type-id-231'/>
+    <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>
-    <enum-decl name='record_send_state_t' id='type-id-232'>
+    <enum-decl name='record_send_state_t' id='type-id-231'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='RECORD_SEND_NORMAL' value='0'/>
       <enumerator name='RECORD_SEND_CORKED' value='1'/>
@@ -3082,99 +3082,99 @@
       <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-232' id='type-id-147'/>
-    <class-decl name='mod_auth_st_int' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-233'>
+    <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'>
       <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-234' visibility='default'/>
+        <var-decl name='gnutls_generate_server_certificate' type-id='type-id-233' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='gnutls_generate_client_certificate' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_generate_client_certificate' type-id='type-id-233' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='gnutls_generate_server_kx' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_generate_server_kx' type-id='type-id-233' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='gnutls_generate_client_kx' type-id='type-id-234' visibility='default'/>
+        <var-decl name='gnutls_generate_client_kx' type-id='type-id-233' 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-234' visibility='default'/>
+        <var-decl name='gnutls_generate_client_crt_vrfy' type-id='type-id-233' 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-234' visibility='default'/>
+        <var-decl name='gnutls_generate_server_crt_request' type-id='type-id-233' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='gnutls_process_server_certificate' type-id='type-id-235' visibility='default'/>
+        <var-decl name='gnutls_process_server_certificate' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='gnutls_process_client_certificate' type-id='type-id-235' visibility='default'/>
+        <var-decl name='gnutls_process_client_certificate' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='gnutls_process_server_kx' type-id='type-id-235' visibility='default'/>
+        <var-decl name='gnutls_process_server_kx' type-id='type-id-234' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='gnutls_process_client_kx' type-id='type-id-235' visibility='default'/>
+        <var-decl name='gnutls_process_client_kx' type-id='type-id-234' 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-235' visibility='default'/>
+        <var-decl name='gnutls_process_client_crt_vrfy' type-id='type-id-234' 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-235' visibility='default'/>
+        <var-decl name='gnutls_process_server_crt_request' type-id='type-id-234' visibility='default'/>
       </data-member>
     </class-decl>
-    <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-140' size-in-bits='64' id='type-id-238'/>
+    <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-239' size-in-bits='64' id='type-id-234'/>
-    <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-148'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-242'>
+    <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'>
       <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-242' id='type-id-149'/>
-    <typedef-decl name='gnutls_transport_ptr_t' type-id='type-id-102' id='type-id-155'/>
-    <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-150'/>
-    <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-151'/>
-    <typedef-decl name='gnutls_push_func' type-id='type-id-246' id='type-id-152'/>
-    <class-decl name='iovec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-247'>
+    <typedef-decl name='gnutls_certificate_request_t' type-id='type-id-241' 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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='iov_base' type-id='type-id-102' visibility='default'/>
+        <var-decl name='iov_base' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='iov_len' type-id='type-id-100' visibility='default'/>
+        <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-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-153'/>
-    <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-154'/>
-    <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-156'/>
-    <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-157'/>
-    <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-158'/>
-    <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-159'/>
-    <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-160'/>
-    <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-161'/>
-    <class-decl name='gnutls_pcert_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-267'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pubkey' type-id='type-id-268' visibility='default'/>
+        <var-decl name='pubkey' type-id='type-id-267' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cert' type-id='type-id-62' visibility='default'/>
@@ -3183,14 +3183,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='4032' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-269'/>
-    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-270'/>
-    <typedef-decl name='gnutls_pubkey_t' type-id='type-id-270' id='type-id-268'/>
-    <typedef-decl name='gnutls_pcert_st' type-id='type-id-267' id='type-id-271'/>
+    <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_privkey_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-272'/>
-    <pointer-type-def type-id='type-id-272' 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-273'>
+    <class-decl name='gnutls_ocsp_data_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-272'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='version' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -3201,20 +3201,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-274' visibility='default'/>
+        <var-decl name='padding' type-id='type-id-273' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='256' id='type-id-274'>
+    <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='256' id='type-id-273'>
       <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-273' id='type-id-275'/>
-    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-164'/>
-    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-276'/>
-    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-278'/>
-    <typedef-decl name='gnutls_status_request_ocsp_func' type-id='type-id-278' 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-279'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='dcookie' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -3246,35 +3246,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-169' visibility='default'/>
+        <var-decl name='last_retransmit' type-id='type-id-168' 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-169'>
+    <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-168'>
       <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-280' visibility='default'/>
+        <var-decl name='tv_nsec' type-id='type-id-279' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__syscall_slong_t' type-id='type-id-1' id='type-id-280'/>
-    <typedef-decl name='dtls_st' type-id='type-id-279' id='type-id-167'/>
+    <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'/>
 
-    <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-281'/>
+    <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>
-    <enum-decl name='heartbeat_state_t' id='type-id-282'>
+    <enum-decl name='heartbeat_state_t' id='type-id-281'>
       <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-282' id='type-id-170'/>
-    <enum-decl name='recv_state_t' id='type-id-283'>
+    <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'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='RECV_STATE_0' value='0'/>
       <enumerator name='RECV_STATE_DTLS_RETRANSMIT' value='1'/>
@@ -3286,12 +3286,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-283' id='type-id-171'/>
-    <typedef-decl name='gnutls_certificate_verify_function' type-id='type-id-261' id='type-id-284'/>
-    <pointer-type-def type-id='type-id-284' 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-285'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-286' visibility='default'/>
+        <var-decl name='type' type-id='type-id-285' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='data' type-id='type-id-64' visibility='default'/>
@@ -3300,7 +3300,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-287'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-286'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_DT_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_DT_DNS_HOSTNAME' value='1'/>
@@ -3308,15 +3308,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-287' id='type-id-286'/>
-    <typedef-decl name='gnutls_typed_vdata_st' type-id='type-id-285' id='type-id-174'/>
-    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-173'/>
+    <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'/>
 
-    <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-288'/>
+    <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>
-    <class-decl name='tfo_st' size-in-bits='1216' is-struct='yes' visibility='default' id='type-id-289'>
+    <class-decl name='tfo_st' size-in-bits='1216' is-struct='yes' visibility='default' id='type-id-288'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fd' type-id='type-id-22' visibility='default'/>
       </data-member>
@@ -3327,42 +3327,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-290' visibility='default'/>
+        <var-decl name='connect_addr' type-id='type-id-289' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='connect_addrlen' type-id='type-id-291' visibility='default'/>
+        <var-decl name='connect_addrlen' type-id='type-id-290' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='sockaddr_storage' size-in-bits='1024' is-struct='yes' visibility='default' id='type-id-290'>
+    <class-decl name='sockaddr_storage' size-in-bits='1024' is-struct='yes' visibility='default' id='type-id-289'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ss_family' type-id='type-id-292' visibility='default'/>
+        <var-decl name='ss_family' type-id='type-id-291' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='__ss_padding' type-id='type-id-293' visibility='default'/>
+        <var-decl name='__ss_padding' type-id='type-id-292' 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-292'/>
+    <typedef-decl name='sa_family_t' type-id='type-id-24' id='type-id-291'/>
 
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='944' id='type-id-293'>
-      <subrange length='118' type-id='type-id-38' 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>
-    <typedef-decl name='__socklen_t' type-id='type-id-10' id='type-id-295'/>
-    <typedef-decl name='socklen_t' type-id='type-id-295' id='type-id-291'/>
-    <typedef-decl name='tfo_st' type-id='type-id-289' 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-296'/>
+    <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='hello_ext_entry_st' size-in-bits='640' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-297'/>
-    <pointer-type-def type-id='type-id-297' 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-298'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-297'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='priv' type-id='type-id-299' visibility='default'/>
+        <var-decl name='priv' type-id='type-id-298' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='resumed_priv' type-id='type-id-299' visibility='default'/>
+        <var-decl name='resumed_priv' type-id='type-id-298' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='set' type-id='type-id-16' visibility='default'/>
@@ -3371,13 +3371,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-102' id='type-id-299'/>
+    <typedef-decl name='gnutls_ext_priv_data_t' type-id='type-id-101' id='type-id-298'/>
 
-    <array-type-def dimensions='1' type-id='type-id-298' size-in-bits='6144' id='type-id-179'>
+    <array-type-def dimensions='1' type-id='type-id-297' size-in-bits='6144' id='type-id-178'>
       <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-300'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-299'>
       <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'/>
@@ -3389,13 +3389,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-300' 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-301'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='arrival_time' type-id='type-id-169' visibility='default'/>
+        <var-decl name='arrival_time' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='creation_time' type-id='type-id-169' visibility='default'/>
+        <var-decl name='creation_time' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='lifetime' type-id='type-id-18' visibility='default'/>
@@ -3404,10 +3404,10 @@
         <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-302' visibility='default'/>
+        <var-decl name='nonce' type-id='type-id-301' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='nonce_size' type-id='type-id-100' visibility='default'/>
+        <var-decl name='nonce_size' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
         <var-decl name='prf' type-id='type-id-13' visibility='default'/>
@@ -3420,67 +3420,67 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2040' id='type-id-302'>
-      <subrange length='255' type-id='type-id-38' id='type-id-303'/>
+    <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>
-    <typedef-decl name='tls13_ticket_st' type-id='type-id-301' 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-304'/>
-    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-305'/>
-    <typedef-decl name='gnutls_anti_replay_t' type-id='type-id-305' id='type-id-182'/>
-    <typedef-decl name='internals_st' type-id='type-id-138' id='type-id-7'/>
-    <class-decl name='gnutls_key_st' size-in-bits='22336' is-struct='yes' visibility='default' id='type-id-306'>
+    <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='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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='kshare' type-id='type-id-307' visibility='default'/>
+        <var-decl name='kshare' type-id='type-id-306' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='11328'>
-        <var-decl name='proto' type-id='type-id-308' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='11520'>
+        <var-decl name='proto' type-id='type-id-307' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='19776'>
-        <var-decl name='binders' type-id='type-id-309' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='20096'>
+        <var-decl name='binders' type-id='type-id-308' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='20288'>
+      <data-member access='public' layout-offset-in-bits='20608'>
         <var-decl name='key' type-id='type-id-62' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='20416'>
+      <data-member access='public' layout-offset-in-bits='20736'>
         <var-decl name='session_ticket_key' type-id='type-id-89' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='20928'>
+      <data-member access='public' layout-offset-in-bits='21248'>
         <var-decl name='previous_ticket_key' type-id='type-id-89' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='21440'>
+      <data-member access='public' layout-offset-in-bits='21760'>
         <var-decl name='initial_stek' type-id='type-id-89' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='21952'>
-        <var-decl name='auth_info' type-id='type-id-102' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='22272'>
+        <var-decl name='auth_info' type-id='type-id-101' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='22016'>
-        <var-decl name='auth_info_type' type-id='type-id-310' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='22336'>
+        <var-decl name='auth_info_type' type-id='type-id-309' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='22048'>
+      <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='22080'>
-        <var-decl name='cred' type-id='type-id-311' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='22400'>
+        <var-decl name='cred' type-id='type-id-310' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='22144'>
-        <var-decl name='totp' type-id='type-id-312' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='22464'>
+        <var-decl name='totp' type-id='type-id-311' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='11328' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-307'>
+    <class-decl name='__anonymous_struct__' size-in-bits='11520' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-306'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ecdh_params' type-id='type-id-313' visibility='default'/>
+        <var-decl name='ecdh_params' type-id='type-id-312' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='ecdhx_params' type-id='type-id-313' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='3840'>
+        <var-decl name='ecdhx_params' type-id='type-id-312' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='7552'>
-        <var-decl name='dh_params' type-id='type-id-313' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='7680'>
+        <var-decl name='dh_params' type-id='type-id-312' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='3776' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-313' visibility='default' id='type-id-314'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-315' visibility='default'/>
+        <var-decl name='params' type-id='type-id-314' 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'/>
@@ -3498,7 +3498,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-316' visibility='default'/>
+        <var-decl name='gost_params' type-id='type-id-315' 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'/>
@@ -3510,25 +3510,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-317' visibility='default'/>
+        <var-decl name='seed' type-id='type-id-316' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3552'>
-        <var-decl name='palgo' type-id='type-id-212' visibility='default'/>
+        <var-decl name='palgo' type-id='type-id-211' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3584'>
-        <var-decl name='spki' type-id='type-id-318' visibility='default'/>
+        <var-decl name='spki' type-id='type-id-317' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3712'>
+      <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-102' id='type-id-319'/>
+    <typedef-decl name='bigint_t' type-id='type-id-101' id='type-id-318'/>
 
-    <array-type-def dimensions='1' type-id='type-id-319' size-in-bits='1024' id='type-id-315'>
-      <subrange length='16' type-id='type-id-38' id='type-id-94'/>
+    <array-type-def dimensions='1' type-id='type-id-318' size-in-bits='1024' id='type-id-314'>
+      <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-320'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-319'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_UNKNOWN' value='0'/>
       <enumerator name='GNUTLS_GOST_PARAMSET_TC26_Z' value='1'/>
@@ -3537,18 +3537,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-320' id='type-id-316'/>
+    <typedef-decl name='gnutls_gost_paramset_t' type-id='type-id-319' id='type-id-315'/>
 
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2048' id='type-id-317'>
-      <subrange length='256' type-id='type-id-38' id='type-id-224'/>
+    <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>
-    <class-decl name='gnutls_x509_spki_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-321'>
+    <class-decl name='gnutls_x509_spki_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-320'>
       <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-212' visibility='default'/>
+        <var-decl name='rsa_pss_dig' type-id='type-id-211' 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'/>
@@ -3556,18 +3556,24 @@
       <data-member access='public' layout-offset-in-bits='96'>
         <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'/>
+      </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-321' id='type-id-318'/>
-    <typedef-decl name='gnutls_pk_params_st' type-id='type-id-314' id='type-id-313'/>
-    <union-decl name='__anonymous_union__' size-in-bits='8448' is-anonymous='yes' visibility='default' id='type-id-308'>
+    <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'>
       <data-member access='private'>
-        <var-decl name='tls13' type-id='type-id-322' visibility='default'/>
+        <var-decl name='tls13' type-id='type-id-321' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='tls12' type-id='type-id-323' visibility='default'/>
+        <var-decl name='tls12' type-id='type-id-322' 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-322'>
+    <class-decl name='__anonymous_struct__' size-in-bits='4128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-321'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='temp_secret' type-id='type-id-89' visibility='default'/>
       </data-member>
@@ -3596,69 +3602,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='8448' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-323'>
+    <class-decl name='__anonymous_struct__' size-in-bits='8576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-322'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ecdh' type-id='type-id-324' visibility='default'/>
+        <var-decl name='ecdh' type-id='type-id-323' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='dh' type-id='type-id-325' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='4096'>
+        <var-decl name='dh' type-id='type-id-324' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='7872'>
-        <var-decl name='srp' type-id='type-id-326' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='8000'>
+        <var-decl name='srp' type-id='type-id-325' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='4032' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-324'>
+    <class-decl name='__anonymous_struct__' size-in-bits='4096' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-323'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-313' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='x' type-id='type-id-319' visibility='default'/>
+        <var-decl name='params' type-id='type-id-312' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='y' type-id='type-id-319' visibility='default'/>
+        <var-decl name='x' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
+        <var-decl name='y' type-id='type-id-318' 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='3840' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-325'>
+    <class-decl name='__anonymous_struct__' size-in-bits='3904' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-324'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-313' visibility='default'/>
+        <var-decl name='params' type-id='type-id-312' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='client_Y' type-id='type-id-319' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='3840'>
+        <var-decl name='client_Y' type-id='type-id-318' 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-326'>
+    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-325'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='srp_key' type-id='type-id-319' visibility='default'/>
+        <var-decl name='srp_key' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='srp_g' type-id='type-id-319' visibility='default'/>
+        <var-decl name='srp_g' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='srp_p' type-id='type-id-319' visibility='default'/>
+        <var-decl name='srp_p' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='A' type-id='type-id-319' visibility='default'/>
+        <var-decl name='A' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='B' type-id='type-id-319' visibility='default'/>
+        <var-decl name='B' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='u' type-id='type-id-319' visibility='default'/>
+        <var-decl name='u' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='b' type-id='type-id-319' visibility='default'/>
+        <var-decl name='b' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='a' type-id='type-id-319' visibility='default'/>
+        <var-decl name='a' type-id='type-id-318' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='x' type-id='type-id-319' visibility='default'/>
+        <var-decl name='x' type-id='type-id-318' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='binder_data_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-327'>
+    <class-decl name='binder_data_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-326'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='prf' type-id='type-id-13' visibility='default'/>
       </data-member>
@@ -3673,11 +3679,11 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-327' size-in-bits='512' id='type-id-309'>
+    <array-type-def dimensions='1' type-id='type-id-326' size-in-bits='512' id='type-id-308'>
       <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-328'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-327'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_CRD_CERTIFICATE' value='1'/>
       <enumerator name='GNUTLS_CRD_ANON' value='2'/>
@@ -3685,21 +3691,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-328' id='type-id-310'/>
-    <class-decl name='auth_cred_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-329'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='algorithm' type-id='type-id-310' visibility='default'/>
+        <var-decl name='algorithm' type-id='type-id-309' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='credentials' type-id='type-id-102' visibility='default'/>
+        <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-311' visibility='default'/>
+        <var-decl name='next' type-id='type-id-310' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-311'/>
-    <typedef-decl name='auth_cred_st' type-id='type-id-329' id='type-id-330'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-312'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='last_result' type-id='type-id-80' visibility='default'/>
       </data-member>
@@ -3707,166 +3713,170 @@
         <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-331' visibility='default'/>
+        <var-decl name='cb' type-id='type-id-330' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-333'/>
-    <typedef-decl name='gnutls_stek_rotation_callback_t' type-id='type-id-333' id='type-id-331'/>
-    <typedef-decl name='gnutls_key_st' type-id='type-id-306' id='type-id-8'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-334' visibility='default' id='type-id-335'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='low' type-id='type-id-100' visibility='default'/>
+        <var-decl name='low' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='high' type-id='type-id-100' visibility='default'/>
+        <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-335' id='type-id-334'/>
-    <qualified-type-def type-id='type-id-334' const='yes' id='type-id-336'/>
-    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-337'/>
+    <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'/>
     <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-237' name='session'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
-      <parameter type-id='type-id-337' name='range'/>
+      <parameter type-id='type-id-236' 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'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-334' size-in-bits='64' id='type-id-338'/>
+    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-337'/>
     <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-237' name='session'/>
-      <parameter type-id='type-id-337' name='orig'/>
-      <parameter type-id='type-id-338' name='next'/>
-      <parameter type-id='type-id-338' name='remainder'/>
+      <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'/>
       <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-237' name='session'/>
+      <parameter type-id='type-id-236' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-261'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-260'>
+      <parameter type-id='type-id-236'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-239'>
+    <function-type size-in-bits='64' id='type-id-238'>
+      <parameter type-id='type-id-236'/>
       <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-100'/>
+    <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-99'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-263'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-262'>
+      <parameter type-id='type-id-236'/>
       <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-277'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-276'/>
+    <function-type size-in-bits='64' id='type-id-276'>
+      <parameter type-id='type-id-236'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-275'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-253'>
-      <parameter type-id='type-id-155'/>
+    <function-type size-in-bits='64' id='type-id-252'>
+      <parameter type-id='type-id-154'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-243'>
-      <parameter type-id='type-id-155'/>
+    <function-type size-in-bits='64' id='type-id-242'>
+      <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-259'>
-      <parameter type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-258'>
+      <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-255'>
-      <parameter type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-254'>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-62'/>
       <parameter type-id='type-id-62'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-117'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
+    <function-type size-in-bits='64' id='type-id-116'>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-113'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
+    <function-type size-in-bits='64' id='type-id-112'>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-115'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
+    <function-type size-in-bits='64' id='type-id-114'>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-257'>
-      <parameter type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-256'>
+      <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-251'>
-      <parameter type-id='type-id-155'/>
-      <parameter type-id='type-id-250'/>
+    <function-type size-in-bits='64' id='type-id-250'>
+      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-249'/>
       <parameter type-id='type-id-22'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-245'>
-      <parameter type-id='type-id-155'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
+    <function-type size-in-bits='64' id='type-id-244'>
+      <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-332'>
+    <function-type size-in-bits='64' id='type-id-331'>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-80'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-121'>
-      <parameter type-id='type-id-102'/>
-      <return type-id='type-id-112'/>
+    <function-type size-in-bits='64' id='type-id-120'>
+      <parameter type-id='type-id-101'/>
+      <return type-id='type-id-111'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-119'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-112'/>
+    <function-type size-in-bits='64' id='type-id-118'>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <return type-id='type-id-111'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-129'>
+      <parameter type-id='type-id-101'/>
+      <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/nmavrogi/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-297'>
+  <abi-instr version='1.0' address-size='64' path='record.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='hello_ext_entry_st' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-296'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
@@ -3880,31 +3890,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='parse_type' type-id='type-id-339' visibility='default'/>
+        <var-decl name='client_parse_point' type-id='type-id-338' 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'/>
+      </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-340' visibility='default'/>
+        <var-decl name='recv_func' type-id='type-id-339' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='send_func' type-id='type-id-341' visibility='default'/>
+        <var-decl name='send_func' type-id='type-id-340' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='deinit_func' type-id='type-id-342' visibility='default'/>
+        <var-decl name='deinit_func' type-id='type-id-341' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='pack_func' type-id='type-id-343' visibility='default'/>
+        <var-decl name='pack_func' type-id='type-id-342' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='unpack_func' type-id='type-id-344' visibility='default'/>
+        <var-decl name='unpack_func' type-id='type-id-343' 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-345'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-344'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_EXT_ANY' value='0'/>
       <enumerator name='GNUTLS_EXT_APPLICATION' value='1'/>
@@ -3913,362 +3926,359 @@
       <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-345' id='type-id-339'/>
-    <qualified-type-def type-id='type-id-35' const='yes' id='type-id-346'/>
-    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-347'/>
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-349'/>
-    <typedef-decl name='gnutls_ext_recv_func' type-id='type-id-349' id='type-id-340'/>
-    <pointer-type-def type-id='type-id-191' size-in-bits='64' id='type-id-350'/>
-    <typedef-decl name='gnutls_buffer_t' type-id='type-id-350' id='type-id-351'/>
-    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-353'/>
-    <typedef-decl name='gnutls_ext_send_func' type-id='type-id-353' id='type-id-341'/>
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-355'/>
-    <typedef-decl name='gnutls_ext_deinit_data_func' type-id='type-id-355' id='type-id-342'/>
-    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-357'/>
-    <typedef-decl name='gnutls_ext_pack_func' type-id='type-id-357' id='type-id-343'/>
-    <pointer-type-def type-id='type-id-299' size-in-bits='64' id='type-id-358'/>
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-360'/>
-    <typedef-decl name='gnutls_ext_unpack_func' type-id='type-id-360' id='type-id-344'/>
+    <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'/>
+    <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'/>
     <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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-10' name='ms'/>
-      <return type-id='type-id-112'/>
+      <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-237' name='session'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
-      <parameter type-id='type-id-100' name='pad'/>
+      <parameter type-id='type-id-236' 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'/>
       <parameter type-id='type-id-10' name='flags'/>
       <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-237' name='session'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <parameter type-id='type-id-236' 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-184' id='type-id-361'/>
-    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-362'/>
+    <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'/>
     <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-237' name='session'/>
-      <parameter type-id='type-id-362' name='packet'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-361' 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-237' name='session'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-236' 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-361' name='packet'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-360' 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-361' name='packet'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-360' name='packet'/>
+      <parameter type-id='type-id-275' name='data'/>
       <parameter type-id='type-id-64' name='sequence'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-363'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-362'>
       <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-363' id='type-id-364'/>
+    <typedef-decl name='gnutls_close_request_t' type-id='type-id-362' id='type-id-363'/>
     <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-237' name='session'/>
-      <parameter type-id='type-id-364' name='how'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-363' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-365'/>
+    <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-364'/>
     <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-237' name='session'/>
-      <parameter type-id='type-id-365' name='recv_int'/>
-      <parameter type-id='type-id-365' name='send_int'/>
-      <return type-id='type-id-112'/>
+      <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'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-366'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-365'/>
     <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-237' name='session'/>
-      <parameter type-id='type-id-366' name='recv_ptr'/>
-      <parameter type-id='type-id-366' name='send_ptr'/>
-      <return type-id='type-id-112'/>
+      <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'/>
+      <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-237' name='session'/>
-      <return type-id='type-id-155'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-112'/>
+      <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-237' name='session'/>
-      <parameter type-id='type-id-155' name='recv_ptr'/>
-      <parameter type-id='type-id-155' name='send_ptr'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-155' name='ptr'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__builtin_memcpy' mangled-name='memcpy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_buffer_append_data' mangled-name='gnutls_buffer_append_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_session_key_update' mangled-name='gnutls_session_key_update' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_clear' mangled-name='_gnutls_buffer_clear' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_record_overhead_size' mangled-name='gnutls_record_overhead_size' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_mbuffer_head_clear' mangled-name='_mbuffer_head_clear' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__assert_fail' mangled-name='__assert_fail' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='_gnutls_uint64pp' mangled-name='_gnutls_uint64pp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='_gnutls_uint48pp' mangled-name='_gnutls_uint48pp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_mbuffer_enqueue' mangled-name='_mbuffer_enqueue' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_packet2str' mangled-name='_gnutls_packet2str' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_audit_log' mangled-name='_gnutls_audit_log' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_io_read_buffered' mangled-name='_gnutls_io_read_buffered' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_error_is_fatal' mangled-name='gnutls_error_is_fatal' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_mbuffer_linearize_align16' mangled-name='_mbuffer_linearize_align16' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nanosleep' mangled-name='nanosleep' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_timespec_sub_ms' mangled-name='_gnutls_timespec_sub_ms' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_dtls_transmit' mangled-name='_dtls_transmit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_record_buffer_put' mangled-name='_gnutls_record_buffer_put' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_dtls_async_timer_delete' mangled-name='_dtls_async_timer_delete' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_heartbeat_handle' mangled-name='_gnutls_heartbeat_handle' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_recv_async_handshake' mangled-name='_gnutls13_recv_async_handshake' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_alert_get_name' mangled-name='gnutls_alert_get_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_mbuffer_alloc_align16' mangled-name='_mbuffer_alloc_align16' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_decrypt' mangled-name='_gnutls_decrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_dtls_record_check' mangled-name='_dtls_record_check' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_mbuffer_head_pop_first' mangled-name='_mbuffer_head_pop_first' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_encrypt' mangled-name='_gnutls_encrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_io_write_buffered' mangled-name='_gnutls_io_write_buffered' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_io_write_flush' mangled-name='_gnutls_io_write_flush' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_dtls_get_mtu' mangled-name='gnutls_dtls_get_mtu' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_alert_send' mangled-name='gnutls_alert_send' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_record_buffer_get' mangled-name='_gnutls_record_buffer_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_record_buffer_get_packet' mangled-name='_gnutls_record_buffer_get_packet' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='time' mangled-name='time' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='gnutls_handshake' mangled-name='gnutls_handshake' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_reauth' mangled-name='gnutls_reauth' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-359'>
-      <parameter type-id='type-id-351'/>
-      <parameter type-id='type-id-358'/>
+    <function-type size-in-bits='64' id='type-id-358'>
+      <parameter type-id='type-id-350'/>
+      <parameter type-id='type-id-357'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-356'>
-      <parameter type-id='type-id-299'/>
-      <parameter type-id='type-id-351'/>
+    <function-type size-in-bits='64' id='type-id-355'>
+      <parameter type-id='type-id-298'/>
+      <parameter type-id='type-id-350'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-348'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-347'/>
-      <parameter type-id='type-id-100'/>
+    <function-type size-in-bits='64' id='type-id-347'>
+      <parameter type-id='type-id-236'/>
+      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-352'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-351'/>
+    <function-type size-in-bits='64' id='type-id-351'>
+      <parameter type-id='type-id-236'/>
+      <parameter type-id='type-id-350'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-354'>
-      <parameter type-id='type-id-299'/>
-      <return type-id='type-id-112'/>
+    <function-type size-in-bits='64' id='type-id-353'>
+      <parameter type-id='type-id-298'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-367'>
+  <abi-instr version='1.0' address-size='64' path='compress.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-366'>
       <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-367' id='type-id-368'/>
-    <qualified-type-def type-id='type-id-368' const='yes' id='type-id-369'/>
-    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-370'/>
+    <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'/>
     <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-370'/>
+      <return type-id='type-id-369'/>
     </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-368'/>
+      <return type-id='type-id-367'/>
     </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-368' name='algorithm'/>
+      <parameter type-id='type-id-367' 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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='debug.c' comp-dir-path='/home/nmavrogi/cvs/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-187' name='type'/>
+      <parameter type-id='type-id-186' 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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cipher.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_auth_cipher_decrypt2' mangled-name='_gnutls_auth_cipher_decrypt2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_auth_cipher_tag' mangled-name='_gnutls_auth_cipher_tag' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_memcmp' mangled-name='gnutls_memcmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_memxor' mangled-name='nettle_memxor' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='cbc_mac_verify' mangled-name='cbc_mac_verify' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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_aead_cipher_decrypt' mangled-name='gnutls_aead_cipher_decrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_rnd' mangled-name='gnutls_rnd' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_auth_cipher_encrypt2_tag' mangled-name='_gnutls_auth_cipher_encrypt2_tag' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_aead_cipher_encryptv' mangled-name='gnutls_aead_cipher_encryptv' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_session_int' size-in-bits='52416' is-struct='yes' visibility='default' id='type-id-371'>
+  <abi-instr version='1.0' address-size='64' path='handshake-tls13.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_session_int' size-in-bits='52736' is-struct='yes' visibility='default' id='type-id-370'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='security_parameters' type-id='type-id-5' visibility='default'/>
       </data-member>
@@ -4276,15 +4286,15 @@
         <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-372' visibility='default'/>
+        <var-decl name='internals' type-id='type-id-371' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='30080'>
         <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-372' visibility='default' id='type-id-373'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='record_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='record_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='handshake_hash_buffer_prev_len' type-id='type-id-22' visibility='default'/>
@@ -4302,25 +4312,25 @@
         <var-decl name='handshake_hash_buffer_client_finished_len' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='handshake_hash_buffer' type-id='type-id-140' visibility='default'/>
+        <var-decl name='handshake_hash_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <var-decl name='resumable' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='736'>
-        <var-decl name='ticket_state' type-id='type-id-141' visibility='default'/>
+        <var-decl name='ticket_state' type-id='type-id-140' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='bye_state' type-id='type-id-142' visibility='default'/>
+        <var-decl name='bye_state' type-id='type-id-141' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='reauth_state' type-id='type-id-143' visibility='default'/>
+        <var-decl name='reauth_state' type-id='type-id-142' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='handshake_final_state' type-id='type-id-144' visibility='default'/>
+        <var-decl name='handshake_final_state' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='864'>
-        <var-decl name='handshake_state' type-id='type-id-144' visibility='default'/>
+        <var-decl name='handshake_state' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <var-decl name='invalid_connection' type-id='type-id-75' visibility='default'/>
@@ -4344,7 +4354,7 @@
         <var-decl name='last_handshake_out' type-id='type-id-22' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='priorities' type-id='type-id-145' visibility='default'/>
+        <var-decl name='priorities' type-id='type-id-144' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <var-decl name='allow_large_records' type-id='type-id-75' visibility='default'/>
@@ -4383,49 +4393,49 @@
         <var-decl name='resumption_data' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
-        <var-decl name='handshake_send_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='handshake_send_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3648'>
-        <var-decl name='handshake_header_recv_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='handshake_header_recv_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='handshake_recv_buffer' type-id='type-id-146' visibility='default'/>
+        <var-decl name='handshake_recv_buffer' type-id='type-id-145' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7360'>
         <var-decl name='handshake_recv_buffer_size' type-id='type-id-22' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7424'>
-        <var-decl name='record_recv_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='record_recv_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7680'>
-        <var-decl name='record_send_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='record_send_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7936'>
-        <var-decl name='record_send_buffer_user_size' type-id='type-id-100' visibility='default'/>
+        <var-decl name='record_send_buffer_user_size' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8000'>
-        <var-decl name='early_data_recv_buffer' type-id='type-id-139' visibility='default'/>
+        <var-decl name='early_data_recv_buffer' type-id='type-id-138' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
-        <var-decl name='early_data_presend_buffer' type-id='type-id-140' visibility='default'/>
+        <var-decl name='early_data_presend_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8512'>
-        <var-decl name='rsend_state' type-id='type-id-147' visibility='default'/>
+        <var-decl name='rsend_state' type-id='type-id-146' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8576'>
-        <var-decl name='record_key_update_buffer' type-id='type-id-140' visibility='default'/>
+        <var-decl name='record_key_update_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8832'>
-        <var-decl name='record_presend_buffer' type-id='type-id-140' visibility='default'/>
+        <var-decl name='record_presend_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9088'>
-        <var-decl name='reauth_buffer' type-id='type-id-140' visibility='default'/>
+        <var-decl name='reauth_buffer' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9344'>
         <var-decl name='expire_time' type-id='type-id-17' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9408'>
-        <var-decl name='auth_struct' type-id='type-id-148' visibility='default'/>
+        <var-decl name='auth_struct' type-id='type-id-147' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9472'>
         <var-decl name='adv_version_major' type-id='type-id-16' visibility='default'/>
@@ -4434,88 +4444,88 @@
         <var-decl name='adv_version_minor' type-id='type-id-16' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9504'>
-        <var-decl name='send_cert_req' type-id='type-id-149' visibility='default'/>
+        <var-decl name='send_cert_req' type-id='type-id-148' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9536'>
-        <var-decl name='max_handshake_data_buffer_size' type-id='type-id-100' visibility='default'/>
+        <var-decl name='max_handshake_data_buffer_size' type-id='type-id-99' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9600'>
-        <var-decl name='pull_timeout_func' type-id='type-id-150' visibility='default'/>
+        <var-decl name='pull_timeout_func' type-id='type-id-149' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
-        <var-decl name='pull_func' type-id='type-id-151' visibility='default'/>
+        <var-decl name='pull_func' type-id='type-id-150' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
-        <var-decl name='push_func' type-id='type-id-152' visibility='default'/>
+        <var-decl name='push_func' type-id='type-id-151' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9792'>
-        <var-decl name='vec_push_func' type-id='type-id-153' visibility='default'/>
+        <var-decl name='vec_push_func' type-id='type-id-152' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9856'>
-        <var-decl name='errno_func' type-id='type-id-154' visibility='default'/>
+        <var-decl name='errno_func' type-id='type-id-153' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9920'>
-        <var-decl name='transport_recv_ptr' type-id='type-id-155' visibility='default'/>
+        <var-decl name='transport_recv_ptr' type-id='type-id-154' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
-        <var-decl name='transport_send_ptr' type-id='type-id-155' visibility='default'/>
+        <var-decl name='transport_send_ptr' type-id='type-id-154' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10048'>
-        <var-decl name='db_store_func' type-id='type-id-156' visibility='default'/>
+        <var-decl name='db_store_func' type-id='type-id-155' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10112'>
-        <var-decl name='db_retrieve_func' type-id='type-id-157' visibility='default'/>
+        <var-decl name='db_retrieve_func' type-id='type-id-156' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
-        <var-decl name='db_remove_func' type-id='type-id-158' visibility='default'/>
+        <var-decl name='db_remove_func' type-id='type-id-157' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
-        <var-decl name='db_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='db_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
-        <var-decl name='user_hello_func' type-id='type-id-159' visibility='default'/>
+        <var-decl name='user_hello_func' type-id='type-id-158' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10368'>
-        <var-decl name='h_hook' type-id='type-id-160' visibility='default'/>
+        <var-decl name='h_hook' type-id='type-id-159' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10432'>
         <var-decl name='h_type' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10464'>
-        <var-decl name='h_post' type-id='type-id-161' visibility='default'/>
+        <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-162' visibility='default'/>
+        <var-decl name='selected_cert_list' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10624'>
-        <var-decl name='selected_key' type-id='type-id-374' visibility='default'/>
+        <var-decl name='selected_key' type-id='type-id-373' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10688'>
-        <var-decl name='selected_ocsp' type-id='type-id-164' visibility='default'/>
+        <var-decl name='selected_ocsp' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10816'>
-        <var-decl name='selected_ocsp_func' type-id='type-id-165' visibility='default'/>
+        <var-decl name='selected_ocsp_func' type-id='type-id-164' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10880'>
-        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='selected_ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10944'>
         <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-166' visibility='default'/>
+        <var-decl name='default_record_version' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10968'>
-        <var-decl name='default_hello_version' type-id='type-id-166' visibility='default'/>
+        <var-decl name='default_hello_version' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11008'>
-        <var-decl name='user_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='user_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11072'>
         <var-decl name='direction' type-id='type-id-75' visibility='default'/>
@@ -4524,7 +4534,7 @@
         <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-166' visibility='default'/>
+        <var-decl name='rsa_pms_version' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11104'>
         <var-decl name='errnum' type-id='type-id-22' visibility='default'/>
@@ -4533,13 +4543,13 @@
         <var-decl name='initial_negotiation_completed' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11200'>
-        <var-decl name='post_negotiation_lock' type-id='type-id-102' visibility='default'/>
+        <var-decl name='post_negotiation_lock' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11264'>
         <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-167' visibility='default'/>
+        <var-decl name='dtls' type-id='type-id-166' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11904'>
         <var-decl name='handshake_suspicious_loops' type-id='type-id-10' visibility='default'/>
@@ -4554,13 +4564,13 @@
         <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-168' visibility='default'/>
+        <var-decl name='cb_tls_unique' type-id='type-id-167' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12288'>
-        <var-decl name='handshake_start_time' type-id='type-id-169' visibility='default'/>
+        <var-decl name='handshake_start_time' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12416'>
-        <var-decl name='handshake_abs_timeout' type-id='type-id-169' visibility='default'/>
+        <var-decl name='handshake_abs_timeout' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12544'>
         <var-decl name='ertt' type-id='type-id-10' visibility='default'/>
@@ -4575,34 +4585,34 @@
         <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'>
-        <var-decl name='post_handshake_hash_buffer' type-id='type-id-140' visibility='default'/>
+        <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'>
         <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-169' visibility='default'/>
+        <var-decl name='last_key_update' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13248'>
         <var-decl name='key_update_count' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13312'>
-        <var-decl name='full_client_hello' type-id='type-id-140' visibility='default'/>
+        <var-decl name='full_client_hello' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13568'>
         <var-decl name='extensions_offset' type-id='type-id-22' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13632'>
-        <var-decl name='hb_local_data' type-id='type-id-140' visibility='default'/>
+        <var-decl name='hb_local_data' type-id='type-id-139' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13888'>
-        <var-decl name='hb_remote_data' type-id='type-id-140' visibility='default'/>
+        <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-169' visibility='default'/>
+        <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-169' visibility='default'/>
+        <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'/>
@@ -4617,10 +4627,10 @@
         <var-decl name='ocsp_check_ok' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14528'>
-        <var-decl name='hb_state' type-id='type-id-170' visibility='default'/>
+        <var-decl name='hb_state' type-id='type-id-169' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14560'>
-        <var-decl name='recv_state' type-id='type-id-171' visibility='default'/>
+        <var-decl name='recv_state' type-id='type-id-170' 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'/>
@@ -4629,13 +4639,13 @@
         <var-decl name='flags' type-id='type-id-80' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14720'>
-        <var-decl name='verify_callback' type-id='type-id-172' visibility='default'/>
+        <var-decl name='verify_callback' type-id='type-id-171' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14784'>
-        <var-decl name='vc_data' type-id='type-id-173' visibility='default'/>
+        <var-decl name='vc_data' 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-174' visibility='default'/>
+        <var-decl name='vc_sdata' type-id='type-id-173' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='15040'>
         <var-decl name='vc_elements' type-id='type-id-10' visibility='default'/>
@@ -4653,34 +4663,34 @@
         <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-175' visibility='default'/>
+        <var-decl name='saved_username' type-id='type-id-174' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16432'>
         <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-176' visibility='default'/>
+        <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-177' visibility='default'/>
+        <var-decl name='rsup' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17792'>
-        <var-decl name='rexts' type-id='type-id-178' visibility='default'/>
+        <var-decl name='rexts' type-id='type-id-177' 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'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='17920'>
-        <var-decl name='ext_data' type-id='type-id-179' visibility='default'/>
+        <var-decl name='ext_data' type-id='type-id-178' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24064'>
         <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-180' visibility='default'/>
+        <var-decl name='ext_msg' type-id='type-id-179' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24128'>
         <var-decl name='max_recv_size' type-id='type-id-10' visibility='default'/>
@@ -4695,630 +4705,627 @@
         <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-166' visibility='default'/>
+        <var-decl name='hrr_cs' type-id='type-id-165' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24416'>
         <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-181' visibility='default'/>
+        <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>
       <data-member access='public' layout-offset-in-bits='27648'>
-        <var-decl name='anti_replay' type-id='type-id-182' visibility='default'/>
+        <var-decl name='anti_replay' type-id='type-id-181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27712'>
-        <var-decl name='epoch_lock' type-id='type-id-102' visibility='default'/>
+        <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='4032' is-struct='yes' visibility='default' id='type-id-269'>
+    <class-decl name='gnutls_pubkey_st' size-in-bits='4096' is-struct='yes' visibility='default' id='type-id-268'>
       <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-313' visibility='default'/>
+        <var-decl name='params' type-id='type-id-312' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3840'>
+      <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='3904'>
-        <var-decl name='pin' type-id='type-id-375' visibility='default'/>
+      <data-member access='public' layout-offset-in-bits='3968'>
+        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='pin_info_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-375'>
+    <class-decl name='pin_info_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-374'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cb' type-id='type-id-376' visibility='default'/>
+        <var-decl name='cb' type-id='type-id-375' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='data' type-id='type-id-102' visibility='default'/>
+        <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-377'/>
-    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-379'/>
-    <typedef-decl name='gnutls_pin_callback_t' type-id='type-id-379' id='type-id-376'/>
-    <class-decl name='gnutls_privkey_st' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-380'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-381' visibility='default'/>
+        <var-decl name='type' type-id='type-id-380' 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-382' visibility='default'/>
+        <var-decl name='key' type-id='type-id-381' 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-375' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-383'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-382'>
       <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-383' id='type-id-381'/>
-    <union-decl name='__anonymous_union__' size-in-bits='576' is-anonymous='yes' visibility='default' id='type-id-382'>
+    <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'>
       <data-member access='private'>
-        <var-decl name='x509' type-id='type-id-384' visibility='default'/>
+        <var-decl name='x509' type-id='type-id-383' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='pkcs11' type-id='type-id-385' visibility='default'/>
+        <var-decl name='pkcs11' type-id='type-id-384' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ext' type-id='type-id-386' visibility='default'/>
+        <var-decl name='ext' type-id='type-id-385' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='gnutls_x509_privkey_int' size-in-bits='4032' is-struct='yes' visibility='default' id='type-id-387'>
+    <class-decl name='gnutls_x509_privkey_int' size-in-bits='4096' is-struct='yes' visibility='default' id='type-id-386'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-313' visibility='default'/>
+        <var-decl name='params' type-id='type-id-312' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3776'>
+      <data-member access='public' layout-offset-in-bits='3840'>
         <var-decl name='expanded' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3808'>
+      <data-member access='public' layout-offset-in-bits='3872'>
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='key' type-id='type-id-388' visibility='default'/>
-      </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='pin' type-id='type-id-375' visibility='default'/>
+        <var-decl name='key' type-id='type-id-387' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='3968'>
+        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='asn1_node_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-389'/>
-    <typedef-decl name='asn1_node_st' type-id='type-id-389' id='type-id-390'/>
-    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-391'/>
-    <typedef-decl name='asn1_node' type-id='type-id-391' id='type-id-388'/>
-    <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-392'/>
-    <typedef-decl name='gnutls_x509_privkey_t' type-id='type-id-392' id='type-id-384'/>
-    <class-decl name='gnutls_pkcs11_privkey_st' size-in-bits='3392' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-393'/>
-    <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-394'/>
-    <typedef-decl name='gnutls_pkcs11_privkey_t' type-id='type-id-394' id='type-id-385'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='576' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-386'>
+    <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'/>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='sign_func' type-id='type-id-395' visibility='default'/>
+        <var-decl name='sign_func' type-id='type-id-394' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='sign_data_func' type-id='type-id-396' visibility='default'/>
+        <var-decl name='sign_data_func' type-id='type-id-395' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='sign_hash_func' type-id='type-id-397' visibility='default'/>
+        <var-decl name='sign_hash_func' type-id='type-id-396' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='decrypt_func' type-id='type-id-398' visibility='default'/>
+        <var-decl name='decrypt_func' type-id='type-id-397' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='decrypt_func2' type-id='type-id-399' visibility='default'/>
+        <var-decl name='decrypt_func2' type-id='type-id-398' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='deinit_func' type-id='type-id-400' visibility='default'/>
+        <var-decl name='deinit_func' type-id='type-id-399' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='info_func' type-id='type-id-401' visibility='default'/>
+        <var-decl name='info_func' type-id='type-id-400' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='userdata' type-id='type-id-102' visibility='default'/>
+        <var-decl name='userdata' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='bits' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-374'/>
-    <typedef-decl name='gnutls_privkey_t' type-id='type-id-374' id='type-id-402'/>
-    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-404'/>
-    <typedef-decl name='gnutls_privkey_sign_func' type-id='type-id-404' id='type-id-395'/>
-    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-406'/>
-    <typedef-decl name='gnutls_privkey_sign_data_func' type-id='type-id-406' id='type-id-396'/>
-    <typedef-decl name='gnutls_privkey_sign_hash_func' type-id='type-id-406' id='type-id-397'/>
-    <typedef-decl name='gnutls_privkey_decrypt_func' type-id='type-id-404' id='type-id-398'/>
-    <pointer-type-def type-id='type-id-407' size-in-bits='64' id='type-id-408'/>
-    <typedef-decl name='gnutls_privkey_decrypt_func2' type-id='type-id-408' id='type-id-399'/>
-    <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-410'/>
-    <typedef-decl name='gnutls_privkey_deinit_func' type-id='type-id-410' id='type-id-400'/>
-    <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-412'/>
-    <typedef-decl name='gnutls_privkey_info_func' type-id='type-id-412' id='type-id-401'/>
-    <typedef-decl name='internals_st' type-id='type-id-373' id='type-id-372'/>
-    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-413'/>
-    <typedef-decl name='gnutls_session_t' type-id='type-id-413' id='type-id-414'/>
+    <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'/>
     <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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-10' name='nr'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls13_send_session_ticket' mangled-name='_gnutls13_send_session_ticket' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_handshake_io_recv_int' mangled-name='_gnutls_handshake_io_recv_int' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_call_hook_func' mangled-name='_gnutls_call_hook_func' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_recv_session_ticket' mangled-name='_gnutls13_recv_session_ticket' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_recv_key_update' mangled-name='_gnutls13_recv_key_update' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_compute_finished' mangled-name='_gnutls13_compute_finished' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_tls13_derive_secret' mangled-name='_tls13_derive_secret' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_send_server_hello' mangled-name='_gnutls_send_server_hello' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_tls13_read_connection_state_init' mangled-name='_tls13_read_connection_state_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='_gnutls_epoch_dup' mangled-name='_gnutls_epoch_dup' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_tls13_write_connection_state_init' mangled-name='_tls13_write_connection_state_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_tls13_connection_state_init' mangled-name='_tls13_connection_state_init' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_send_encrypted_extensions' mangled-name='_gnutls13_send_encrypted_extensions' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_send_certificate_request' mangled-name='_gnutls13_send_certificate_request' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_send_certificate' mangled-name='_gnutls13_send_certificate' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_send_certificate_verify' mangled-name='_gnutls13_send_certificate_verify' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_send_finished' mangled-name='_gnutls13_send_finished' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_recv_end_of_early_data' mangled-name='_gnutls13_recv_end_of_early_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_recv_certificate' mangled-name='_gnutls13_recv_certificate' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_recv_certificate_verify' mangled-name='_gnutls13_recv_certificate_verify' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_run_verify_callback' mangled-name='_gnutls_run_verify_callback' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_recv_finished' mangled-name='_gnutls13_recv_finished' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_recv_handshake' mangled-name='_gnutls_recv_handshake' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='_tls13_connection_state_init' mangled-name='_tls13_connection_state_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='_gnutls_send_change_cipher_spec' mangled-name='_gnutls_send_change_cipher_spec' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_handshake_hash_buffers_clear' mangled-name='_gnutls_handshake_hash_buffers_clear' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls13_handshake_hash_buffers_synth' mangled-name='_gnutls13_handshake_hash_buffers_synth' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_send_hello_retry_request' mangled-name='_gnutls13_send_hello_retry_request' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls13_handshake_hash_buffers_synth' mangled-name='_gnutls13_handshake_hash_buffers_synth' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='_gnutls_send_change_cipher_spec' mangled-name='_gnutls_send_change_cipher_spec' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_set_resumed_parameters' mangled-name='_gnutls_set_resumed_parameters' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='_gnutls_epoch_dup' mangled-name='_gnutls_epoch_dup' 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-112'/>
+    <function-decl name='_gnutls_set_resumed_parameters' mangled-name='_gnutls_set_resumed_parameters' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_tls13_update_secret' mangled-name='_tls13_update_secret' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_recv_encrypted_extensions' mangled-name='_gnutls13_recv_encrypted_extensions' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_recv_certificate_request' mangled-name='_gnutls13_recv_certificate_request' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-405'>
-      <parameter type-id='type-id-402'/>
+    <function-type size-in-bits='64' id='type-id-404'>
+      <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-276'/>
+      <parameter type-id='type-id-275'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-411'>
-      <parameter type-id='type-id-402'/>
+    <function-type size-in-bits='64' id='type-id-410'>
+      <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-403'>
-      <parameter type-id='type-id-402'/>
-      <parameter type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-402'>
+      <parameter type-id='type-id-401'/>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-276'/>
+      <parameter type-id='type-id-275'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-407'>
-      <parameter type-id='type-id-402'/>
-      <parameter type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-406'>
+      <parameter type-id='type-id-401'/>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-378'>
-      <parameter type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-377'>
+      <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-377'/>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-376'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-409'>
-      <parameter type-id='type-id-402'/>
-      <parameter type-id='type-id-102'/>
-      <return type-id='type-id-112'/>
+    <function-type size-in-bits='64' id='type-id-408'>
+      <parameter type-id='type-id-401'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='buffers.c' comp-dir-path='/home/nmavrogi/cvs/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-237' name='session'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-236' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='memmove' mangled-name='memmove' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_mbuffer_dequeue' mangled-name='_mbuffer_dequeue' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='qsort' mangled-name='qsort' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_handshake_description_get_name' mangled-name='gnutls_handshake_description_get_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__errno_location' mangled-name='__errno_location' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='handshake.c' comp-dir-path='/home/nmavrogi/cvs/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-414' name='session'/>
-      <return type-id='type-id-187'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <return type-id='type-id-186'/>
     </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-414' name='session'/>
-      <return type-id='type-id-187'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <return type-id='type-id-186'/>
     </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-414' name='session'/>
-      <parameter type-id='type-id-100' name='max'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-10' name='ms'/>
-      <return type-id='type-id-112'/>
+      <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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_set_datum' mangled-name='_gnutls_set_datum' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_recv_int' mangled-name='_gnutls_recv_int' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_read_connection_state_init' mangled-name='_gnutls_read_connection_state_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_record_check_pending' mangled-name='gnutls_record_check_pending' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_dtls_wait_and_retransmit' mangled-name='_dtls_wait_and_retransmit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_connection_state_init' mangled-name='_gnutls_connection_state_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_write_connection_state_init' mangled-name='_gnutls_write_connection_state_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='_gnutls_version_to_entry' mangled-name='_gnutls_version_to_entry' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='_gnutls_version_lowest' mangled-name='_gnutls_version_lowest' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='_gnutls_version_max' mangled-name='_gnutls_version_max' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='_gnutls_buffer_append_data_prefix' mangled-name='_gnutls_buffer_append_data_prefix' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='_gnutls_get_client_ciphersuites' mangled-name='_gnutls_get_client_ciphersuites' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_gen_hello_extensions' mangled-name='_gnutls_gen_hello_extensions' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='gnutls_dtls_set_timeouts' mangled-name='gnutls_dtls_set_timeouts' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_legacy_version_max' mangled-name='_gnutls_legacy_version_max' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='_gnutls_epoch_setup_next' mangled-name='_gnutls_epoch_setup_next' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_kx_allows_false_start' mangled-name='_gnutls_kx_allows_false_start' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_handshake_client' mangled-name='_gnutls13_handshake_client' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_recv_new_session_ticket' mangled-name='_gnutls_recv_new_session_ticket' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_send_client_certificate' mangled-name='_gnutls_send_client_certificate' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_send_client_kx_message' mangled-name='_gnutls_send_client_kx_message' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='_gnutls_recv_server_certificate_status' mangled-name='_gnutls_recv_server_certificate_status' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_recv_server_crt_request' mangled-name='_gnutls_recv_server_crt_request' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_send_client_certificate_verify' mangled-name='_gnutls_send_client_certificate_verify' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_recv_server_certificate_status' mangled-name='_gnutls_recv_server_certificate_status' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='_gnutls_send_client_kx_message' mangled-name='_gnutls_send_client_kx_message' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_recv_server_kx_message' mangled-name='_gnutls_recv_server_kx_message' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_recv_server_certificate' mangled-name='_gnutls_recv_server_certificate' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ext_sr_verify' mangled-name='_gnutls_ext_sr_verify' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+    <function-decl name='gnutls_alert_get' mangled-name='gnutls_alert_get' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_epoch_setup_next' mangled-name='_gnutls_epoch_setup_next' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='_gnutls13_handshake_server' mangled-name='_gnutls13_handshake_server' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_send_new_session_ticket' mangled-name='_gnutls_send_new_session_ticket' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_server_register_current_session' mangled-name='_gnutls_server_register_current_session' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <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-112'/>
-    </function-decl>
-    <function-decl name='_gnutls_check_id_for_change' mangled-name='_gnutls_check_id_for_change' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_recv_client_certificate' mangled-name='_gnutls_recv_client_certificate' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls13_handshake_server' mangled-name='_gnutls13_handshake_server' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='_gnutls_check_id_for_change' mangled-name='_gnutls_check_id_for_change' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_send_server_certificate' mangled-name='_gnutls_send_server_certificate' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+    <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_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-112'/>
+    <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_recv_client_kx_message' mangled-name='_gnutls_recv_client_kx_message' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <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_send_server_certificate_status' mangled-name='_gnutls_send_server_certificate_status' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='_gnutls_send_server_kx_message' mangled-name='_gnutls_send_server_kx_message' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='gnutls_alert_get' mangled-name='gnutls_alert_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='_gnutls_recv_client_kx_message' mangled-name='_gnutls_recv_client_kx_message' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_dtls_reset_hsk_state' mangled-name='_dtls_reset_hsk_state' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_epoch_gc' mangled-name='_gnutls_epoch_gc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_handshake_internal_state_clear' mangled-name='_gnutls_handshake_internal_state_clear' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_parse_supplemental' mangled-name='_gnutls_parse_supplemental' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_gen_supplemental' mangled-name='_gnutls_gen_supplemental' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_buffer_append_data_prefix' mangled-name='_gnutls_buffer_append_data_prefix' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_append_prefix' mangled-name='_gnutls_buffer_append_prefix' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gen_hello_extensions' mangled-name='_gnutls_gen_hello_extensions' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_bin2hex' mangled-name='_gnutls_bin2hex' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_version_to_entry' mangled-name='_gnutls_version_to_entry' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_version_lowest' mangled-name='_gnutls_version_lowest' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_version_max' mangled-name='_gnutls_version_max' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_get_client_ciphersuites' mangled-name='_gnutls_get_client_ciphersuites' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_legacy_version_max' mangled-name='_gnutls_legacy_version_max' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_recv_hello_retry_request' mangled-name='_gnutls13_recv_hello_retry_request' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_get_cred' mangled-name='_gnutls_get_cred' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_set_cipher_suite2' mangled-name='_gnutls_set_cipher_suite2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_get_kx_cred' mangled-name='_gnutls_get_kx_cred' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_kx_auth_struct' mangled-name='_gnutls_kx_auth_struct' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__builtin_memcmp' mangled-name='memcmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_cipher_to_entry' mangled-name='_gnutls_cipher_to_entry' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nversion_to_entry' mangled-name='nversion_to_entry' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_parse_hello_extensions' mangled-name='_gnutls_parse_hello_extensions' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_nversion_is_supported' mangled-name='_gnutls_nversion_is_supported' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_memset' mangled-name='gnutls_memset' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='reset_binders' mangled-name='reset_binders' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_tls13_init_secret' mangled-name='_tls13_init_secret' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_server_restore_session' mangled-name='_gnutls_server_restore_session' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ext_set_full_client_hello' mangled-name='_gnutls_ext_set_full_client_hello' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_read_client_hello_v2' mangled-name='_gnutls_read_client_hello_v2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_handshake_io_cache_int' mangled-name='_gnutls_handshake_io_cache_int' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_handshake_io_write_flush' mangled-name='_gnutls_handshake_io_write_flush' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_generate_early_secrets_for_psk' mangled-name='_gnutls_generate_early_secrets_for_psk' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='ciphersuite_to_entry' mangled-name='ciphersuite_to_entry' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ext_sr_recv_cs' mangled-name='_gnutls_ext_sr_recv_cs' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_figure_common_ciphersuite' mangled-name='_gnutls_figure_common_ciphersuite' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ext_sr_finished' mangled-name='_gnutls_ext_sr_finished' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_map_kx_get_cred' mangled-name='_gnutls_map_kx_get_cred' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_kx_get' mangled-name='gnutls_kx_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_version_is_too_high' mangled-name='_gnutls_version_is_too_high' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_prf_raw' mangled-name='_gnutls_prf_raw' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hash_fast' mangled-name='gnutls_hash_fast' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_mbuffer_alloc' mangled-name='_mbuffer_alloc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_auth_client_get_type' mangled-name='gnutls_auth_client_get_type' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_check_if_cert_hash_is_same' mangled-name='_gnutls_check_if_cert_hash_is_same' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='errors.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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-319' name='a'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-318' 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'>
       <parameter type-id='type-id-22' name='error'/>
@@ -5326,7 +5333,7 @@
     </function-decl>
     <function-decl name='gnutls_perror' mangled-name='gnutls_perror' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_perror@@GNUTLS_3_4'>
       <parameter type-id='type-id-22' name='error'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_error_is_fatal' mangled-name='gnutls_error_is_fatal' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_error_is_fatal@@GNUTLS_3_4'>
       <parameter type-id='type-id-22' name='error'/>
@@ -5337,528 +5344,531 @@
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='vasprintf' mangled-name='vasprintf' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='fprintf' mangled-name='fprintf' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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-112'/>
+      <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/nmavrogi/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-415'>
+  <abi-instr version='1.0' address-size='64' path='dh.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_dh_params_int' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-414'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-416' visibility='default'/>
+        <var-decl name='params' type-id='type-id-415' 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-319' size-in-bits='192' id='type-id-416'>
-      <subrange length='3' type-id='type-id-38' id='type-id-417'/>
+    <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>
-    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-418'/>
-    <typedef-decl name='gnutls_dh_params_t' type-id='type-id-418' id='type-id-419'/>
-    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-420'/>
+    <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'/>
     <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-419' name='params'/>
-      <parameter type-id='type-id-276' name='prime'/>
-      <parameter type-id='type-id-276' name='generator'/>
-      <parameter type-id='type-id-420' name='bits'/>
+      <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'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-421'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-420'>
       <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-421' id='type-id-422'/>
+    <typedef-decl name='gnutls_x509_crt_fmt_t' type-id='type-id-420' id='type-id-421'/>
     <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-419' name='params'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-418' name='params'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-275' name='out'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-423'/>
+    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-422'/>
     <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-419' name='params'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-418' name='params'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-64' name='params_data'/>
-      <parameter type-id='type-id-423' name='params_data_size'/>
+      <parameter type-id='type-id-422' 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-419' name='params'/>
+      <parameter type-id='type-id-418' name='params'/>
       <parameter type-id='type-id-57' name='pkcs3_params'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-419' name='dparams'/>
+      <parameter type-id='type-id-418' 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-419' name='dst'/>
-      <parameter type-id='type-id-419' name='src'/>
+      <parameter type-id='type-id-418' name='dst'/>
+      <parameter type-id='type-id-418' 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-419' name='dh_params'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-418' name='dh_params'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-419' size-in-bits='64' id='type-id-424'/>
+    <pointer-type-def type-id='type-id-418' size-in-bits='64' id='type-id-423'/>
     <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-424' name='dh_params'/>
+      <parameter type-id='type-id-423' 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-419' name='dh_params'/>
+      <parameter type-id='type-id-418' 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-419' name='dh_params'/>
+      <parameter type-id='type-id-418' 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-419' name='dh_params'/>
-      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-418' name='dh_params'/>
+      <parameter type-id='type-id-383' 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-419' name='dh_params'/>
+      <parameter type-id='type-id-418' 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'/>
     </function-decl>
     <function-decl name='_gnutls_mpi_dprint' mangled-name='_gnutls_mpi_dprint' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_der_encode' mangled-name='_gnutls_x509_der_encode' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_delete_structure' mangled-name='asn1_delete_structure' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_fbase64_encode' mangled-name='_gnutls_fbase64_encode' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_create_element' mangled-name='asn1_create_element' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_asn2err' mangled-name='_gnutls_asn2err' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_write_value' mangled-name='asn1_write_value' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_write_uint32' mangled-name='_gnutls_x509_write_uint32' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_der_decoding' mangled-name='asn1_der_decoding' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_read_uint' mangled-name='_gnutls_x509_read_uint' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_read_int' mangled-name='_gnutls_x509_read_int' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_fbase64_decode' mangled-name='_gnutls_fbase64_decode' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pk_params_init' mangled-name='gnutls_pk_params_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_mpi_init_scan_nz' mangled-name='_gnutls_mpi_init_scan_nz' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pk_params_release' mangled-name='gnutls_pk_params_release' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_dh_save_group' mangled-name='_gnutls_dh_save_group' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='kx.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_send_handshake' mangled-name='_gnutls_send_handshake' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_handshake_get_session_hash' mangled-name='_gnutls_handshake_get_session_hash' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='fclose' mangled-name='fclose' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pthread_mutex_lock' mangled-name='pthread_mutex_lock' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='fflush' mangled-name='fflush' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pthread_mutex_unlock' mangled-name='pthread_mutex_unlock' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='secure_getenv' mangled-name='secure_getenv' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='fopen' mangled-name='fopen' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cipher-cbc.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='priority.c' comp-dir-path='/home/nmavrogi/cvs/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-145' id='type-id-425'/>
-    <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-426'/>
+    <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'/>
     <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-425' name='pcache'/>
-      <parameter type-id='type-id-426' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-425' name='pcache'/>
-      <parameter type-id='type-id-426' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-425' name='pcache'/>
-      <parameter type-id='type-id-426' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-425' name='pcache'/>
-      <parameter type-id='type-id-426' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-425' name='pcache'/>
-      <parameter type-id='type-id-426' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-425' name='pcache'/>
-      <parameter type-id='type-id-426' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-425' name='pcache'/>
-      <parameter type-id='type-id-426' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-425' name='pcache'/>
-      <parameter type-id='type-id-426' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-425' name='pcache'/>
-      <parameter type-id='type-id-426' name='list'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' 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-427'/>
+    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-426'/>
     <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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-27' name='add_prio'/>
-      <parameter type-id='type-id-427' name='err_pos'/>
+      <parameter type-id='type-id-426' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-27' name='priorities'/>
-      <parameter type-id='type-id-427' name='err_pos'/>
+      <parameter type-id='type-id-426' name='err_pos'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-425' size-in-bits='64' id='type-id-428'/>
+    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-427'/>
     <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-428' name='priority_cache'/>
+      <parameter type-id='type-id-427' name='priority_cache'/>
       <parameter type-id='type-id-27' name='priorities'/>
-      <parameter type-id='type-id-427' name='err_pos'/>
+      <parameter type-id='type-id-426' 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-428' name='priority_cache'/>
+      <parameter type-id='type-id-427' name='priority_cache'/>
       <parameter type-id='type-id-27' name='priorities'/>
-      <parameter type-id='type-id-427' name='err_pos'/>
+      <parameter type-id='type-id-426' 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-377'/>
+      <return type-id='type-id-376'/>
     </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-237' name='session'/>
-      <parameter type-id='type-id-425' name='priority'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-424' 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-425' name='priority_cache'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-424' name='priority_cache'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-429'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-428'>
       <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-429' id='type-id-430'/>
+    <typedef-decl name='gnutls_ctype_target_t' type-id='type-id-428' id='type-id-429'/>
     <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-425' name='pcache'/>
-      <parameter type-id='type-id-426' name='list'/>
-      <parameter type-id='type-id-430' name='target'/>
+      <parameter type-id='type-id-424' name='pcache'/>
+      <parameter type-id='type-id-425' name='list'/>
+      <parameter type-id='type-id-429' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='strlen' mangled-name='strlen' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='strchr' mangled-name='strchr' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_profile_to_sec_level' mangled-name='_gnutls_profile_to_sec_level' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_id_to_group' mangled-name='_gnutls_id_to_group' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='cipher_suite_get' mangled-name='cipher_suite_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_sign_to_entry' mangled-name='_gnutls_sign_to_entry' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_mac_get_id' mangled-name='gnutls_mac_get_id' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='cipher_name_to_entry' mangled-name='cipher_name_to_entry' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_cipher_exists' mangled-name='_gnutls_cipher_exists' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='c_strncasecmp' mangled-name='c_strncasecmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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-112'/>
+      <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-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__xstat' mangled-name='__xstat' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='ini_parse' mangled-name='ini_parse' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='exit' mangled-name='exit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_profile_get_id' mangled-name='_gnutls_profile_get_id' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='strtok_r' mangled-name='strtok_r' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='gnutls_cipher_get_id' mangled-name='gnutls_cipher_get_id' 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'>
-      <return type-id='type-id-112'/>
+    <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'>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+    <function-decl name='_gnutls_version_mark_disabled' mangled-name='_gnutls_version_mark_disabled' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ecc_curve_mark_disabled' mangled-name='_gnutls_ecc_curve_mark_disabled' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='gnutls_cipher_get_id' mangled-name='gnutls_cipher_get_id' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='hash_int.c' comp-dir-path='/home/nmavrogi/cvs/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-212' name='algo'/>
+      <parameter type-id='type-id-211' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_get_crypto_digest' mangled-name='_gnutls_get_crypto_digest' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cipher_int.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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='_gnutls_mac_init' mangled-name='_gnutls_mac_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_get_crypto_cipher' mangled-name='_gnutls_get_crypto_cipher' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='session.c' comp-dir-path='/home/nmavrogi/cvs/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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <return type-id='type-id-377'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <return type-id='type-id-376'/>
     </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-237' name='session'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-102' name='session_data'/>
-      <parameter type-id='type-id-100' name='session_data_size'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-276' name='session_id'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-275' 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-237' name='session'/>
-      <parameter type-id='type-id-102' name='session_id'/>
-      <parameter type-id='type-id-423' name='session_id_size'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-101' name='session_id'/>
+      <parameter type-id='type-id-422' 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-237' name='session'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-275' 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-237' name='session'/>
-      <parameter type-id='type-id-102' name='session_data'/>
-      <parameter type-id='type-id-423' name='session_data_size'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-101' name='session_data'/>
+      <parameter type-id='type-id-422' name='session_data_size'/>
       <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_sign_get_name' mangled-name='gnutls_sign_get_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_protocol_get_name' mangled-name='gnutls_protocol_get_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_mac_get' mangled-name='gnutls_mac_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_mac_get_name' mangled-name='gnutls_mac_get_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_cipher_get' mangled-name='gnutls_cipher_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_cipher_get_name' mangled-name='gnutls_cipher_get_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_session_unpack' mangled-name='_gnutls_session_unpack' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='_gnutls_session_pack' mangled-name='_gnutls_session_pack' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_session_is_resumed' mangled-name='gnutls_session_is_resumed' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_session_pack' mangled-name='_gnutls_session_pack' 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='db.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='db.c' comp-dir-path='/home/nmavrogi/cvs/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-237' name='session'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' 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-276' name='entry'/>
+      <parameter type-id='type-id-275' 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-276' name='entry'/>
+      <parameter type-id='type-id-275' 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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-62' name='session_entry'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -5866,139 +5876,139 @@
       <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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-22' name='seconds'/>
-      <return type-id='type-id-112'/>
+      <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-237' name='session'/>
-      <return type-id='type-id-102'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-102' name='ptr'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-156' name='store_func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-158' name='rem_func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-157' name='retr_func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-156' name='retr_func'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_server_name_matches_resumed' mangled-name='_gnutls_server_name_matches_resumed' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509_b64.c' comp-dir-path='/home/nmavrogi/cvs/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-276' name='result'/>
+      <parameter type-id='type-id-275' 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-276' name='result'/>
+      <parameter type-id='type-id-275' 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-276' name='result'/>
+      <parameter type-id='type-id-275' 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-423' name='result_size'/>
+      <parameter type-id='type-id-422' 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-276' name='result'/>
+      <parameter type-id='type-id-275' 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-377' name='result'/>
-      <parameter type-id='type-id-423' name='result_size'/>
+      <parameter type-id='type-id-376' name='result'/>
+      <parameter type-id='type-id-422' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_str_cat' mangled-name='_gnutls_str_cat' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='memmem' mangled-name='memmem' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='nettle_base64_encode_raw' mangled-name='nettle_base64_encode_raw' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_base64_decode_init' mangled-name='nettle_base64_decode_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_base64_decode_update' mangled-name='nettle_base64_decode_update' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_base64_decode_final' mangled-name='nettle_base64_decode_final' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='nettle_base64_encode_raw' mangled-name='nettle_base64_encode_raw' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='hello_ext.c' comp-dir-path='/home/nmavrogi/cvs/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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-10' name='tls_id'/>
-      <parameter type-id='type-id-358' name='data'/>
+      <parameter type-id='type-id-357' 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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-10' name='tls_id'/>
-      <parameter type-id='type-id-299' name='data'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-298' 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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-27' name='name'/>
       <parameter type-id='type-id-22' name='id'/>
-      <parameter type-id='type-id-339' name='parse_type'/>
-      <parameter type-id='type-id-340' name='recv_func'/>
-      <parameter type-id='type-id-341' name='send_func'/>
-      <parameter type-id='type-id-342' name='deinit_func'/>
-      <parameter type-id='type-id-343' name='pack_func'/>
-      <parameter type-id='type-id-344' name='unpack_func'/>
+      <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-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-339' name='parse_type'/>
-      <parameter type-id='type-id-340' name='recv_func'/>
-      <parameter type-id='type-id-341' name='send_func'/>
-      <parameter type-id='type-id-342' name='deinit_func'/>
-      <parameter type-id='type-id-343' name='pack_func'/>
-      <parameter type-id='type-id-344' name='unpack_func'/>
+      <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'/>
       <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'>
@@ -6006,225 +6016,225 @@
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_pop_prefix32' mangled-name='_gnutls_buffer_pop_prefix32' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_extv_append' mangled-name='_gnutls_extv_append' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_extv_parse' mangled-name='_gnutls_extv_parse' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='auth.c' comp-dir-path='/home/nmavrogi/cvs/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-414' name='session'/>
-      <return type-id='type-id-310'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <return type-id='type-id-309'/>
     </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-414' name='session'/>
-      <return type-id='type-id-310'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <return type-id='type-id-309'/>
     </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-414' name='session'/>
-      <return type-id='type-id-310'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <return type-id='type-id-309'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-431'/>
+    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-430'/>
     <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-414' name='session'/>
-      <parameter type-id='type-id-310' name='type'/>
-      <parameter type-id='type-id-431' name='cred'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-309' name='type'/>
+      <parameter type-id='type-id-430' 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-414' name='session'/>
-      <parameter type-id='type-id-310' name='type'/>
-      <parameter type-id='type-id-102' name='cred'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-309' 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-414' name='session'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-413' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_free_dh_info' mangled-name='_gnutls_free_dh_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='sslv2_compat.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_negotiate_version' mangled-name='_gnutls_negotiate_version' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_user_hello_func' mangled-name='_gnutls_user_hello_func' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_set_client_random' mangled-name='_gnutls_set_client_random' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_gen_server_random' mangled-name='_gnutls_gen_server_random' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_generate_session_id' mangled-name='_gnutls_generate_session_id' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='session_pack.c' comp-dir-path='/home/nmavrogi/cvs/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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-368' name='comp'/>
+      <parameter type-id='type-id-367' 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'/>
     </function-decl>
     <function-decl name='_gnutls_cipher_suite_get_id' mangled-name='_gnutls_cipher_suite_get_id' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_mac_to_entry' mangled-name='_gnutls_mac_to_entry' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_pop_datum_prefix32' mangled-name='_gnutls_buffer_pop_datum_prefix32' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_auth_info_init' mangled-name='_gnutls_auth_info_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_pop_data' mangled-name='_gnutls_buffer_pop_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_pop_datum_prefix8' mangled-name='_gnutls_buffer_pop_datum_prefix8' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_free_auth_info' mangled-name='_gnutls_free_auth_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hello_ext_unpack' mangled-name='_gnutls_hello_ext_unpack' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_auth_get_type' mangled-name='gnutls_auth_get_type' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hello_ext_pack' mangled-name='_gnutls_hello_ext_pack' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='mpi.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-432'/>
+  <abi-instr version='1.0' address-size='64' path='pk.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-431'/>
     <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-432' name='hash'/>
+      <parameter type-id='type-id-431' name='hash'/>
       <parameter type-id='type-id-64' name='digest'/>
-      <parameter type-id='type-id-420' name='digest_size'/>
+      <parameter type-id='type-id-419' 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-212' name='hash'/>
+      <parameter type-id='type-id-211' name='hash'/>
       <parameter type-id='type-id-57' name='digest'/>
-      <parameter type-id='type-id-276' name='output'/>
+      <parameter type-id='type-id-275' 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-276' name='r'/>
-      <parameter type-id='type-id-276' name='s'/>
+      <parameter type-id='type-id-275' name='r'/>
+      <parameter type-id='type-id-275' 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-276' name='sig_value'/>
+      <parameter type-id='type-id-275' 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-276' name='r'/>
-      <parameter type-id='type-id-276' name='s'/>
+      <parameter type-id='type-id-275' name='r'/>
+      <parameter type-id='type-id-275' 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-276' name='r'/>
-      <parameter type-id='type-id-276' name='s'/>
+      <parameter type-id='type-id-275' name='r'/>
+      <parameter type-id='type-id-275' 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-276' name='sig_value'/>
+      <parameter type-id='type-id-275' 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-276' name='sig_value'/>
+      <parameter type-id='type-id-275' 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_mpi_dprint_le' mangled-name='_gnutls_mpi_dprint_le' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ecc_curve_get_params' mangled-name='_gnutls_ecc_curve_get_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_oid_to_digest' mangled-name='gnutls_oid_to_digest' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_der_coding' mangled-name='asn1_der_coding' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_mpi_init_scan' mangled-name='_gnutls_mpi_init_scan' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_mpi_bprint_size' mangled-name='_gnutls_mpi_bprint_size' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_read_value' mangled-name='_gnutls_x509_read_value' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_write_int' mangled-name='_gnutls_x509_write_int' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/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-433'>
+  <abi-instr version='1.0' address-size='64' path='cert-cred.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_certificate_credentials_st' size-in-bits='1408' is-struct='yes' visibility='default' id='type-id-432'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='dh_params' type-id='type-id-419' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-418' 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-203' visibility='default'/>
+        <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='params_func' type-id='type-id-434' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-433' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='certs' type-id='type-id-435' visibility='default'/>
+        <var-decl name='certs' type-id='type-id-434' 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-420' visibility='default'/>
+        <var-decl name='sorted_cert_idx' type-id='type-id-419' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='tlist' type-id='type-id-436' visibility='default'/>
+        <var-decl name='tlist' type-id='type-id-435' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='flags' type-id='type-id-10' visibility='default'/>
@@ -6239,110 +6249,110 @@
         <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-437' visibility='default'/>
+        <var-decl name='legacy_cert_cb1' type-id='type-id-436' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='legacy_cert_cb2' type-id='type-id-438' visibility='default'/>
+        <var-decl name='legacy_cert_cb2' type-id='type-id-437' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='get_cert_callback3' type-id='type-id-439' visibility='default'/>
+        <var-decl name='get_cert_callback3' type-id='type-id-438' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='verify_callback' type-id='type-id-172' visibility='default'/>
+        <var-decl name='verify_callback' type-id='type-id-171' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='pin' type-id='type-id-375' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='pin_tmp' type-id='type-id-440' visibility='default'/>
+        <var-decl name='pin_tmp' type-id='type-id-439' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='glob_ocsp_func' type-id='type-id-165' visibility='default'/>
+        <var-decl name='glob_ocsp_func' type-id='type-id-164' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='glob_ocsp_func_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='glob_ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <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-441'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-440'>
       <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-441' id='type-id-442'/>
-    <class-decl name='gnutls_params_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-443'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-442' visibility='default'/>
+        <var-decl name='type' type-id='type-id-441' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='params' type-id='type-id-444' visibility='default'/>
+        <var-decl name='params' type-id='type-id-443' 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-444'>
+    <union-decl name='params' size-in-bits='64' visibility='default' id='type-id-443'>
       <data-member access='private'>
-        <var-decl name='dh' type-id='type-id-419' visibility='default'/>
+        <var-decl name='dh' type-id='type-id-418' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='rsa_export' type-id='type-id-445' visibility='default'/>
+        <var-decl name='rsa_export' type-id='type-id-444' visibility='default'/>
       </data-member>
     </union-decl>
-    <typedef-decl name='gnutls_rsa_params_t' type-id='type-id-392' id='type-id-445'/>
-    <typedef-decl name='gnutls_params_st' type-id='type-id-443' id='type-id-446'/>
-    <pointer-type-def type-id='type-id-446' size-in-bits='64' id='type-id-447'/>
-    <typedef-decl name='gnutls_params_function' type-id='type-id-448' id='type-id-449'/>
-    <pointer-type-def type-id='type-id-449' size-in-bits='64' id='type-id-434'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='4544' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-450' visibility='default' id='type-id-451'>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cert_list' type-id='type-id-162' visibility='default'/>
+        <var-decl name='cert_list' type-id='type-id-161' 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-452' visibility='default'/>
+        <var-decl name='names' type-id='type-id-451' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='ocsp_func' type-id='type-id-165' visibility='default'/>
+        <var-decl name='ocsp_func' type-id='type-id-164' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='ocsp_func_ptr' type-id='type-id-102' visibility='default'/>
+        <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-453' visibility='default'/>
+        <var-decl name='ocsp_data' type-id='type-id-452' 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-402' visibility='default'/>
+        <var-decl name='pkey' type-id='type-id-401' 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-454'>
+    <class-decl name='gnutls_str_array_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-453'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='str' type-id='type-id-377' visibility='default'/>
+        <var-decl name='str' type-id='type-id-376' 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-455' visibility='default'/>
+        <var-decl name='next' type-id='type-id-454' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-454' size-in-bits='64' id='type-id-455'/>
-    <typedef-decl name='gnutls_str_array_t' type-id='type-id-455' id='type-id-452'/>
+    <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'/>
 
-    <array-type-def dimensions='1' type-id='type-id-275' size-in-bits='4096' id='type-id-453'>
-      <subrange length='8' type-id='type-id-38' id='type-id-134'/>
+    <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>
-    <typedef-decl name='certs_st' type-id='type-id-451' id='type-id-450'/>
-    <pointer-type-def type-id='type-id-450' size-in-bits='64' id='type-id-435'/>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='size' type-id='type-id-10' visibility='default'/>
@@ -6366,14 +6376,14 @@
         <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-377' visibility='default'/>
+        <var-decl name='pkcs11_token' type-id='type-id-376' 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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cert' type-id='type-id-388' visibility='default'/>
+        <var-decl name='cert' type-id='type-id-387' 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'/>
@@ -6388,7 +6398,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-375' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-374' 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'/>
@@ -6420,7 +6430,7 @@
     <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='asn' type-id='type-id-388' visibility='default'/>
+        <var-decl name='asn' type-id='type-id-387' visibility='default'/>
       </data-member>
     </class-decl>
     <typedef-decl name='gnutls_x509_dn_st' type-id='type-id-465' id='type-id-462'/>
@@ -6428,7 +6438,7 @@
     <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-436'/>
+    <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'>
@@ -6436,7 +6446,7 @@
         <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-381' visibility='default'/>
+        <var-decl name='key_type' type-id='type-id-380' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cert' type-id='type-id-472' visibility='default'/>
@@ -6464,13 +6474,13 @@
     <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'>
       <data-member access='private'>
-        <var-decl name='x509' type-id='type-id-384' visibility='default'/>
+        <var-decl name='x509' type-id='type-id-383' visibility='default'/>
       </data-member>
       <data-member access='private'>
         <var-decl name='pgp' type-id='type-id-477' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='pkcs11' type-id='type-id-385' visibility='default'/>
+        <var-decl name='pkcs11' type-id='type-id-384' 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'/>
@@ -6479,11 +6489,11 @@
     <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-437'/>
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-484'/>
-    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-485'/>
+    <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-438'/>
+    <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'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='version' type-id='type-id-10' visibility='default'/>
@@ -6507,64 +6517,64 @@
         <var-decl name='padding' type-id='type-id-490' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-433' size-in-bits='64' id='type-id-491'/>
+    <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'/>
 
     <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='512' id='type-id-490'>
-      <subrange length='64' type-id='type-id-38' id='type-id-93'/>
+      <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-164' size-in-bits='64' id='type-id-494'/>
+    <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-439'/>
+    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-438'/>
 
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='256' id='type-id-440'>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='256' id='type-id-439'>
       <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-203' name='sec_param'/>
+      <parameter type-id='type-id-202' 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-419' name='dh_params'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-418' 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-276' name='out'/>
+      <parameter type-id='type-id-275' 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-172' name='func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-171' 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-439' name='func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-438' 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-438' name='func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-437' 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-437' name='func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-436' 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-414' name='session'/>
-      <parameter type-id='type-id-149' name='req'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-413' 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'/>
     <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'>
@@ -6573,17 +6583,17 @@
     </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'/>
-      <return type-id='type-id-112'/>
+      <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'/>
-      <return type-id='type-id-112'/>
+      <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-10' name='idx1'/>
       <parameter type-id='type-id-10' name='idx2'/>
-      <parameter type-id='type-id-276' name='cert'/>
+      <parameter type-id='type-id-275' 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'>
@@ -6595,120 +6605,120 @@
     </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'/>
-      <return type-id='type-id-112'/>
+      <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'/>
-      <return type-id='type-id-112'/>
+      <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-427' name='names'/>
+      <parameter type-id='type-id-426' name='names'/>
       <parameter type-id='type-id-22' name='names_size'/>
-      <parameter type-id='type-id-162' name='pcert_list'/>
+      <parameter type-id='type-id-161' name='pcert_list'/>
       <parameter type-id='type-id-22' name='pcert_list_size'/>
-      <parameter type-id='type-id-402' name='key'/>
+      <parameter type-id='type-id-401' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_dh_params_deinit' mangled-name='gnutls_dh_params_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pk_to_sign' mangled-name='gnutls_pk_to_sign' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_privkey_sign_data2' mangled-name='gnutls_privkey_sign_data2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_verify_data2' mangled-name='gnutls_pubkey_verify_data2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pk_get_name' mangled-name='gnutls_pk_get_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pcert_import_x509' mangled-name='gnutls_pcert_import_x509' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pcert_deinit' mangled-name='gnutls_pcert_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_pkcs11' mangled-name='gnutls_privkey_import_pkcs11' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_privkey_deinit' mangled-name='gnutls_privkey_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_x509' mangled-name='gnutls_privkey_import_x509' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_deinit' mangled-name='gnutls_x509_crt_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_trust_list_init' mangled-name='gnutls_x509_trust_list_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_import' mangled-name='gnutls_x509_crt_import' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_get_x509_name' mangled-name='_gnutls_get_x509_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_idna_map' mangled-name='gnutls_idna_map' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_realloc_fast' mangled-name='gnutls_realloc_fast' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-495'>
-      <parameter type-id='type-id-414'/>
+      <parameter type-id='type-id-413'/>
       <parameter type-id='type-id-493'/>
       <parameter type-id='type-id-484'/>
-      <parameter type-id='type-id-420'/>
+      <parameter type-id='type-id-419'/>
       <parameter type-id='type-id-494'/>
-      <parameter type-id='type-id-420'/>
+      <parameter type-id='type-id-419'/>
       <parameter type-id='type-id-485'/>
-      <parameter type-id='type-id-420'/>
+      <parameter type-id='type-id-419'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-486'>
-      <parameter type-id='type-id-414'/>
+      <parameter type-id='type-id-413'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-22'/>
       <parameter type-id='type-id-470'/>
       <parameter type-id='type-id-22'/>
       <parameter type-id='type-id-484'/>
-      <parameter type-id='type-id-420'/>
+      <parameter type-id='type-id-419'/>
       <parameter type-id='type-id-485'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-482'>
-      <parameter type-id='type-id-414'/>
+      <parameter type-id='type-id-413'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-22'/>
       <parameter type-id='type-id-470'/>
@@ -6716,16 +6726,16 @@
       <parameter type-id='type-id-481'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-448'>
-      <parameter type-id='type-id-414'/>
-      <parameter type-id='type-id-442'/>
-      <parameter type-id='type-id-447'/>
+    <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'/>
       <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <var-decl name='_gnutls_pkix1_asn' type-id='type-id-388' visibility='default'/>
-    <var-decl name='_gnutls_gnutls_asn' type-id='type-id-388' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='global.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/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'/>
@@ -6739,7 +6749,7 @@
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_global_deinit' mangled-name='gnutls_global_deinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_global_deinit@@GNUTLS_3_4'>
-      <return type-id='type-id-112'/>
+      <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' elf-symbol-id='gnutls_global_init@@GNUTLS_3_4'>
       <return type-id='type-id-22'/>
@@ -6750,123 +6760,123 @@
     <typedef-decl name='gnutls_is_secure_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-122' id='type-id-513'/>
+    <typedef-decl name='gnutls_free_function' type-id='type-id-121' id='type-id-513'/>
     <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'/>
-      <return type-id='type-id-112'/>
+      <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-112'/>
+      <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'/>
     <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'/>
-      <return type-id='type-id-112'/>
+      <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'/>
-      <return type-id='type-id-112'/>
+      <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'/>
-      <return type-id='type-id-112'/>
+      <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'>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='strtol' mangled-name='strtol' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_strerror' mangled-name='gnutls_strerror' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='strverscmp' mangled-name='strverscmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_system_key_deinit' mangled-name='_gnutls_system_key_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_crypto_deinit' mangled-name='gnutls_crypto_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_rnd_deinit' mangled-name='_gnutls_rnd_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hello_ext_deinit' mangled-name='_gnutls_hello_ext_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_crypto_deregister' mangled-name='_gnutls_crypto_deregister' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_system_global_deinit' mangled-name='gnutls_system_global_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_cryptodev_deinit' mangled-name='_gnutls_cryptodev_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_supplemental_deinit' mangled-name='_gnutls_supplemental_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_unload_system_priorities' mangled-name='_gnutls_unload_system_priorities' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_tpm_global_deinit' mangled-name='_gnutls_tpm_global_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_nss_keylog_deinit' mangled-name='_gnutls_nss_keylog_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_deinit' mangled-name='gnutls_pkcs11_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_rnd_system_entropy_check' mangled-name='_rnd_system_entropy_check' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='bindtextdomain' mangled-name='bindtextdomain' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_crypto_init' mangled-name='gnutls_crypto_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_system_key_init' mangled-name='_gnutls_system_key_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_check_version' mangled-name='asn1_check_version' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_array2tree' mangled-name='asn1_array2tree' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_rnd_preinit' mangled-name='_gnutls_rnd_preinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hello_ext_init' mangled-name='_gnutls_hello_ext_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_system_global_init' mangled-name='gnutls_system_global_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_register_fork_handler' mangled-name='_gnutls_register_fork_handler' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_register_accel_crypto' mangled-name='_gnutls_register_accel_crypto' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_cryptodev_init' mangled-name='_gnutls_cryptodev_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-507'>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-515'>
@@ -6876,75 +6886,75 @@
     <function-type size-in-bits='64' id='type-id-498'>
       <parameter type-id='type-id-22'/>
       <parameter type-id='type-id-27'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-501'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-236'/>
       <parameter type-id='type-id-27'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-504'>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-102'/>
+      <parameter type-id='type-id-99'/>
+      <return type-id='type-id-101'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-510'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-102'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='constate.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_cipher_get_tag_size' mangled-name='gnutls_cipher_get_tag_size' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_auth_cipher_deinit' mangled-name='_gnutls_auth_cipher_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_generate_master' mangled-name='_gnutls_generate_master' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='_dtls_reset_window' mangled-name='_dtls_reset_window' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_record_overhead' mangled-name='_gnutls_record_overhead' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_dtls_reset_window' mangled-name='_dtls_reset_window' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_auth_cipher_init' mangled-name='_gnutls_auth_cipher_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_tls13_expand_secret' mangled-name='_tls13_expand_secret' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='anon_cred.c' comp-dir-path='/home/nmavrogi/cvs/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-518'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='dh_params' type-id='type-id-419' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-418' 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-203' visibility='default'/>
+        <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='params_func' type-id='type-id-434' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-433' 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'/>
     <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-203' name='sec_param'/>
+      <parameter type-id='type-id-202' 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-419' name='dh_params'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-418' 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'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -6960,7 +6970,7 @@
     </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'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-525'/>
     <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'>
@@ -6969,15 +6979,15 @@
     </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'/>
-      <return type-id='type-id-112'/>
+      <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-434' name='func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-433' 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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='mem.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/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'/>
@@ -6989,64 +6999,64 @@
     <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'>
       <parameter type-id='type-id-27'/>
-      <return type-id='type-id-377'/>
+      <return type-id='type-id-376'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-526'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-102'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='fingerprint.c' comp-dir-path='/home/nmavrogi/cvs/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-212' name='algo'/>
+      <parameter type-id='type-id-211' name='algo'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-102' name='result'/>
-      <parameter type-id='type-id-423' name='result_size'/>
+      <parameter type-id='type-id-101' name='result'/>
+      <parameter type-id='type-id-422' 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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <function-decl name='_gnutls_session_get_sign_algo' mangled-name='_gnutls_session_get_sign_algo' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='gnutls_sign_supports_pk_algorithm' mangled-name='gnutls_sign_supports_pk_algorithm' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </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'>
-      <return type-id='type-id-112'/>
-    </function-decl>
+  <abi-instr version='1.0' address-size='64' path='tls-sig.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hash_init' mangled-name='_gnutls_hash_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hash_deinit' mangled-name='_gnutls_hash_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_privkey_sign_hash' mangled-name='gnutls_privkey_sign_hash' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_session_sign_algo_enabled' mangled-name='_gnutls_session_sign_algo_enabled' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='_gnutls_session_get_sign_algo' mangled-name='_gnutls_session_get_sign_algo' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='gnutls_sign_supports_pk_algorithm' mangled-name='gnutls_sign_supports_pk_algorithm' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </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'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_verify_hash2' mangled-name='gnutls_pubkey_verify_hash2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_session_sign_algo_enabled' mangled-name='_gnutls_session_sign_algo_enabled' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_sign_get_pk_algorithm' mangled-name='gnutls_sign_get_pk_algorithm' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ecc.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='alert.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-531'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_A_CLOSE_NOTIFY' value='0'/>
@@ -7085,17 +7095,17 @@
     </enum-decl>
     <typedef-decl name='gnutls_alert_description_t' type-id='type-id-531' id='type-id-532'/>
     <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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <return type-id='type-id-532'/>
     </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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-365' name='level'/>
+      <parameter type-id='type-id-364' name='level'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-533'>
@@ -7105,7 +7115,7 @@
     </enum-decl>
     <typedef-decl name='gnutls_alert_level_t' type-id='type-id-533' id='type-id-534'/>
     <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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-534' name='level'/>
       <parameter type-id='type-id-532' name='desc'/>
       <return type-id='type-id-22'/>
@@ -7119,8 +7129,8 @@
       <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/nmavrogi/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-393'>
+  <abi-instr version='1.0' address-size='64' path='privkey_raw.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_pkcs11_privkey_st' size-in-bits='3392' is-struct='yes' visibility='default' id='type-id-392'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pk_algorithm' type-id='type-id-60' visibility='default'/>
       </data-member>
@@ -7137,7 +7147,7 @@
         <var-decl name='uinfo' type-id='type-id-535' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='url' type-id='type-id-377' visibility='default'/>
+        <var-decl name='url' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='sinfo' type-id='type-id-536' visibility='default'/>
@@ -7149,10 +7159,10 @@
         <var-decl name='reauth' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3200'>
-        <var-decl name='mutex' type-id='type-id-102' visibility='default'/>
+        <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-375' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-374' 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'/>
@@ -7406,13 +7416,13 @@
         <var-decl name='cryptoki_version' type-id='type-id-545' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='manufacturer_id' type-id='type-id-274' visibility='default'/>
+        <var-decl name='manufacturer_id' type-id='type-id-273' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='flags' type-id='type-id-618' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='library_description' type-id='type-id-274' visibility='default'/>
+        <var-decl name='library_description' type-id='type-id-273' 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'/>
@@ -7436,7 +7446,7 @@
         <var-decl name='slot_description' type-id='type-id-490' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='manufacturer_id' type-id='type-id-274' visibility='default'/>
+        <var-decl name='manufacturer_id' type-id='type-id-273' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <var-decl name='flags' type-id='type-id-618' visibility='default'/>
@@ -7453,10 +7463,10 @@
     <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'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='label' type-id='type-id-274' visibility='default'/>
+        <var-decl name='label' type-id='type-id-273' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='manufacturer_id' type-id='type-id-274' visibility='default'/>
+        <var-decl name='manufacturer_id' type-id='type-id-273' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='model' type-id='type-id-632' visibility='default'/>
@@ -7509,7 +7519,7 @@
     </class-decl>
 
     <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='128' id='type-id-632'>
-      <subrange length='16' type-id='type-id-38' id='type-id-94'/>
+      <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'/>
@@ -7582,7 +7592,7 @@
         <var-decl name='type' type-id='type-id-674' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='value' type-id='type-id-102' visibility='default'/>
+        <var-decl name='value' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='value_len' type-id='type-id-38' visibility='default'/>
@@ -7612,7 +7622,7 @@
         <var-decl name='mechanism' type-id='type-id-636' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='parameter' type-id='type-id-102' visibility='default'/>
+        <var-decl name='parameter' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='parameter_len' type-id='type-id-38' visibility='default'/>
@@ -7668,17 +7678,17 @@
     <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'/>
     <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-402' name='key'/>
+      <parameter type-id='type-id-401' name='key'/>
       <parameter type-id='type-id-59' name='curve'/>
-      <parameter type-id='type-id-212' name='digest'/>
-      <parameter type-id='type-id-316' name='paramset'/>
+      <parameter type-id='type-id-211' name='digest'/>
+      <parameter type-id='type-id-315' 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-402' name='key'/>
+      <parameter type-id='type-id-401' 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'/>
@@ -7686,7 +7696,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-402' name='key'/>
+      <parameter type-id='type-id-401' 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'/>
@@ -7695,7 +7705,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-402' name='key'/>
+      <parameter type-id='type-id-401' 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'/>
@@ -7707,111 +7717,111 @@
       <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-316' size-in-bits='64' id='type-id-712'/>
+    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-712'/>
     <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-402' name='key'/>
+      <parameter type-id='type-id-401' name='key'/>
       <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-432' name='digest'/>
+      <parameter type-id='type-id-431' name='digest'/>
       <parameter type-id='type-id-712' name='paramset'/>
-      <parameter type-id='type-id-276' name='x'/>
-      <parameter type-id='type-id-276' name='y'/>
-      <parameter type-id='type-id-276' name='k'/>
+      <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-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-402' name='key'/>
+      <parameter type-id='type-id-401' name='key'/>
       <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-276' name='x'/>
-      <parameter type-id='type-id-276' name='y'/>
-      <parameter type-id='type-id-276' name='k'/>
+      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-275' 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-402' name='key'/>
-      <parameter type-id='type-id-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='g'/>
-      <parameter type-id='type-id-276' name='y'/>
-      <parameter type-id='type-id-276' name='x'/>
+      <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'/>
       <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-402' name='key'/>
-      <parameter type-id='type-id-276' name='m'/>
-      <parameter type-id='type-id-276' name='e'/>
-      <parameter type-id='type-id-276' name='d'/>
-      <parameter type-id='type-id-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='u'/>
-      <parameter type-id='type-id-276' name='e1'/>
-      <parameter type-id='type-id-276' name='e2'/>
+      <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'/>
       <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-402' name='key'/>
-      <parameter type-id='type-id-276' name='m'/>
-      <parameter type-id='type-id-276' name='e'/>
-      <parameter type-id='type-id-276' name='d'/>
-      <parameter type-id='type-id-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='u'/>
-      <parameter type-id='type-id-276' name='e1'/>
-      <parameter type-id='type-id-276' name='e2'/>
+      <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-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-402' name='key'/>
-      <parameter type-id='type-id-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='g'/>
-      <parameter type-id='type-id-276' name='y'/>
-      <parameter type-id='type-id-276' name='x'/>
+      <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-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-402' name='key'/>
+      <parameter type-id='type-id-401' name='key'/>
       <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-276' name='x'/>
-      <parameter type-id='type-id-276' name='y'/>
-      <parameter type-id='type-id-276' name='k'/>
+      <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-10' name='flags'/>
       <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_deinit' mangled-name='gnutls_x509_privkey_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_privkey_get_mpis' mangled-name='_gnutls_privkey_get_mpis' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_params_get_gost_raw' mangled-name='_gnutls_params_get_gost_raw' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_params_get_rsa_raw' mangled-name='_gnutls_params_get_rsa_raw' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_params_get_dsa_raw' mangled-name='_gnutls_params_get_dsa_raw' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-623'>
       <parameter type-id='type-id-622'/>
@@ -7824,7 +7834,7 @@
     <function-type size-in-bits='64' id='type-id-709'>
       <parameter type-id='type-id-618'/>
       <parameter type-id='type-id-625'/>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <return type-id='type-id-614'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-657'>
@@ -7918,7 +7928,7 @@
     <function-type size-in-bits='64' id='type-id-651'>
       <parameter type-id='type-id-542'/>
       <parameter type-id='type-id-650'/>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <return type-id='type-id-614'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-681'>
@@ -8013,7 +8023,7 @@
     <function-type size-in-bits='64' id='type-id-655'>
       <parameter type-id='type-id-543'/>
       <parameter type-id='type-id-618'/>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-653'/>
       <parameter type-id='type-id-654'/>
       <return type-id='type-id-614'/>
@@ -8038,11 +8048,11 @@
       <return type-id='type-id-614'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-615'>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <return type-id='type-id-614'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='system/certs.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system/certs.c' comp-dir-path='/home/nmavrogi/cvs/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-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'/>
@@ -8053,327 +8063,338 @@
       <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='getuid' mangled-name='getuid' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='getpwuid_r' mangled-name='getpwuid_r' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system/threads.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='malloc' mangled-name='malloc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pthread_mutex_init' mangled-name='pthread_mutex_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system/fastopen.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='abort' mangled-name='abort' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='recv' mangled-name='recv' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='setsockopt' mangled-name='setsockopt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='sendmsg' mangled-name='sendmsg' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='connect' mangled-name='connect' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system/sockets.c' comp-dir-path='/home/nmavrogi/cvs/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-155' name='ptr'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='str-iconv.c' comp-dir-path='/home/nmavrogi/cvs/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-102' name='data'/>
-      <parameter type-id='type-id-100' name='size'/>
-      <parameter type-id='type-id-276' name='output'/>
+      <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-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-102' name='data'/>
-      <parameter type-id='type-id-100' name='size'/>
-      <parameter type-id='type-id-276' name='output'/>
+      <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-10' name='be'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='u8_to_u16' mangled-name='u8_to_u16' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='u16_normalize' mangled-name='u16_normalize' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='u16_to_u8' mangled-name='u16_to_u8' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <var-decl name='gnutls_time' type-id='type-id-517' visibility='default'/>
-    <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-716'/>
+    <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'/>
     <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'/>
-      <return type-id='type-id-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-717'>
       <parameter type-id='type-id-716'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='inih/ini.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='inih/ini.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <function-decl name='strncpy' mangled-name='strncpy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='str.c' comp-dir-path='/home/nmavrogi/cvs/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-276' name='result'/>
+      <parameter type-id='type-id-275' 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-377' name='result'/>
-      <parameter type-id='type-id-423' name='result_size'/>
+      <parameter type-id='type-id-376' name='result'/>
+      <parameter type-id='type-id-422' 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-102' name='result'/>
-      <parameter type-id='type-id-423' name='result_size'/>
+      <parameter type-id='type-id-101' name='result'/>
+      <parameter type-id='type-id-422' 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-276' name='result'/>
+      <parameter type-id='type-id-275' 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-100' name='hex_size'/>
-      <parameter type-id='type-id-102' name='bin_data'/>
-      <parameter type-id='type-id-423' name='bin_size'/>
+      <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'/>
       <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-102' name='_old'/>
-      <parameter type-id='type-id-100' name='oldlen'/>
-      <parameter type-id='type-id-377' name='buffer'/>
-      <parameter type-id='type-id-100' name='buffer_size'/>
+      <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-99' name='buffer_size'/>
       <parameter type-id='type-id-27' name='separator'/>
-      <return type-id='type-id-377'/>
+      <return type-id='type-id-376'/>
+    </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'/>
+      <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-238' name='str'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-237' name='str'/>
+      <parameter type-id='type-id-275' 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-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-238' name='dest'/>
+      <parameter type-id='type-id-237' 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-351' name='dest'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <parameter type-id='type-id-350' 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'/>
+      <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-238' name='str'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-237' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='strrchr' mangled-name='strrchr' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='hex_encode' mangled-name='hex_encode' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='hex_decode' mangled-name='hex_decode' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='strtoul' mangled-name='strtoul' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='sprintf' mangled-name='sprintf' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='sscanf' mangled-name='sscanf' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='strncat' mangled-name='strncat' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='str-unicode.c' comp-dir-path='/home/nmavrogi/cvs/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-347' name='password'/>
+      <parameter type-id='type-id-346' name='password'/>
       <parameter type-id='type-id-10' name='plen'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-275' name='out'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='uc_general_category_or' mangled-name='uc_general_category_or' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='uc_general_category_and_not' mangled-name='uc_general_category_and_not' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='uc_is_property_join_control' mangled-name='uc_is_property_join_control' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='uc_is_general_category' mangled-name='uc_is_general_category' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='uc_is_property_default_ignorable_code_point' mangled-name='uc_is_property_default_ignorable_code_point' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='uc_is_property_not_a_character' mangled-name='uc_is_property_not_a_character' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='uc_is_general_category' mangled-name='uc_is_general_category' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='u32_normalize' mangled-name='u32_normalize' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='u8_check' mangled-name='u8_check' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='u8_to_u32' mangled-name='u8_to_u32' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='u32_to_u8' mangled-name='u32_to_u8' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='str-idna.c' comp-dir-path='/home/nmavrogi/cvs/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-276' name='out'/>
+      <parameter type-id='type-id-275' 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-276' name='out'/>
+      <parameter type-id='type-id-275' name='out'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_set_strdatum' mangled-name='_gnutls_set_strdatum' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='idn2_to_unicode_8z8z' mangled-name='idn2_to_unicode_8z8z' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='idn2_free' mangled-name='idn2_free' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='idn2_strerror' mangled-name='idn2_strerror' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='idn2_to_ascii_8z' mangled-name='idn2_to_ascii_8z' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='state.c' comp-dir-path='/home/nmavrogi/cvs/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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-10' name='read'/>
-      <parameter type-id='type-id-347' name='seq_number'/>
+      <parameter type-id='type-id-346' 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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-10' name='read'/>
-      <parameter type-id='type-id-276' name='mac_key'/>
-      <parameter type-id='type-id-276' name='IV'/>
-      <parameter type-id='type-id-276' name='cipher_key'/>
+      <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-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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-10' name='htype'/>
       <parameter type-id='type-id-22' name='when'/>
-      <parameter type-id='type-id-160' name='func'/>
-      <return type-id='type-id-112'/>
+      <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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
-      <parameter type-id='type-id-276' name='secret'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-275' 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-414' name='session'/>
-      <parameter type-id='type-id-276' name='client'/>
-      <parameter type-id='type-id-276' name='server'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-275' name='client'/>
+      <parameter type-id='type-id-275' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <return type-id='type-id-59'/>
     </function-decl>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-720'>
@@ -8382,168 +8403,168 @@
     </enum-decl>
     <typedef-decl name='gnutls_channel_binding_t' type-id='type-id-720' id='type-id-721'/>
     <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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-721' name='cbtype'/>
-      <parameter type-id='type-id-276' name='cb'/>
+      <parameter type-id='type-id-275' 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-414' name='session'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
-      <parameter type-id='type-id-159' name='func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-35' name='major'/>
       <parameter type-id='type-id-35' name='minor'/>
-      <return type-id='type-id-112'/>
+      <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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
-      <parameter type-id='type-id-172' name='func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-171' 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-414' name='session'/>
-      <parameter type-id='type-id-102' name='ptr'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
-      <return type-id='type-id-102'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-22' name='allow'/>
-      <return type-id='type-id-112'/>
+      <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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-35' name='major'/>
       <parameter type-id='type-id-35' name='minor'/>
-      <return type-id='type-id-112'/>
+      <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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-35' name='major'/>
       <parameter type-id='type-id-35' name='minor'/>
-      <return type-id='type-id-112'/>
+      <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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-22' name='allow'/>
-      <return type-id='type-id-112'/>
+      <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-414' name='session'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-722'/>
+    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-722'/>
     <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-722' 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-414' name='session'/>
-      <return type-id='type-id-368'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <return type-id='type-id-367'/>
     </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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
-      <parameter type-id='type-id-430' name='target'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-429' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_session_etm_status' mangled-name='gnutls_session_etm_status' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hello_ext_priv_deinit' mangled-name='_gnutls_hello_ext_priv_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_epoch_free' mangled-name='_gnutls_epoch_free' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_credentials_clear' mangled-name='gnutls_credentials_clear' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_selected_certs_deinit' mangled-name='_gnutls_selected_certs_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_priority_deinit' mangled-name='gnutls_priority_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_mbuffer_head_init' mangled-name='_mbuffer_head_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cert-cred-x509.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <class-decl name='gnutls_certificate_credentials_st' size-in-bits='1408' is-struct='yes' visibility='default' id='type-id-723'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='dh_params' type-id='type-id-419' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-418' 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-203' visibility='default'/>
+        <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='params_func' type-id='type-id-434' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-433' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='certs' type-id='type-id-435' visibility='default'/>
+        <var-decl name='certs' type-id='type-id-434' 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-420' visibility='default'/>
+        <var-decl name='sorted_cert_idx' type-id='type-id-419' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='tlist' type-id='type-id-715' visibility='default'/>
@@ -8561,28 +8582,28 @@
         <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-437' visibility='default'/>
+        <var-decl name='legacy_cert_cb1' type-id='type-id-436' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='legacy_cert_cb2' type-id='type-id-438' visibility='default'/>
+        <var-decl name='legacy_cert_cb2' type-id='type-id-437' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='get_cert_callback3' type-id='type-id-439' visibility='default'/>
+        <var-decl name='get_cert_callback3' type-id='type-id-438' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='verify_callback' type-id='type-id-172' visibility='default'/>
+        <var-decl name='verify_callback' type-id='type-id-171' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='pin' type-id='type-id-375' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='pin_tmp' type-id='type-id-440' visibility='default'/>
+        <var-decl name='pin_tmp' type-id='type-id-439' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='glob_ocsp_func' type-id='type-id-165' visibility='default'/>
+        <var-decl name='glob_ocsp_func' type-id='type-id-164' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='glob_ocsp_func_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='glob_ocsp_func_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <var-decl name='tls13_ok' type-id='type-id-75' visibility='default'/>
@@ -8592,43 +8613,43 @@
     <typedef-decl name='gnutls_certificate_credentials_t' type-id='type-id-724' id='type-id-725'/>
     <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-725' name='cred'/>
-      <parameter type-id='type-id-376' name='fn'/>
-      <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-375' 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-725' name='sc'/>
-      <return type-id='type-id-112'/>
+      <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-725' name='res'/>
       <parameter type-id='type-id-57' name='p12blob'/>
-      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-421' 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-725' name='res'/>
       <parameter type-id='type-id-27' name='pkcs12file'/>
-      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-421' 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-725' name='res'/>
       <parameter type-id='type-id-27' name='crlfile'/>
-      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-421' 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-726'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='crl' type-id='type-id-388' visibility='default'/>
+        <var-decl name='crl' type-id='type-id-387' 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-388' visibility='default'/>
+        <var-decl name='rcache' type-id='type-id-387' 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'/>
@@ -8655,7 +8676,7 @@
     <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-725' name='res'/>
       <parameter type-id='type-id-57' name='CRL'/>
-      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-421' 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'>
@@ -8665,13 +8686,13 @@
     <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-725' name='cred'/>
       <parameter type-id='type-id-27' name='ca_dir'/>
-      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-421' 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-725' name='cred'/>
       <parameter type-id='type-id-27' name='ca_dir'/>
-      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-421' 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'>
@@ -8683,37 +8704,37 @@
     <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-725' name='res'/>
       <parameter type-id='type-id-57' name='ca'/>
-      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-421' 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-725' name='res'/>
       <parameter type-id='type-id-27' name='certfile'/>
       <parameter type-id='type-id-27' name='keyfile'/>
-      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-421' 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-730'/>
     <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-725' name='res'/>
       <parameter type-id='type-id-730' name='tlist'/>
-      <return type-id='type-id-112'/>
+      <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-725' name='res'/>
       <parameter type-id='type-id-715' name='tlist'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-731'/>
     <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-725' name='res'/>
       <parameter type-id='type-id-10' name='index'/>
       <parameter type-id='type-id-731' name='crt_list'/>
-      <parameter type-id='type-id-420' name='crt_list_size'/>
+      <parameter type-id='type-id-419' name='crt_list_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-732'/>
+    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-732'/>
     <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-725' name='res'/>
       <parameter type-id='type-id-10' name='index'/>
@@ -8724,21 +8745,21 @@
       <parameter type-id='type-id-725' name='res'/>
       <parameter type-id='type-id-458' name='cert_list'/>
       <parameter type-id='type-id-22' name='cert_list_size'/>
-      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-383' 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-725' name='res'/>
       <parameter type-id='type-id-57' name='cert'/>
       <parameter type-id='type-id-57' name='key'/>
-      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-421' 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-725' name='res'/>
       <parameter type-id='type-id-57' name='cert'/>
       <parameter type-id='type-id-57' name='key'/>
-      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-421' name='type'/>
       <parameter type-id='type-id-27' name='pass'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
@@ -8747,113 +8768,113 @@
       <parameter type-id='type-id-725' name='res'/>
       <parameter type-id='type-id-27' name='certfile'/>
       <parameter type-id='type-id-27' name='keyfile'/>
-      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-421' 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_pkcs12_init' mangled-name='gnutls_pkcs12_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_import' mangled-name='gnutls_pkcs12_import' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_verify_mac' mangled-name='gnutls_pkcs12_verify_mac' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_simple_parse' mangled-name='gnutls_pkcs12_simple_parse' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_deinit' mangled-name='gnutls_pkcs12_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_deinit' mangled-name='gnutls_x509_crl_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_read_binary_file' mangled-name='_gnutls_read_binary_file' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crl_cpy' mangled-name='_gnutls_x509_crl_cpy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crt_cpy' mangled-name='_gnutls_x509_crt_cpy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_privkey_export_x509' mangled-name='gnutls_privkey_export_x509' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_certificate_credential_append_keypair' mangled-name='_gnutls_certificate_credential_append_keypair' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_check_key_cert_match' mangled-name='_gnutls_check_key_cert_match' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_url_is_known' mangled-name='_gnutls_url_is_known' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_url_is_supported' mangled-name='gnutls_url_is_supported' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_get_raw_issuer' mangled-name='_gnutls_get_raw_issuer' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='file.c' comp-dir-path='/home/nmavrogi/cvs/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-276' name='data'/>
+      <parameter type-id='type-id-275' 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/nmavrogi/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-296'>
+  <abi-instr version='1.0' address-size='64' path='supplemental.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_supplemental_entry_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-295'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='name' type-id='type-id-377' visibility='default'/>
+        <var-decl name='name' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='type' type-id='type-id-733' visibility='default'/>
@@ -8870,20 +8891,20 @@
       <enumerator name='GNUTLS_SUPPLEMENTAL_UNKNOWN' value='0'/>
     </enum-decl>
     <typedef-decl name='gnutls_supplemental_data_format_type_t' type-id='type-id-736' id='type-id-733'/>
-    <typedef-decl name='gnutls_supp_recv_func' type-id='type-id-349' id='type-id-734'/>
-    <typedef-decl name='gnutls_supp_send_func' type-id='type-id-353' id='type-id-735'/>
+    <typedef-decl name='gnutls_supp_recv_func' type-id='type-id-348' id='type-id-734'/>
+    <typedef-decl name='gnutls_supp_send_func' type-id='type-id-352' id='type-id-735'/>
     <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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-10' name='do_send_supplemental'/>
-      <return type-id='type-id-112'/>
+      <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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-10' name='do_send_supplemental'/>
-      <return type-id='type-id-112'/>
+      <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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-27' name='name'/>
       <parameter type-id='type-id-733' name='type'/>
       <parameter type-id='type-id-734' name='recv_func'/>
@@ -8903,9 +8924,9 @@
       <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='random.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <enum-decl name='gnutls_rnd_level' id='type-id-737'>
       <underlying-type type-id='type-id-41'/>
@@ -8916,85 +8937,85 @@
     <typedef-decl name='gnutls_rnd_level_t' type-id='type-id-737' id='type-id-738'/>
     <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-738' name='level'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-100' name='len'/>
+      <parameter type-id='type-id-101' name='data'/>
+      <parameter type-id='type-id-99' name='len'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_rnd_system_entropy_deinit' mangled-name='_rnd_system_entropy_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_rnd_system_entropy_init' mangled-name='_rnd_system_entropy_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-131' size-in-bits='64' id='type-id-739'/>
+  <abi-instr version='1.0' address-size='64' path='crypto-api.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-739'/>
     <typedef-decl name='gnutls_aead_cipher_hd_t' type-id='type-id-739' id='type-id-740'/>
     <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-740' name='handle'/>
-      <return type-id='type-id-112'/>
+      <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-740' name='handle'/>
-      <parameter type-id='type-id-102' name='nonce'/>
-      <parameter type-id='type-id-100' name='nonce_len'/>
-      <parameter type-id='type-id-250' name='auth_iov'/>
+      <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-22' name='auth_iovcnt'/>
-      <parameter type-id='type-id-250' name='iov'/>
+      <parameter type-id='type-id-249' name='iov'/>
       <parameter type-id='type-id-22' name='iovcnt'/>
-      <parameter type-id='type-id-102' name='tag'/>
-      <parameter type-id='type-id-100' name='tag_size'/>
+      <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-740' name='handle'/>
-      <parameter type-id='type-id-102' name='nonce'/>
-      <parameter type-id='type-id-100' name='nonce_len'/>
-      <parameter type-id='type-id-250' name='auth_iov'/>
+      <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-22' name='auth_iovcnt'/>
-      <parameter type-id='type-id-250' name='iov'/>
+      <parameter type-id='type-id-249' name='iov'/>
       <parameter type-id='type-id-22' name='iovcnt'/>
-      <parameter type-id='type-id-102' name='tag'/>
-      <parameter type-id='type-id-423' name='tag_size'/>
+      <parameter type-id='type-id-101' name='tag'/>
+      <parameter type-id='type-id-422' 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-740' name='handle'/>
-      <parameter type-id='type-id-102' name='nonce'/>
-      <parameter type-id='type-id-100' name='nonce_len'/>
-      <parameter type-id='type-id-250' name='auth_iov'/>
+      <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-22' name='auth_iovcnt'/>
-      <parameter type-id='type-id-100' name='tag_size'/>
-      <parameter type-id='type-id-250' name='iov'/>
+      <parameter type-id='type-id-99' name='tag_size'/>
+      <parameter type-id='type-id-249' name='iov'/>
       <parameter type-id='type-id-22' name='iovcnt'/>
-      <parameter type-id='type-id-102' name='ctext'/>
-      <parameter type-id='type-id-423' name='ctext_len'/>
+      <parameter type-id='type-id-101' name='ctext'/>
+      <parameter type-id='type-id-422' 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-740' name='handle'/>
-      <parameter type-id='type-id-102' name='nonce'/>
-      <parameter type-id='type-id-100' name='nonce_len'/>
-      <parameter type-id='type-id-102' name='auth'/>
-      <parameter type-id='type-id-100' name='auth_len'/>
-      <parameter type-id='type-id-100' name='tag_size'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
-      <parameter type-id='type-id-102' name='ctext'/>
-      <parameter type-id='type-id-423' name='ctext_len'/>
+      <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'/>
+      <parameter type-id='type-id-99' name='auth_len'/>
+      <parameter type-id='type-id-99' name='tag_size'/>
+      <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'/>
       <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-740' name='handle'/>
-      <parameter type-id='type-id-102' name='nonce'/>
-      <parameter type-id='type-id-100' name='nonce_len'/>
-      <parameter type-id='type-id-102' name='auth'/>
-      <parameter type-id='type-id-100' name='auth_len'/>
-      <parameter type-id='type-id-100' name='tag_size'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
-      <parameter type-id='type-id-102' name='ctext'/>
-      <parameter type-id='type-id-423' name='ctext_len'/>
+      <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'/>
+      <parameter type-id='type-id-99' name='auth_len'/>
+      <parameter type-id='type-id-99' name='tag_size'/>
+      <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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <pointer-type-def type-id='type-id-740' size-in-bits='64' id='type-id-741'/>
@@ -9005,156 +9026,160 @@
       <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-276' name='key'/>
+      <parameter type-id='type-id-275' name='key'/>
       <parameter type-id='type-id-10' name='key_size'/>
       <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' elf-symbol-id='gnutls_hash_fast@@GNUTLS_3_4'>
-      <parameter type-id='type-id-212' name='algorithm'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
-      <parameter type-id='type-id-102' name='digest'/>
-      <return type-id='type-id-22'/>
-    </function-decl>
-    <function-decl name='gnutls_hash_get_len' mangled-name='gnutls_hash_get_len' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_hash_get_len@@GNUTLS_3_4'>
-      <parameter type-id='type-id-212' name='algorithm'/>
-      <return type-id='type-id-10'/>
-    </function-decl>
     <class-decl name='hash_hd_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-742'/>
     <pointer-type-def type-id='type-id-742' size-in-bits='64' id='type-id-743'/>
     <typedef-decl name='gnutls_hash_hd_t' type-id='type-id-743' id='type-id-744'/>
+    <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-744' name='handle'/>
+      <return type-id='type-id-744'/>
+    </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-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-744' name='handle'/>
-      <parameter type-id='type-id-102' name='digest'/>
-      <return type-id='type-id-112'/>
+      <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-744' name='handle'/>
-      <parameter type-id='type-id-102' name='digest'/>
-      <return type-id='type-id-112'/>
+      <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-744' name='handle'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
+      <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-744' size-in-bits='64' id='type-id-745'/>
     <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-745' name='dig'/>
-      <parameter type-id='type-id-212' name='algorithm'/>
+      <parameter type-id='type-id-211' 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-746'/>
+    <pointer-type-def type-id='type-id-746' size-in-bits='64' id='type-id-747'/>
+    <typedef-decl name='gnutls_hmac_hd_t' type-id='type-id-747' id='type-id-748'/>
+    <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-748' name='handle'/>
+      <return type-id='type-id-748'/>
+    </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'/>
-      <parameter type-id='type-id-102' name='key'/>
-      <parameter type-id='type-id-100' name='keylen'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
-      <parameter type-id='type-id-102' name='digest'/>
+      <parameter type-id='type-id-101' name='key'/>
+      <parameter type-id='type-id-99' name='keylen'/>
+      <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_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>
-    <class-decl name='hmac_hd_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-746'/>
-    <pointer-type-def type-id='type-id-746' size-in-bits='64' id='type-id-747'/>
-    <typedef-decl name='gnutls_hmac_hd_t' type-id='type-id-747' id='type-id-748'/>
     <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-748' name='handle'/>
-      <parameter type-id='type-id-102' name='digest'/>
-      <return type-id='type-id-112'/>
+      <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-748' name='handle'/>
-      <parameter type-id='type-id-102' name='digest'/>
-      <return type-id='type-id-112'/>
+      <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-748' name='handle'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
+      <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-748' name='handle'/>
-      <parameter type-id='type-id-102' name='nonce'/>
-      <parameter type-id='type-id-100' name='nonce_len'/>
-      <return type-id='type-id-112'/>
+      <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-748' size-in-bits='64' id='type-id-749'/>
     <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-749' name='dig'/>
       <parameter type-id='type-id-31' name='algorithm'/>
-      <parameter type-id='type-id-102' name='key'/>
-      <parameter type-id='type-id-100' name='keylen'/>
+      <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-750'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ctx_enc' type-id='type-id-98' visibility='default'/>
+        <var-decl name='ctx_enc' type-id='type-id-97' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='ctx_dec' type-id='type-id-98' visibility='default'/>
+        <var-decl name='ctx_dec' type-id='type-id-97' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-750' size-in-bits='64' id='type-id-751'/>
     <typedef-decl name='gnutls_cipher_hd_t' type-id='type-id-751' id='type-id-752'/>
     <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-752' name='handle'/>
-      <return type-id='type-id-112'/>
+      <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-752' name='handle'/>
-      <parameter type-id='type-id-102' name='ctext'/>
-      <parameter type-id='type-id-100' name='ctext_len'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
+      <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'/>
+      <parameter type-id='type-id-99' name='ptext_len'/>
       <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-752' name='handle'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
-      <parameter type-id='type-id-102' name='ctext'/>
-      <parameter type-id='type-id-100' name='ctext_len'/>
+      <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-99' name='ctext_len'/>
       <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-752' name='handle'/>
-      <parameter type-id='type-id-102' name='ctext'/>
-      <parameter type-id='type-id-100' name='ctext_len'/>
+      <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-752' name='handle'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
+      <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-752' name='handle'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_len'/>
+      <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-752' name='handle'/>
-      <parameter type-id='type-id-102' name='iv'/>
-      <parameter type-id='type-id-100' name='ivlen'/>
-      <return type-id='type-id-112'/>
+      <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-752' name='handle'/>
-      <parameter type-id='type-id-102' name='ptext'/>
-      <parameter type-id='type-id-100' name='ptext_size'/>
+      <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-752' name='handle'/>
-      <parameter type-id='type-id-102' name='tag'/>
-      <parameter type-id='type-id-100' name='tag_size'/>
+      <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-752' size-in-bits='64' id='type-id-753'/>
@@ -9165,204 +9190,216 @@
       <parameter type-id='type-id-57' name='iv'/>
       <return type-id='type-id-22'/>
     </function-decl>
+    <function-decl name='_gnutls_iov_iter_init' mangled-name='_gnutls_iov_iter_init' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_iov_iter_next' mangled-name='_gnutls_iov_iter_next' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_iov_iter_sync' mangled-name='_gnutls_iov_iter_sync' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_hash_copy' mangled-name='_gnutls_hash_copy' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='_gnutls_mac_fast' mangled-name='_gnutls_mac_fast' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-754'/>
+  <abi-instr version='1.0' address-size='64' path='privkey.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-754'/>
     <typedef-decl name='gnutls_x509_spki_t' type-id='type-id-754' id='type-id-755'/>
     <qualified-type-def type-id='type-id-755' const='yes' id='type-id-756'/>
     <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-402' name='privkey'/>
+      <parameter type-id='type-id-401' name='privkey'/>
       <parameter type-id='type-id-756' 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-402' name='privkey'/>
+      <parameter type-id='type-id-401' name='privkey'/>
       <parameter type-id='type-id-755' 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-402' name='key'/>
+      <parameter type-id='type-id-401' 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-402' name='key'/>
+      <parameter type-id='type-id-401' 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-402' name='key'/>
+      <parameter type-id='type-id-401' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-112'/>
+      <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-402' name='key'/>
-      <parameter type-id='type-id-376' name='fn'/>
-      <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-375' 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-402' name='key'/>
+      <parameter type-id='type-id-401' 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-402' name='pkey'/>
+      <parameter type-id='type-id-401' name='pkey'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-402' name='key'/>
+      <parameter type-id='type-id-401' 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'/>
-      <parameter type-id='type-id-100' name='plaintext_size'/>
+      <parameter type-id='type-id-99' name='plaintext_size'/>
       <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-402' name='key'/>
+      <parameter type-id='type-id-401' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='ciphertext'/>
-      <parameter type-id='type-id-276' name='plaintext'/>
+      <parameter type-id='type-id-275' 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-402' name='signer'/>
-      <parameter type-id='type-id-212' name='hash_algo'/>
+      <parameter type-id='type-id-401' name='signer'/>
+      <parameter type-id='type-id-211' 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-276' name='signature'/>
+      <parameter type-id='type-id-275' 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-402' name='signer'/>
+      <parameter type-id='type-id-401' 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-276' name='signature'/>
+      <parameter type-id='type-id-275' 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-402' name='signer'/>
+      <parameter type-id='type-id-401' 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-276' name='signature'/>
+      <parameter type-id='type-id-275' 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-402' name='signer'/>
-      <parameter type-id='type-id-212' name='hash'/>
+      <parameter type-id='type-id-401' name='signer'/>
+      <parameter type-id='type-id-211' name='hash'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-276' name='signature'/>
+      <parameter type-id='type-id-275' 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-402' name='pkey'/>
+      <parameter type-id='type-id-401' 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-402' name='pkey'/>
+      <parameter type-id='type-id-401' name='pkey'/>
       <parameter type-id='type-id-732' 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-402' name='pkey'/>
-      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-383' 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-402' name='pkey'/>
-      <parameter type-id='type-id-102' name='userdata'/>
-      <parameter type-id='type-id-396' name='sign_data_fn'/>
-      <parameter type-id='type-id-397' name='sign_hash_fn'/>
-      <parameter type-id='type-id-398' name='decrypt_fn'/>
-      <parameter type-id='type-id-400' name='deinit_fn'/>
-      <parameter type-id='type-id-401' name='info_fn'/>
+      <parameter type-id='type-id-401' 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-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-402' name='pkey'/>
-      <parameter type-id='type-id-102' name='userdata'/>
-      <parameter type-id='type-id-395' name='sign_fn'/>
-      <parameter type-id='type-id-398' name='decrypt_fn'/>
-      <parameter type-id='type-id-400' name='deinit_fn'/>
-      <parameter type-id='type-id-401' name='info_fn'/>
+      <parameter type-id='type-id-401' 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-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-402' name='pkey'/>
+      <parameter type-id='type-id-401' name='pkey'/>
       <parameter type-id='type-id-60' name='pk'/>
-      <parameter type-id='type-id-102' name='userdata'/>
-      <parameter type-id='type-id-395' name='sign_fn'/>
-      <parameter type-id='type-id-398' name='decrypt_fn'/>
-      <parameter type-id='type-id-400' name='deinit_fn'/>
+      <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-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-402' name='pkey'/>
+      <parameter type-id='type-id-401' name='pkey'/>
       <parameter type-id='type-id-60' name='pk'/>
-      <parameter type-id='type-id-102' name='userdata'/>
-      <parameter type-id='type-id-395' name='sign_func'/>
-      <parameter type-id='type-id-398' name='decrypt_func'/>
+      <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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-385' size-in-bits='64' id='type-id-757'/>
+    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-757'/>
     <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-402' name='pkey'/>
+      <parameter type-id='type-id-401' name='pkey'/>
       <parameter type-id='type-id-757' 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-402' name='key'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-401' 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'/>
       <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-402' name='key'/>
-      <parameter type-id='type-id-212' name='digest'/>
-      <parameter type-id='type-id-102' name='seed'/>
-      <parameter type-id='type-id-100' name='seed_size'/>
+      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-211' 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-402' name='key'/>
-      <parameter type-id='type-id-432' name='digest'/>
-      <parameter type-id='type-id-102' name='seed'/>
-      <parameter type-id='type-id-423' name='seed_size'/>
+      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-431' name='digest'/>
+      <parameter type-id='type-id-101' name='seed'/>
+      <parameter type-id='type-id-422' 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-402' name='key'/>
-      <return type-id='type-id-381'/>
+      <parameter type-id='type-id-401' name='key'/>
+      <return type-id='type-id-380'/>
     </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-402' name='key'/>
-      <parameter type-id='type-id-420' name='bits'/>
+      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-419' 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-402' name='pkey'/>
-      <parameter type-id='type-id-385' name='key'/>
+      <parameter type-id='type-id-401' name='pkey'/>
+      <parameter type-id='type-id-384' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -9388,7 +9425,7 @@
     <qualified-type-def type-id='type-id-758' const='yes' id='type-id-762'/>
     <pointer-type-def type-id='type-id-762' size-in-bits='64' id='type-id-763'/>
     <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-402' name='pkey'/>
+      <parameter type-id='type-id-401' 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'/>
@@ -9397,243 +9434,243 @@
       <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_status' mangled-name='gnutls_pkcs11_privkey_status' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_set_flags' mangled-name='gnutls_x509_privkey_set_flags' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_init' mangled-name='gnutls_pkcs11_privkey_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_privkey_deinit' mangled-name='gnutls_pkcs11_privkey_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='strncmp' mangled-name='strncmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_privkey_import_system_url' mangled-name='_gnutls_privkey_import_system_url' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import2' mangled-name='gnutls_x509_privkey_import2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs11_privkey_decrypt_data2' mangled-name='_gnutls_pkcs11_privkey_decrypt_data2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs11_privkey_decrypt_data' mangled-name='_gnutls_pkcs11_privkey_decrypt_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pk_is_not_prehashed' mangled-name='_gnutls_pk_is_not_prehashed' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs11_privkey_sign' mangled-name='_gnutls_pkcs11_privkey_sign' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='pk_prepare_hash' mangled-name='pk_prepare_hash' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pk_to_sign_entry' mangled-name='_gnutls_pk_to_sign_entry' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hash_size_to_sha_hash' mangled-name='_gnutls_hash_size_to_sha_hash' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_cpy' mangled-name='gnutls_x509_privkey_cpy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_find_rsa_pss_salt_size' mangled-name='_gnutls_find_rsa_pss_salt_size' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pubkey_to_bits' mangled-name='pubkey_to_bits' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_pkcs11_privkey_get_pubkey' mangled-name='_pkcs11_privkey_get_pubkey' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pubkey_get_mpis' mangled-name='_gnutls_pubkey_get_mpis' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_deinit' mangled-name='gnutls_pubkey_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pk_params_copy' mangled-name='_gnutls_pk_params_copy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_privkey_get_spki_params' mangled-name='_gnutls_x509_privkey_get_spki_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_generate2' mangled-name='gnutls_x509_privkey_generate2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='pk_prepare_hash' mangled-name='pk_prepare_hash' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pk_hash_data' mangled-name='pk_hash_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pcert.c' comp-dir-path='/home/nmavrogi/cvs/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-162' name='pcert'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-161' 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-162' name='pcert'/>
+      <parameter type-id='type-id-161' name='pcert'/>
       <parameter type-id='type-id-458' 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-162' name='pcert'/>
-      <parameter type-id='type-id-268' name='pubkey'/>
+      <parameter type-id='type-id-161' name='pcert'/>
+      <parameter type-id='type-id-267' 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-162' name='pcert'/>
+      <parameter type-id='type-id-161' name='pcert'/>
       <parameter type-id='type-id-57' name='cert'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-162' name='pcert_list'/>
-      <parameter type-id='type-id-420' name='pcert_list_size'/>
+      <parameter type-id='type-id-161' name='pcert_list'/>
+      <parameter type-id='type-id-419' name='pcert_list_size'/>
       <parameter type-id='type-id-27' name='file'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-376' name='pin_fn'/>
-      <parameter type-id='type-id-102' name='pin_fn_userdata'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-375' 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-162' name='pcert_list'/>
-      <parameter type-id='type-id-420' name='pcert_list_size'/>
+      <parameter type-id='type-id-161' name='pcert_list'/>
+      <parameter type-id='type-id-419' name='pcert_list_size'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-162' name='pcert_list'/>
+      <parameter type-id='type-id-161' name='pcert_list'/>
       <parameter type-id='type-id-458' name='crt'/>
-      <parameter type-id='type-id-420' name='ncrt'/>
+      <parameter type-id='type-id-419' 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-162' name='pcert'/>
+      <parameter type-id='type-id-161' name='pcert'/>
       <parameter type-id='type-id-467' 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-162' name='pcert'/>
+      <parameter type-id='type-id-161' name='pcert'/>
       <parameter type-id='type-id-57' name='rawpubkey'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export2' mangled-name='gnutls_pubkey_export2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_load_file' mangled-name='gnutls_load_file' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_check_if_sorted' mangled-name='_gnutls_check_if_sorted' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_sort_clist' mangled-name='_gnutls_sort_clist' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_init' mangled-name='gnutls_pubkey_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_x509' mangled-name='gnutls_pubkey_import_x509' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import' mangled-name='gnutls_pubkey_import' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pubkey.c' comp-dir-path='/home/nmavrogi/cvs/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-268' name='pubkey'/>
+      <parameter type-id='type-id-267' name='pubkey'/>
       <parameter type-id='type-id-756' 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-268' name='pubkey'/>
+      <parameter type-id='type-id-267' name='pubkey'/>
       <parameter type-id='type-id-755' 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-268' name='key'/>
+      <parameter type-id='type-id-267' 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-268' name='pkey'/>
+      <parameter type-id='type-id-267' name='pkey'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-268' name='key'/>
-      <parameter type-id='type-id-376' name='fn'/>
-      <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-375' 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-268' name='key'/>
+      <parameter type-id='type-id-267' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='plaintext'/>
-      <parameter type-id='type-id-276' name='ciphertext'/>
+      <parameter type-id='type-id-275' 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-268' name='key'/>
+      <parameter type-id='type-id-267' 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'/>
@@ -9641,7 +9678,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-268' name='pubkey'/>
+      <parameter type-id='type-id-267' 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'/>
@@ -9649,7 +9686,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-268' name='key'/>
+      <parameter type-id='type-id-267' 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'/>
@@ -9657,146 +9694,146 @@
       <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-268' name='key'/>
+      <parameter type-id='type-id-267' name='key'/>
       <parameter type-id='type-id-59' name='curve'/>
-      <parameter type-id='type-id-212' name='digest'/>
-      <parameter type-id='type-id-316' name='paramset'/>
+      <parameter type-id='type-id-211' name='digest'/>
+      <parameter type-id='type-id-315' 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-268' name='key'/>
+      <parameter type-id='type-id-267' 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-268' name='key'/>
+      <parameter type-id='type-id-267' 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-268' name='key'/>
+      <parameter type-id='type-id-267' 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-268' name='key'/>
+      <parameter type-id='type-id-267' 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-268' name='key'/>
+      <parameter type-id='type-id-267' 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-764'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='crq' type-id='type-id-388' visibility='default'/>
+        <var-decl name='crq' type-id='type-id-387' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-765'/>
     <typedef-decl name='gnutls_x509_crq_t' type-id='type-id-765' id='type-id-766'/>
     <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-766' name='crq'/>
-      <parameter type-id='type-id-268' name='key'/>
+      <parameter type-id='type-id-267' 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-268' name='key'/>
+      <parameter type-id='type-id-267' 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-268' name='key'/>
+      <parameter type-id='type-id-267' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-268' name='key'/>
+      <parameter type-id='type-id-267' name='key'/>
       <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-432' name='digest'/>
+      <parameter type-id='type-id-431' name='digest'/>
       <parameter type-id='type-id-712' name='paramset'/>
-      <parameter type-id='type-id-276' name='x'/>
-      <parameter type-id='type-id-276' name='y'/>
+      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-275' 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-268' name='key'/>
-      <parameter type-id='type-id-276' name='parameters'/>
-      <parameter type-id='type-id-276' name='ecpoint'/>
+      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-275' name='parameters'/>
+      <parameter type-id='type-id-275' 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-268' name='key'/>
+      <parameter type-id='type-id-267' name='key'/>
       <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-276' name='x'/>
-      <parameter type-id='type-id-276' name='y'/>
+      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-275' 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-268' name='key'/>
+      <parameter type-id='type-id-267' name='key'/>
       <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-276' name='x'/>
-      <parameter type-id='type-id-276' name='y'/>
+      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-275' 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-268' name='key'/>
-      <parameter type-id='type-id-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='g'/>
-      <parameter type-id='type-id-276' name='y'/>
+      <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-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-268' name='key'/>
-      <parameter type-id='type-id-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='g'/>
-      <parameter type-id='type-id-276' name='y'/>
+      <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'/>
       <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-268' name='key'/>
-      <parameter type-id='type-id-276' name='m'/>
-      <parameter type-id='type-id-276' name='e'/>
+      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-275' name='m'/>
+      <parameter type-id='type-id-275' 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-268' name='key'/>
-      <parameter type-id='type-id-276' name='m'/>
-      <parameter type-id='type-id-276' name='e'/>
+      <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-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-268' name='key'/>
+      <parameter type-id='type-id-267' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-422' 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-268' name='key'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-275' 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-268' name='key'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-767'>
@@ -9828,7 +9865,7 @@
         <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-375' visibility='default'/>
+        <var-decl name='pin' type-id='type-id-374' visibility='default'/>
       </data-member>
     </class-decl>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-771'>
@@ -9845,177 +9882,177 @@
     <typedef-decl name='ck_object_class_t' type-id='type-id-38' id='type-id-769'/>
 
     <array-type-def dimensions='1' type-id='type-id-62' size-in-bits='512' id='type-id-770'>
-      <subrange length='4' type-id='type-id-38' id='type-id-137'/>
+      <subrange length='4' type-id='type-id-38' id='type-id-136'/>
 
     </array-type-def>
     <pointer-type-def type-id='type-id-767' size-in-bits='64' id='type-id-772'/>
     <typedef-decl name='gnutls_pkcs11_obj_t' type-id='type-id-772' id='type-id-773'/>
     <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-268' name='key'/>
+      <parameter type-id='type-id-267' name='key'/>
       <parameter type-id='type-id-773' 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-268' name='key'/>
-      <parameter type-id='type-id-432' name='hash'/>
-      <parameter type-id='type-id-420' name='mand'/>
+      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-431' name='hash'/>
+      <parameter type-id='type-id-419' 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-268' name='key'/>
-      <parameter type-id='type-id-402' name='pkey'/>
+      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-401' 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-268' name='key'/>
+      <parameter type-id='type-id-267' name='key'/>
       <parameter type-id='type-id-766' 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-268' name='key'/>
+      <parameter type-id='type-id-267' name='key'/>
       <parameter type-id='type-id-467' 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-268' name='key'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-267' name='key'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-774'/>
+    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-774'/>
     <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-774' 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-268' name='key'/>
-      <parameter type-id='type-id-420' name='usage'/>
+      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-419' 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-268' name='key'/>
-      <parameter type-id='type-id-420' name='usage'/>
+      <parameter type-id='type-id-267' name='key'/>
+      <parameter type-id='type-id-419' 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'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='encode_ber_digest_info' mangled-name='encode_ber_digest_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_sign_is_secure2' mangled-name='_gnutls_sign_is_secure2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_is_broken_sig_allowed' mangled-name='_gnutls_is_broken_sig_allowed' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='encode_ber_digest_info' mangled-name='encode_ber_digest_info' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gost_digest' mangled-name='_gnutls_gost_digest' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_digest_gost' mangled-name='_gnutls_digest_gost' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_mpi_init_scan_le' mangled-name='_gnutls_mpi_init_scan_le' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_gost_paramset_default' mangled-name='_gnutls_gost_paramset_default' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_read_ecc_params' mangled-name='_gnutls_x509_read_ecc_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_decode_string' mangled-name='_gnutls_x509_decode_string' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ecc_ansi_x962_import' mangled-name='_gnutls_ecc_ansi_x962_import' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_obj_init' mangled-name='gnutls_pkcs11_obj_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_obj_deinit' mangled-name='gnutls_pkcs11_obj_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_encode_and_copy_PKI_params' mangled-name='_gnutls_x509_encode_and_copy_PKI_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_der_decoding2' mangled-name='asn1_der_decoding2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_get_asn_mpis' mangled-name='_gnutls_get_asn_mpis' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='_gnutls_gost_digest' mangled-name='_gnutls_gost_digest' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_write_ecc_pubkey' mangled-name='_gnutls_x509_write_ecc_pubkey' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_encode_string' mangled-name='_gnutls_x509_encode_string' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_write_ecc_params' mangled-name='_gnutls_x509_write_ecc_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_get_key_id' mangled-name='_gnutls_get_key_id' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_export_int_named2' mangled-name='_gnutls_x509_export_int_named2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_export_int_named' mangled-name='_gnutls_x509_export_int_named' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pk_bits_to_sha_hash' mangled-name='_gnutls_pk_bits_to_sha_hash' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_privkey_get_public_mpis' mangled-name='_gnutls_privkey_get_public_mpis' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crq_get_mpis' mangled-name='_gnutls_x509_crq_get_mpis' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crt_get_mpis' mangled-name='_gnutls_x509_crt_get_mpis' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_ecc_curve_get_name' mangled-name='gnutls_ecc_curve_get_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='locks.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-776'/>
     <typedef-decl name='mutex_init_func' type-id='type-id-776' id='type-id-777'/>
     <typedef-decl name='mutex_deinit_func' type-id='type-id-776' id='type-id-778'/>
@@ -10026,19 +10063,19 @@
       <parameter type-id='type-id-778' name='deinit'/>
       <parameter type-id='type-id-779' name='lock'/>
       <parameter type-id='type-id-780' name='unlock'/>
-      <return type-id='type-id-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-775'>
-      <parameter type-id='type-id-431'/>
+      <parameter type-id='type-id-430'/>
       <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dtls.c' comp-dir-path='/home/nmavrogi/cvs/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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-781' visibility='default' id='type-id-782'>
@@ -10055,56 +10092,56 @@
     <typedef-decl name='gnutls_dtls_prestate_st' type-id='type-id-782' id='type-id-781'/>
     <pointer-type-def type-id='type-id-781' size-in-bits='64' id='type-id-783'/>
     <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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-783' name='prestate'/>
-      <return type-id='type-id-112'/>
+      <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-276' name='key'/>
-      <parameter type-id='type-id-102' name='client_data'/>
-      <parameter type-id='type-id-100' name='client_data_size'/>
-      <parameter type-id='type-id-102' name='_msg'/>
-      <parameter type-id='type-id-100' name='msg_size'/>
+      <parameter type-id='type-id-275' 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-783' 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-276' name='key'/>
-      <parameter type-id='type-id-102' name='client_data'/>
-      <parameter type-id='type-id-100' name='client_data_size'/>
+      <parameter type-id='type-id-275' 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-783' name='prestate'/>
-      <parameter type-id='type-id-155' name='ptr'/>
-      <parameter type-id='type-id-152' name='push_func'/>
+      <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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-236' 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-368' name='comp'/>
+      <parameter type-id='type-id-367' name='comp'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-100'/>
+      <return type-id='type-id-99'/>
     </function-decl>
     <function-decl name='_gnutls_record_overhead' mangled-name='_gnutls_record_overhead' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gnutls_record_overhead@@GNUTLS_PRIVATE_3_4'>
       <parameter type-id='type-id-23' name='ver'/>
@@ -10114,68 +10151,68 @@
       <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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-10' name='mtu'/>
-      <return type-id='type-id-112'/>
+      <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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_io_check_recv' mangled-name='_gnutls_io_check_recv' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_parse_record_buffered_msgs' mangled-name='_gnutls_parse_record_buffered_msgs' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='system_override.c' comp-dir-path='/home/nmavrogi/cvs/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-237' name='session'/>
-      <parameter type-id='type-id-154' name='errno_func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-153' name='vec_func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-152' name='push_func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-150' name='func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-151' name='pull_func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-22' name='err'/>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crypto-backend.c' comp-dir-path='/home/nmavrogi/cvs/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-784' size-in-bits='64' id='type-id-785'/>
     <typedef-decl name='gnutls_digest_init_func' type-id='type-id-785' id='type-id-786'/>
-    <typedef-decl name='gnutls_digest_hash_func' type-id='type-id-118' id='type-id-787'/>
-    <typedef-decl name='gnutls_digest_output_func' type-id='type-id-118' id='type-id-788'/>
-    <typedef-decl name='gnutls_digest_deinit_func' type-id='type-id-122' id='type-id-789'/>
+    <typedef-decl name='gnutls_digest_hash_func' type-id='type-id-117' id='type-id-787'/>
+    <typedef-decl name='gnutls_digest_output_func' type-id='type-id-117' id='type-id-788'/>
+    <typedef-decl name='gnutls_digest_deinit_func' type-id='type-id-121' id='type-id-789'/>
     <pointer-type-def type-id='type-id-790' size-in-bits='64' id='type-id-791'/>
     <typedef-decl name='gnutls_digest_fast_func' type-id='type-id-791' id='type-id-792'/>
     <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-212' name='algorithm'/>
+      <parameter type-id='type-id-211' name='algorithm'/>
       <parameter type-id='type-id-22' name='priority'/>
       <parameter type-id='type-id-786' name='init'/>
       <parameter type-id='type-id-787' name='hash'/>
@@ -10186,11 +10223,11 @@
     </function-decl>
     <pointer-type-def type-id='type-id-793' size-in-bits='64' id='type-id-794'/>
     <typedef-decl name='gnutls_mac_init_func' type-id='type-id-794' id='type-id-795'/>
-    <typedef-decl name='gnutls_mac_setkey_func' type-id='type-id-118' id='type-id-796'/>
-    <typedef-decl name='gnutls_mac_setnonce_func' type-id='type-id-118' id='type-id-797'/>
-    <typedef-decl name='gnutls_mac_hash_func' type-id='type-id-118' id='type-id-798'/>
-    <typedef-decl name='gnutls_mac_output_func' type-id='type-id-118' id='type-id-799'/>
-    <typedef-decl name='gnutls_mac_deinit_func' type-id='type-id-122' id='type-id-800'/>
+    <typedef-decl name='gnutls_mac_setkey_func' type-id='type-id-117' id='type-id-796'/>
+    <typedef-decl name='gnutls_mac_setnonce_func' type-id='type-id-117' id='type-id-797'/>
+    <typedef-decl name='gnutls_mac_hash_func' type-id='type-id-117' id='type-id-798'/>
+    <typedef-decl name='gnutls_mac_output_func' type-id='type-id-117' id='type-id-799'/>
+    <typedef-decl name='gnutls_mac_deinit_func' type-id='type-id-121' id='type-id-800'/>
     <pointer-type-def type-id='type-id-801' size-in-bits='64' id='type-id-802'/>
     <typedef-decl name='gnutls_mac_fast_func' type-id='type-id-802' id='type-id-803'/>
     <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'>
@@ -10207,10 +10244,10 @@
     </function-decl>
     <pointer-type-def type-id='type-id-804' size-in-bits='64' id='type-id-805'/>
     <typedef-decl name='gnutls_cipher_init_func' type-id='type-id-805' id='type-id-806'/>
-    <typedef-decl name='gnutls_cipher_setkey_func' type-id='type-id-118' id='type-id-807'/>
-    <typedef-decl name='gnutls_cipher_aead_encrypt_func' type-id='type-id-116' id='type-id-808'/>
-    <typedef-decl name='gnutls_cipher_aead_decrypt_func' type-id='type-id-116' id='type-id-809'/>
-    <typedef-decl name='gnutls_cipher_deinit_func' type-id='type-id-122' id='type-id-810'/>
+    <typedef-decl name='gnutls_cipher_setkey_func' type-id='type-id-117' id='type-id-807'/>
+    <typedef-decl name='gnutls_cipher_aead_encrypt_func' type-id='type-id-115' id='type-id-808'/>
+    <typedef-decl name='gnutls_cipher_aead_decrypt_func' type-id='type-id-115' id='type-id-809'/>
+    <typedef-decl name='gnutls_cipher_deinit_func' type-id='type-id-121' id='type-id-810'/>
     <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'/>
@@ -10221,9 +10258,9 @@
       <parameter type-id='type-id-810' name='deinit'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <typedef-decl name='gnutls_cipher_setiv_func' type-id='type-id-118' id='type-id-811'/>
-    <typedef-decl name='gnutls_cipher_encrypt_func' type-id='type-id-114' id='type-id-812'/>
-    <typedef-decl name='gnutls_cipher_decrypt_func' type-id='type-id-114' id='type-id-813'/>
+    <typedef-decl name='gnutls_cipher_setiv_func' type-id='type-id-117' id='type-id-811'/>
+    <typedef-decl name='gnutls_cipher_encrypt_func' type-id='type-id-113' id='type-id-812'/>
+    <typedef-decl name='gnutls_cipher_decrypt_func' type-id='type-id-113' id='type-id-813'/>
     <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'/>
@@ -10237,40 +10274,40 @@
     </function-decl>
     <function-type size-in-bits='64' id='type-id-804'>
       <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-431'/>
+      <parameter type-id='type-id-430'/>
       <parameter type-id='type-id-22'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-784'>
-      <parameter type-id='type-id-212'/>
-      <parameter type-id='type-id-431'/>
+      <parameter type-id='type-id-211'/>
+      <parameter type-id='type-id-430'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-790'>
-      <parameter type-id='type-id-212'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-211'/>
+      <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-793'>
       <parameter type-id='type-id-31'/>
-      <parameter type-id='type-id-431'/>
+      <parameter type-id='type-id-430'/>
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-801'>
       <parameter type-id='type-id-31'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <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>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='verify-tofu.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='verify-tofu.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <class-decl name='gnutls_tdb_int' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-814'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='store' type-id='type-id-815' visibility='default'/>
@@ -10292,22 +10329,22 @@
     <typedef-decl name='gnutls_tdb_t' type-id='type-id-824' id='type-id-825'/>
     <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-825' name='tdb'/>
-      <return type-id='type-id-112'/>
+      <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-825' name='tdb'/>
       <parameter type-id='type-id-817' name='verify'/>
-      <return type-id='type-id-112'/>
+      <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-825' name='tdb'/>
       <parameter type-id='type-id-816' name='cstore'/>
-      <return type-id='type-id-112'/>
+      <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-825' name='tdb'/>
       <parameter type-id='type-id-815' name='store'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <pointer-type-def type-id='type-id-825' size-in-bits='64' id='type-id-826'/>
     <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'>
@@ -10319,7 +10356,7 @@
       <parameter type-id='type-id-825' name='tdb'/>
       <parameter type-id='type-id-27' name='host'/>
       <parameter type-id='type-id-27' name='service'/>
-      <parameter type-id='type-id-212' name='hash_algo'/>
+      <parameter type-id='type-id-211' 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'/>
@@ -10347,19 +10384,22 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_find_config_path' mangled-name='_gnutls_find_config_path' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='mkdir' mangled-name='mkdir' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_raw_crt_to_raw_pubkey' mangled-name='_gnutls_x509_raw_crt_to_raw_pubkey' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='strtok_r' mangled-name='strtok_r' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='strpbrk' mangled-name='strpbrk' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__getdelim' mangled-name='__getdelim' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-822'>
       <parameter type-id='type-id-27'/>
@@ -10381,25 +10421,25 @@
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-212'/>
+      <parameter type-id='type-id-211'/>
       <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <var-decl name='_gnutls_pin_func' type-id='type-id-376' visibility='default'/>
-    <var-decl name='_gnutls_pin_data' type-id='type-id-102' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='pin.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <var-decl name='_gnutls_pin_func' type-id='type-id-375' 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-431' name='userdata'/>
-      <return type-id='type-id-376'/>
+      <parameter type-id='type-id-430' name='userdata'/>
+      <return type-id='type-id-375'/>
     </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-376' name='fn'/>
-      <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-375' 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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tpm.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -10485,7 +10525,7 @@
     <typedef-decl name='UINT16' type-id='type-id-11' id='type-id-840'/>
 
     <array-type-def dimensions='1' type-id='type-id-834' size-in-bits='48' id='type-id-841'>
-      <subrange length='6' type-id='type-id-38' id='type-id-231'/>
+      <subrange length='6' type-id='type-id-38' id='type-id-230'/>
 
     </array-type-def>
     <typedef-decl name='TSS_UUID' type-id='type-id-839' id='type-id-833'/>
@@ -10506,7 +10546,7 @@
       <parameter type-id='type-id-849' name='list'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-850'/>
+    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-850'/>
     <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-848' name='list'/>
       <parameter type-id='type-id-10' name='idx'/>
@@ -10516,7 +10556,7 @@
     </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-848' name='list'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-851'>
       <underlying-type type-id='type-id-41'/>
@@ -10531,21 +10571,21 @@
       <parameter type-id='type-id-27' name='srk_password'/>
       <parameter type-id='type-id-27' name='key_password'/>
       <parameter type-id='type-id-852' name='format'/>
-      <parameter type-id='type-id-422' name='pub_format'/>
-      <parameter type-id='type-id-276' name='privkey'/>
-      <parameter type-id='type-id-276' name='pubkey'/>
+      <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-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-268' name='pkey'/>
+      <parameter type-id='type-id-267' 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-402' name='pkey'/>
+      <parameter type-id='type-id-401' 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'/>
@@ -10553,7 +10593,7 @@
       <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-402' name='pkey'/>
+      <parameter type-id='type-id-401' name='pkey'/>
       <parameter type-id='type-id-57' name='fdata'/>
       <parameter type-id='type-id-852' name='format'/>
       <parameter type-id='type-id-27' name='srk_password'/>
@@ -10562,7 +10602,7 @@
       <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-268' name='pkey'/>
+      <parameter type-id='type-id-267' name='pkey'/>
       <parameter type-id='type-id-57' name='fdata'/>
       <parameter type-id='type-id-852' name='format'/>
       <parameter type-id='type-id-27' name='srk_password'/>
@@ -10570,58 +10610,58 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_utf8_password_normalize' mangled-name='gnutls_utf8_password_normalize' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_export' mangled-name='gnutls_pubkey_export' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hex_decode' mangled-name='gnutls_hex_decode' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_unescape' mangled-name='_gnutls_buffer_unescape' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='strstr' mangled-name='strstr' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_append_printf' mangled-name='_gnutls_buffer_append_printf' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_privkey_import_ext2' mangled-name='gnutls_privkey_import_ext2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_privkey_sign_data' mangled-name='gnutls_privkey_sign_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_privkey_cleanup' mangled-name='_gnutls_privkey_cleanup' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pem_base64_decode2' mangled-name='gnutls_pem_base64_decode2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='dlclose' mangled-name='dlclose' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='dlsym' mangled-name='dlsym' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='dlopen' mangled-name='dlopen' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_retrieve_pin' mangled-name='_gnutls_retrieve_pin' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='fips.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <enum-decl name='gnutls_fips_mode_t' id='type-id-853'>
       <underlying-type type-id='type-id-41'/>
@@ -10635,36 +10675,36 @@
     <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-854' name='mode'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_fips140_mode_enabled' mangled-name='gnutls_fips140_mode_enabled' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_fips140_mode_enabled@@GNUTLS_3_4'>
       <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='safe-memfuncs.c' comp-dir-path='/home/nmavrogi/cvs/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-102' name='s1'/>
-      <parameter type-id='type-id-102' name='s2'/>
-      <parameter type-id='type-id-100' name='n'/>
+      <parameter type-id='type-id-101' name='s1'/>
+      <parameter type-id='type-id-101' name='s2'/>
+      <parameter type-id='type-id-99' name='n'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_memset' mangled-name='gnutls_memset' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_memset@@GNUTLS_3_4'>
-      <parameter type-id='type-id-102' name='data'/>
+      <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-22' name='c'/>
-      <parameter type-id='type-id-100' name='size'/>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='atfork.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='randomart.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <enum-decl name='gnutls_random_art' id='type-id-855'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_RANDOM_ART_OPENSSH' value='1'/>
@@ -10674,16 +10714,16 @@
       <parameter type-id='type-id-856' 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-102' name='fpr'/>
-      <parameter type-id='type-id-100' name='fpr_size'/>
-      <parameter type-id='type-id-276' name='art'/>
+      <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'/>
       <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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='urls.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <class-decl name='gnutls_custom_url_st' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-857'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
@@ -10704,13 +10744,13 @@
         <var-decl name='get_issuer' type-id='type-id-861' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='future1' type-id='type-id-102' visibility='default'/>
+        <var-decl name='future1' type-id='type-id-101' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='future2' type-id='type-id-102' visibility='default'/>
+        <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-163' id='type-id-862'/>
+    <typedef-decl name='gnutls_privkey_t' type-id='type-id-162' id='type-id-862'/>
     <pointer-type-def type-id='type-id-863' size-in-bits='64' id='type-id-864'/>
     <typedef-decl name='gnutls_privkey_import_url_func' type-id='type-id-864' id='type-id-858'/>
     <class-decl name='gnutls_x509_crt_int' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-865'/>
@@ -10741,12 +10781,12 @@
       <return type-id='type-id-10'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-872'>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-867'/>
-      <parameter type-id='type-id-276'/>
+      <parameter type-id='type-id-275'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-22'/>
     </function-type>
@@ -10757,7 +10797,7 @@
       <return type-id='type-id-22'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-870'>
-      <parameter type-id='type-id-268'/>
+      <parameter type-id='type-id-267'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-22'/>
@@ -10769,138 +10809,138 @@
       <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='prf.c' comp-dir-path='/home/nmavrogi/cvs/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-237' name='session'/>
-      <parameter type-id='type-id-100' name='label_size'/>
+      <parameter type-id='type-id-236' 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-100' name='extra_size'/>
+      <parameter type-id='type-id-99' name='extra_size'/>
       <parameter type-id='type-id-27' name='extra'/>
-      <parameter type-id='type-id-100' name='outsize'/>
-      <parameter type-id='type-id-377' name='out'/>
+      <parameter type-id='type-id-99' name='outsize'/>
+      <parameter type-id='type-id-376' 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-237' name='session'/>
-      <parameter type-id='type-id-100' name='label_size'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-99' name='label_size'/>
       <parameter type-id='type-id-27' name='label'/>
-      <parameter type-id='type-id-100' name='context_size'/>
+      <parameter type-id='type-id-99' name='context_size'/>
       <parameter type-id='type-id-27' name='context'/>
-      <parameter type-id='type-id-100' name='outsize'/>
-      <parameter type-id='type-id-377' name='out'/>
+      <parameter type-id='type-id-99' name='outsize'/>
+      <parameter type-id='type-id-376' 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-237' name='session'/>
-      <parameter type-id='type-id-100' name='label_size'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-99' name='label_size'/>
       <parameter type-id='type-id-27' name='label'/>
-      <parameter type-id='type-id-100' name='context_size'/>
+      <parameter type-id='type-id-99' name='context_size'/>
       <parameter type-id='type-id-27' name='context'/>
-      <parameter type-id='type-id-100' name='outsize'/>
-      <parameter type-id='type-id-377' name='out'/>
+      <parameter type-id='type-id-99' name='outsize'/>
+      <parameter type-id='type-id-376' 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-237' name='session'/>
-      <parameter type-id='type-id-100' name='label_size'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-99' name='label_size'/>
       <parameter type-id='type-id-27' name='label'/>
-      <parameter type-id='type-id-100' name='seed_size'/>
+      <parameter type-id='type-id-99' name='seed_size'/>
       <parameter type-id='type-id-27' name='seed'/>
-      <parameter type-id='type-id-100' name='outsize'/>
-      <parameter type-id='type-id-377' name='out'/>
+      <parameter type-id='type-id-99' name='outsize'/>
+      <parameter type-id='type-id-376' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_tls13_expand_secret2' mangled-name='_tls13_expand_secret2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='auto-verify.c' comp-dir-path='/home/nmavrogi/cvs/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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
-      <parameter type-id='type-id-173' name='data'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-172' name='data'/>
       <parameter type-id='type-id-10' name='elements'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-112'/>
+      <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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-27' name='hostname'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_verify_peers2' mangled-name='gnutls_certificate_verify_peers2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_certificate_verify_peers' mangled-name='gnutls_certificate_verify_peers' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dh-session.c' comp-dir-path='/home/nmavrogi/cvs/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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
-      <parameter type-id='type-id-276' name='raw_key'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-275' 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-414' name='session'/>
-      <parameter type-id='type-id-276' name='raw_gen'/>
-      <parameter type-id='type-id-276' name='raw_prime'/>
+      <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'/>
       <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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-10' name='bits'/>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cert-session.c' comp-dir-path='/home/nmavrogi/cvs/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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-27' name='hostname'/>
-      <parameter type-id='type-id-420' name='status'/>
+      <parameter type-id='type-id-419' 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-414' name='session'/>
-      <parameter type-id='type-id-420' name='status'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-419' 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-725' 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-112'/>
+      <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-725' name='res'/>
@@ -10909,88 +10949,88 @@
     <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-725' name='res'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-112'/>
+      <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-725' name='res'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-112'/>
+      <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-725' name='res'/>
-      <parameter type-id='type-id-434' name='func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-433' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
-      <parameter type-id='type-id-420' name='list_size'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-419' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
-      <parameter type-id='type-id-173' name='data'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-172' name='data'/>
       <parameter type-id='type-id-10' name='elements'/>
-      <parameter type-id='type-id-420' name='status'/>
+      <parameter type-id='type-id-419' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ocsp_verify_status_to_str' mangled-name='_gnutls_ocsp_verify_status_to_str' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_import' mangled-name='gnutls_ocsp_resp_import' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_verify' mangled-name='gnutls_ocsp_resp_verify' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_deinit' mangled-name='gnutls_ocsp_resp_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_tlsfeatures_init' mangled-name='gnutls_x509_tlsfeatures_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_tlsfeatures_get' mangled-name='gnutls_x509_tlsfeatures_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_tlsfeatures_deinit' mangled-name='gnutls_x509_tlsfeatures_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dh-primes.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -11012,16 +11052,16 @@
     <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='openpgp_compat.c' comp-dir-path='/home/nmavrogi/cvs/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-57' name='hash'/>
-      <parameter type-id='type-id-276' name='signature'/>
+      <parameter type-id='type-id-275' 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-237' name='session'/>
-      <parameter type-id='type-id-276' name='session_id'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-275' name='session_id'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-879'>
@@ -11031,9 +11071,9 @@
     </enum-decl>
     <typedef-decl name='gnutls_openpgp_crt_status_t' type-id='type-id-879' id='type-id-880'/>
     <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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-880' name='status'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <enum-decl name='gnutls_openpgp_crt_fmt' id='type-id-881'>
       <underlying-type type-id='type-id-41'/>
@@ -11045,16 +11085,16 @@
       <parameter type-id='type-id-862' name='pkey'/>
       <parameter type-id='type-id-57' name='data'/>
       <parameter type-id='type-id-882' name='format'/>
-      <parameter type-id='type-id-347' name='keyid'/>
+      <parameter type-id='type-id-346' 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-268' name='key'/>
+      <parameter type-id='type-id-267' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
-      <parameter type-id='type-id-420' name='subkey'/>
+      <parameter type-id='type-id-422' name='output_data_size'/>
+      <parameter type-id='type-id-419' 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-883'/>
@@ -11062,17 +11102,17 @@
     <typedef-decl name='gnutls_certificate_credentials_t' type-id='type-id-884' id='type-id-885'/>
     <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-885' name='c'/>
-      <parameter type-id='type-id-347' name='data'/>
-      <parameter type-id='type-id-100' name='dlen'/>
+      <parameter type-id='type-id-346' name='data'/>
+      <parameter type-id='type-id-99' name='dlen'/>
       <parameter type-id='type-id-882' name='format'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <pointer-type-def type-id='type-id-886' size-in-bits='64' id='type-id-887'/>
     <typedef-decl name='gnutls_openpgp_recv_key_func' type-id='type-id-887' id='type-id-888'/>
     <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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-888' name='func'/>
-      <return type-id='type-id-112'/>
+      <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-889'/>
     <pointer-type-def type-id='type-id-889' size-in-bits='64' id='type-id-890'/>
@@ -11081,7 +11121,7 @@
       <parameter type-id='type-id-474' name='key'/>
       <parameter type-id='type-id-891' name='keyring'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-420' name='verify'/>
+      <parameter type-id='type-id-419' 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'>
@@ -11089,7 +11129,7 @@
       <parameter type-id='type-id-882' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-275' 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'>
@@ -11097,88 +11137,88 @@
       <parameter type-id='type-id-882' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-276' name='m'/>
-      <parameter type-id='type-id-276' name='e'/>
-      <parameter type-id='type-id-276' name='d'/>
-      <parameter type-id='type-id-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='u'/>
+      <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'/>
       <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-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='g'/>
-      <parameter type-id='type-id-276' name='y'/>
-      <parameter type-id='type-id-276' name='x'/>
+      <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'/>
       <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-10' name='idx'/>
-      <parameter type-id='type-id-276' name='m'/>
-      <parameter type-id='type-id-276' name='e'/>
-      <parameter type-id='type-id-276' name='d'/>
-      <parameter type-id='type-id-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='u'/>
+      <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'/>
       <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-10' name='idx'/>
-      <parameter type-id='type-id-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='g'/>
-      <parameter type-id='type-id-276' name='y'/>
-      <parameter type-id='type-id-276' name='x'/>
+      <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'/>
       <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-10' name='idx'/>
-      <parameter type-id='type-id-420' name='bits'/>
+      <parameter type-id='type-id-419' 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-203'/>
+      <return type-id='type-id-202'/>
     </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-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='g'/>
-      <parameter type-id='type-id-276' name='y'/>
+      <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'/>
       <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-10' name='idx'/>
-      <parameter type-id='type-id-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='g'/>
-      <parameter type-id='type-id-276' name='y'/>
+      <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'/>
       <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-10' name='idx'/>
-      <parameter type-id='type-id-420' name='bits'/>
+      <parameter type-id='type-id-419' 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-22' name='idx'/>
-      <parameter type-id='type-id-377' name='buf'/>
-      <parameter type-id='type-id-423' name='sizeof_buf'/>
+      <parameter type-id='type-id-376' name='buf'/>
+      <parameter type-id='type-id-422' 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-892'/>
@@ -11188,7 +11228,7 @@
     </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'/>
-      <return type-id='type-id-112'/>
+      <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'/>
@@ -11199,19 +11239,19 @@
     <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-882' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-882' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-275' 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-420' name='bits'/>
+      <parameter type-id='type-id-419' 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'>
@@ -11252,17 +11292,17 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-886'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-347'/>
+      <parameter type-id='type-id-236'/>
+      <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-276'/>
+      <parameter type-id='type-id-275'/>
       <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crypto-selftests.c' comp-dir-path='/home/nmavrogi/cvs/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-212' name='digest'/>
+      <parameter type-id='type-id-211' 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'>
@@ -11276,146 +11316,155 @@
       <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_cipher_encrypt' mangled-name='gnutls_cipher_encrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_cipher_deinit' mangled-name='gnutls_cipher_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_cipher_init' mangled-name='gnutls_cipher_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_cipher_encrypt2' mangled-name='gnutls_cipher_encrypt2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_cipher_tag' mangled-name='gnutls_cipher_tag' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_cipher_decrypt' mangled-name='gnutls_cipher_decrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_aead_cipher_deinit' mangled-name='gnutls_aead_cipher_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_aead_cipher_init' mangled-name='gnutls_aead_cipher_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_aead_cipher_encrypt' mangled-name='gnutls_aead_cipher_encrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_cipher_get_iv_size' mangled-name='gnutls_cipher_get_iv_size' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_cipher_get_iv' mangled-name='_gnutls_cipher_get_iv' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hash_deinit' mangled-name='gnutls_hash_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hash_get_len' mangled-name='gnutls_hash_get_len' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hash_init' mangled-name='gnutls_hash_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='gnutls_hash_copy' mangled-name='gnutls_hash_copy' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_digest_get_name' mangled-name='gnutls_digest_get_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_digest_exists' mangled-name='_gnutls_digest_exists' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hmac_init' mangled-name='gnutls_hmac_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='gnutls_hmac_copy' mangled-name='gnutls_hmac_copy' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hmac_deinit' mangled-name='gnutls_hmac_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hmac_get_len' mangled-name='gnutls_hmac_get_len' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='gnutls_hmac_set_nonce' mangled-name='gnutls_hmac_set_nonce' 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='crypto-selftests-pk.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crypto-selftests-pk.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
       <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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_privkey_decrypt_data' mangled-name='gnutls_privkey_decrypt_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_privkey_decrypt_data2' mangled-name='gnutls_privkey_decrypt_data2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='secrets.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/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-112'/>
+      <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-112'/>
+      <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-112'/>
+      <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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='extv.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
     <pointer-type-def type-id='type-id-893' size-in-bits='64' id='type-id-894'/>
     <typedef-decl name='gnutls_ext_raw_process_func' type-id='type-id-894' id='type-id-895'/>
     <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-102' name='ctx'/>
+      <parameter type-id='type-id-101' name='ctx'/>
       <parameter type-id='type-id-895' 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-893'>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-347'/>
+      <parameter type-id='type-id-346'/>
       <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='hello_ext_lib.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hello_ext_get_resumed_priv' mangled-name='_gnutls_hello_ext_get_resumed_priv' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hello_ext_get_priv' mangled-name='_gnutls_hello_ext_get_priv' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hello_ext_set_priv' mangled-name='_gnutls_hello_ext_set_priv' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ocsp-api.c' comp-dir-path='/home/nmavrogi/cvs/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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -11430,7 +11479,7 @@
       <parameter type-id='type-id-725' name='sc'/>
       <parameter type-id='type-id-57' name='resp_data'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-422' name='fmt'/>
+      <parameter type-id='type-id-421' 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'>
@@ -11442,57 +11491,57 @@
     <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-725' name='sc'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-165' name='ocsp_func'/>
-      <parameter type-id='type-id-102' name='ptr'/>
+      <parameter type-id='type-id-164' 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-725' name='sc'/>
-      <parameter type-id='type-id-165' name='ocsp_func'/>
-      <parameter type-id='type-id-102' name='ptr'/>
-      <return type-id='type-id-112'/>
-    </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-414' name='session'/>
-      <parameter type-id='type-id-276' name='response'/>
-      <return type-id='type-id-22'/>
+      <parameter type-id='type-id-164' 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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-276' name='response'/>
+      <parameter type-id='type-id-275' 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'/>
       <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-725' name='sc'/>
       <parameter type-id='type-id-27' name='response_file'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-422' name='fmt'/>
+      <parameter type-id='type-id-421' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_import2' mangled-name='gnutls_ocsp_resp_import2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='stek.c' comp-dir-path='/home/nmavrogi/cvs/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-237' name='session'/>
-      <parameter type-id='type-id-331' name='cb'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-330' 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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cert-cred-rawpk.c' comp-dir-path='/home/nmavrogi/cvs/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-725' name='cred'/>
       <parameter type-id='type-id-27' name='rawpkfile'/>
       <parameter type-id='type-id-27' name='privkeyfile'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-27' name='pass'/>
       <parameter type-id='type-id-10' name='key_usage'/>
-      <parameter type-id='type-id-427' name='names'/>
+      <parameter type-id='type-id-426' 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'/>
@@ -11502,56 +11551,119 @@
       <parameter type-id='type-id-725' name='cred'/>
       <parameter type-id='type-id-57' name='spki'/>
       <parameter type-id='type-id-57' name='pkey'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-27' name='pass'/>
       <parameter type-id='type-id-10' name='key_usage'/>
-      <parameter type-id='type-id-427' name='names'/>
+      <parameter type-id='type-id-426' 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'/>
     </function-decl>
     <function-decl name='_gnutls_read_key_file' mangled-name='_gnutls_read_key_file' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_url' mangled-name='gnutls_pubkey_import_url' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pcert_import_rawpk' mangled-name='gnutls_pcert_import_rawpk' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_read_key_mem' mangled-name='_gnutls_read_key_mem' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='iov.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='iov_iter_st' size-in-bits='896' is-struct='yes' visibility='default' id='type-id-896'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='iov' type-id='type-id-249' 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'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='iov_index' type-id='type-id-99' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='iov_offset' type-id='type-id-99' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='block' type-id='type-id-89' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='768'>
+        <var-decl name='block_size' type-id='type-id-99' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <var-decl name='block_offset' type-id='type-id-99' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-897'/>
+    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-898'/>
+    <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-897' name='iter'/>
+      <parameter type-id='type-id-898' 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-899'/>
+    <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-897' name='iter'/>
+      <parameter type-id='type-id-899' 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-897' name='iter'/>
+      <parameter type-id='type-id-249' 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/nmavrogi/cvs/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>
+    <function-decl name='_gnutls_gost_key_unwrap' mangled-name='_gnutls_gost_key_unwrap' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gost_key_wrap' mangled-name='_gnutls_gost_key_wrap' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_x509_write_value' mangled-name='_gnutls_x509_write_value' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </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'>
+      <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/nmavrogi/cvs/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-867' name='crt'/>
-      <parameter type-id='type-id-384' name='privkey'/>
+      <parameter type-id='type-id-383' name='privkey'/>
       <parameter type-id='type-id-27' name='label'/>
       <parameter type-id='type-id-850' name='cert_url'/>
       <parameter type-id='type-id-850' 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-896'/>
-    <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-897'/>
-    <typedef-decl name='gnutls_system_key_iter_t' type-id='type-id-897' id='type-id-898'/>
-    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-899'/>
+    <class-decl name='system_key_iter_st' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-900'/>
+    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-901'/>
+    <typedef-decl name='gnutls_system_key_iter_t' type-id='type-id-901' id='type-id-902'/>
+    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-903'/>
     <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-899' name='iter'/>
+      <parameter type-id='type-id-903' name='iter'/>
       <parameter type-id='type-id-10' name='cert_type'/>
       <parameter type-id='type-id-850' name='cert_url'/>
       <parameter type-id='type-id-850' name='key_url'/>
       <parameter type-id='type-id-850' name='label'/>
-      <parameter type-id='type-id-276' name='der'/>
+      <parameter type-id='type-id-275' 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-898' name='iter'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-902' 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'>
       <parameter type-id='type-id-27' name='cert_url'/>
@@ -11559,112 +11671,112 @@
       <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/certificate_request.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_get_selected_cert' mangled-name='_gnutls_get_selected_cert' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_sign_algorithm_parse_data' mangled-name='_gnutls_sign_algorithm_parse_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_tls_aid_to_sign_entry' mangled-name='_gnutls_tls_aid_to_sign_entry' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/certificate_verify.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_sign_algorithm_get_client' mangled-name='gnutls_sign_algorithm_get_client' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_get_auth_info_pcert' mangled-name='_gnutls_get_auth_info_pcert' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_handshake_verify_data' mangled-name='_gnutls13_handshake_verify_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13-sig.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/finished.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/key_update.c' comp-dir-path='/home/nmavrogi/cvs/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-237' name='session'/>
+      <parameter type-id='type-id-236' 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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/session_ticket.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_check_resumed_params' mangled-name='_gnutls_check_resumed_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_pop_prefix8' mangled-name='_gnutls_buffer_pop_prefix8' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_encrypt_session_ticket' mangled-name='_gnutls_encrypt_session_ticket' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_send_handshake2' mangled-name='_gnutls_send_handshake2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/certificate.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/early_data.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls13/post_handshake.c' comp-dir-path='/home/nmavrogi/cvs/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-414' name='session'/>
+      <parameter type-id='type-id-413' name='session'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls13_recv_certificate_request_int' mangled-name='_gnutls13_recv_certificate_request_int' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/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-900'>
+  <abi-instr version='1.0' address-size='64' path='tls13/psk_ext_parser.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='psk_ext_parser_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-904'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='identities_data' type-id='type-id-347' visibility='default'/>
+        <var-decl name='identities_data' type-id='type-id-346' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='identities_len' type-id='type-id-3' visibility='default'/>
+        <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-347' visibility='default'/>
+        <var-decl name='binders_data' type-id='type-id-346' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='binders_len' type-id='type-id-3' visibility='default'/>
+        <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-900' id='type-id-901'/>
-    <pointer-type-def type-id='type-id-901' size-in-bits='64' id='type-id-902'/>
+    <typedef-decl name='psk_ext_iter_st' type-id='type-id-904' id='type-id-905'/>
+    <pointer-type-def type-id='type-id-905' size-in-bits='64' id='type-id-906'/>
     <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-902' name='iter'/>
-      <parameter type-id='type-id-276' name='binder'/>
+      <parameter type-id='type-id-906' name='iter'/>
+      <parameter type-id='type-id-275' 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-903'>
+    <class-decl name='psk_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-907'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='identity' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -11672,96 +11784,96 @@
         <var-decl name='ob_ticket_age' type-id='type-id-18' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-903' size-in-bits='64' id='type-id-904'/>
+    <pointer-type-def type-id='type-id-907' size-in-bits='64' id='type-id-908'/>
     <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-902' name='iter'/>
-      <parameter type-id='type-id-904' name='psk'/>
+      <parameter type-id='type-id-906' name='iter'/>
+      <parameter type-id='type-id-908' name='psk'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <typedef-decl name='psk_ext_parser_st' type-id='type-id-900' id='type-id-905'/>
-    <pointer-type-def type-id='type-id-905' size-in-bits='64' id='type-id-906'/>
+    <typedef-decl name='psk_ext_parser_st' type-id='type-id-904' id='type-id-909'/>
+    <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-910'/>
     <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-906' name='p'/>
-      <parameter type-id='type-id-347' name='data'/>
-      <parameter type-id='type-id-100' name='_len'/>
+      <parameter type-id='type-id-910' name='p'/>
+      <parameter type-id='type-id-346' 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/nmavrogi/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-304'>
+  <abi-instr version='1.0' address-size='64' path='tls13/anti_replay.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_anti_replay_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-303'>
       <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-169' visibility='default'/>
+        <var-decl name='start_time' type-id='type-id-168' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='db_add_func' type-id='type-id-907' visibility='default'/>
+        <var-decl name='db_add_func' type-id='type-id-911' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='db_ptr' type-id='type-id-102' visibility='default'/>
+        <var-decl name='db_ptr' type-id='type-id-101' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-909'/>
-    <typedef-decl name='gnutls_db_add_func' type-id='type-id-909' id='type-id-907'/>
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-913'/>
+    <typedef-decl name='gnutls_db_add_func' type-id='type-id-913' id='type-id-911'/>
     <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-182' name='anti_replay'/>
-      <parameter type-id='type-id-907' name='add_func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-181' name='anti_replay'/>
+      <parameter type-id='type-id-911' 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-182' name='anti_replay'/>
-      <parameter type-id='type-id-102' name='ptr'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-181' 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-182' name='anti_replay'/>
+      <parameter type-id='type-id-181' 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-276' name='id'/>
+      <parameter type-id='type-id-275' 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-237' name='session'/>
-      <parameter type-id='type-id-182' name='anti_replay'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-181' 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-182' name='anti_replay'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-181' 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-182' name='anti_replay'/>
+      <parameter type-id='type-id-181' name='anti_replay'/>
       <parameter type-id='type-id-10' name='window'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-910'/>
+    <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-914'/>
     <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-910' name='anti_replay'/>
+      <parameter type-id='type-id-914' name='anti_replay'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-908'>
-      <parameter type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-912'>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-57'/>
       <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='pkcs11.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-911'/>
-    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-912'/>
-    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-914'/>
-    <typedef-decl name='gnutls_pkcs11_token_callback_t' type-id='type-id-914' id='type-id-915'/>
-    <var-decl name='_gnutls_token_func' type-id='type-id-915' visibility='default'/>
-    <var-decl name='_gnutls_token_data' type-id='type-id-102' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='pkcs11.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-101' const='yes' id='type-id-915'/>
+    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-916'/>
+    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-918'/>
+    <typedef-decl name='gnutls_pkcs11_token_callback_t' type-id='type-id-918' id='type-id-919'/>
+    <var-decl name='_gnutls_token_func' type-id='type-id-919' 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-377'/>
+      <return type-id='type-id-376'/>
     </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-773' name='obj'/>
-      <parameter type-id='type-id-420' name='oflags'/>
+      <parameter type-id='type-id-419' 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'>
@@ -11774,24 +11886,24 @@
       <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-276' name='issuer'/>
-      <parameter type-id='type-id-422' name='fmt'/>
+      <parameter type-id='type-id-275' name='issuer'/>
+      <parameter type-id='type-id-421' 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-276' name='issuer'/>
-      <parameter type-id='type-id-422' name='fmt'/>
+      <parameter type-id='type-id-275' name='issuer'/>
+      <parameter type-id='type-id-421' 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-276' name='issuer'/>
-      <parameter type-id='type-id-422' name='fmt'/>
+      <parameter type-id='type-id-275' name='issuer'/>
+      <parameter type-id='type-id-421' name='fmt'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -11802,7 +11914,7 @@
     <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'>
       <parameter type-id='type-id-27' name='url'/>
       <parameter type-id='type-id-38' name='mechanism'/>
-      <parameter type-id='type-id-102' name='ptr'/>
+      <parameter type-id='type-id-101' name='ptr'/>
       <parameter type-id='type-id-10' name='psize'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-10'/>
@@ -11815,15 +11927,15 @@
     </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-420' name='flags'/>
+      <parameter type-id='type-id-419' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-916'/>
-    <qualified-type-def type-id='type-id-916' const='yes' id='type-id-917'/>
+    <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-920'/>
+    <qualified-type-def type-id='type-id-920' const='yes' id='type-id-921'/>
     <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-10' name='cert_max'/>
-      <parameter type-id='type-id-917' name='objs'/>
+      <parameter type-id='type-id-921' name='objs'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -11833,8 +11945,8 @@
       <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-916' name='p_list'/>
-      <parameter type-id='type-id-420' name='n_list'/>
+      <parameter type-id='type-id-920' name='p_list'/>
+      <parameter type-id='type-id-419' 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'/>
@@ -11843,27 +11955,27 @@
       <parameter type-id='type-id-773' name='obj'/>
       <return type-id='type-id-768'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-918'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-922'>
       <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-918' id='type-id-919'/>
+    <typedef-decl name='gnutls_pkcs11_url_type_t' type-id='type-id-922' id='type-id-923'/>
     <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-773' name='obj'/>
-      <parameter type-id='type-id-919' name='detailed'/>
+      <parameter type-id='type-id-923' name='detailed'/>
       <parameter type-id='type-id-850' 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-431' name='ptr'/>
+      <parameter type-id='type-id-430' name='ptr'/>
       <parameter type-id='type-id-626' 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-920'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-924'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PKCS11_TOKEN_LABEL' value='0'/>
       <enumerator name='GNUTLS_PKCS11_TOKEN_SERIAL' value='1'/>
@@ -11871,72 +11983,72 @@
       <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-920' id='type-id-921'/>
+    <typedef-decl name='gnutls_pkcs11_token_info_t' type-id='type-id-924' id='type-id-925'/>
     <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-921' name='ttype'/>
-      <parameter type-id='type-id-102' name='output'/>
-      <parameter type-id='type-id-423' name='output_size'/>
+      <parameter type-id='type-id-925' name='ttype'/>
+      <parameter type-id='type-id-101' name='output'/>
+      <parameter type-id='type-id-422' 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-919' name='detailed'/>
+      <parameter type-id='type-id-923' name='detailed'/>
       <parameter type-id='type-id-850' 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-919' name='detailed'/>
+      <parameter type-id='type-id-923' name='detailed'/>
       <parameter type-id='type-id-850' 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-773' name='obj'/>
-      <parameter type-id='type-id-422' name='fmt'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-421' name='fmt'/>
+      <parameter type-id='type-id-275' 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-773' name='obj'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-275' 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-773' name='obj'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-773' name='obj'/>
-      <return type-id='type-id-112'/>
+      <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-773' name='obj'/>
-      <parameter type-id='type-id-376' name='fn'/>
-      <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-375' 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-915' name='fn'/>
-      <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-919' name='fn'/>
+      <parameter type-id='type-id-101' name='userdata'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_reinit' mangled-name='gnutls_pkcs11_reinit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_reinit@@GNUTLS_3_4'>
       <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-773' name='obj'/>
-      <parameter type-id='type-id-431' name='ptr'/>
-      <parameter type-id='type-id-431' name='session'/>
-      <parameter type-id='type-id-431' name='ohandle'/>
+      <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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-922'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-926'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_ID_HEX' value='1'/>
       <enumerator name='GNUTLS_PKCS11_OBJ_LABEL' value='2'/>
@@ -11949,19 +12061,19 @@
       <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-922' id='type-id-923'/>
+    <typedef-decl name='gnutls_pkcs11_obj_info_t' type-id='type-id-926' id='type-id-927'/>
     <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-773' name='obj'/>
-      <parameter type-id='type-id-923' name='itype'/>
-      <parameter type-id='type-id-102' name='output'/>
-      <parameter type-id='type-id-423' name='output_size'/>
+      <parameter type-id='type-id-927' name='itype'/>
+      <parameter type-id='type-id-101' name='output'/>
+      <parameter type-id='type-id-422' 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-773' name='obj'/>
-      <parameter type-id='type-id-923' name='itype'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <parameter type-id='type-id-927' 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -11976,7 +12088,7 @@
       <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-916' name='obj'/>
+      <parameter type-id='type-id-920' 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'>
@@ -11985,193 +12097,193 @@
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-924'/>
+    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-928'/>
     <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-924' name='p_list'/>
-      <parameter type-id='type-id-420' name='n_list'/>
+      <parameter type-id='type-id-928' name='p_list'/>
+      <parameter type-id='type-id-419' 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_x509_crt_get_serial' mangled-name='gnutls_x509_crt_get_serial' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_ext_gen_number' mangled-name='_gnutls_x509_ext_gen_number' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_uri_free' mangled-name='p11_kit_uri_free' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_get_attribute_avalue' mangled-name='pkcs11_get_attribute_avalue' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_override_cert_exts' mangled-name='pkcs11_override_cert_exts' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_equals' mangled-name='gnutls_x509_crt_equals' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_check_if_same_key' mangled-name='_gnutls_check_if_same_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_check_valid_key_id' mangled-name='_gnutls_check_valid_key_id' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_find_objects_init' mangled-name='pkcs11_find_objects_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_find_objects' mangled-name='pkcs11_find_objects' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_find_objects_final' mangled-name='pkcs11_find_objects_final' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_get_mechanism_info' mangled-name='pkcs11_get_mechanism_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_get_mechanism_list' mangled-name='pkcs11_get_mechanism_list' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_uri_match_token_info' mangled-name='p11_kit_uri_match_token_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_uri_match_module_info' mangled-name='p11_kit_uri_match_module_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_module_get_flags' mangled-name='p11_kit_module_get_flags' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_get_attribute_value' mangled-name='pkcs11_get_attribute_value' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_uri_get_attribute' mangled-name='p11_kit_uri_get_attribute' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_uri_get_token_info' mangled-name='p11_kit_uri_get_token_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_space_strdup' mangled-name='p11_kit_space_strdup' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_uri_new' mangled-name='p11_kit_uri_new' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_pin_request' mangled-name='p11_kit_pin_request' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_pin_new_for_string' mangled-name='p11_kit_pin_new_for_string' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_uri_get_pin_value' mangled-name='p11_kit_uri_get_pin_value' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_uri_get_pin_source' mangled-name='p11_kit_uri_get_pin_source' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_space_strlen' mangled-name='p11_kit_space_strlen' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_uri_set_attribute' mangled-name='p11_kit_uri_set_attribute' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_uri_get_module_info' mangled-name='p11_kit_uri_get_module_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_close_session' mangled-name='pkcs11_close_session' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_get_token_info' mangled-name='pkcs11_get_token_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_get_slot_info' mangled-name='pkcs11_get_slot_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pubkey_import_pkcs11' mangled-name='gnutls_pubkey_import_pkcs11' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pem_base64_encode2' mangled-name='gnutls_pem_base64_encode2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_uri_format' mangled-name='p11_kit_uri_format' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_uri_parse' mangled-name='p11_kit_uri_parse' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_module_release' mangled-name='p11_kit_module_release' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_module_finalize' mangled-name='p11_kit_module_finalize' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_pin_unregister_callback' mangled-name='p11_kit_pin_unregister_callback' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_module_initialize' mangled-name='p11_kit_module_initialize' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_strerror' mangled-name='p11_kit_strerror' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_modules_load_and_initialize' mangled-name='p11_kit_modules_load_and_initialize' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_module_get_name' mangled-name='p11_kit_module_get_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_message' mangled-name='p11_kit_message' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='fgets' mangled-name='fgets' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_set_attribute_value' mangled-name='pkcs11_set_attribute_value' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_module_load' mangled-name='p11_kit_module_load' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_get_module_info' mangled-name='pkcs11_get_module_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_config_option' mangled-name='p11_kit_config_option' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_get_slot_list' mangled-name='pkcs11_get_slot_list' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_pin_register_callback' mangled-name='p11_kit_pin_register_callback' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_pin_get_length' mangled-name='p11_kit_pin_get_length' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_pin_get_value' mangled-name='p11_kit_pin_get_value' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-913'>
-      <parameter type-id='type-id-911'/>
-      <parameter type-id='type-id-912'/>
+    <function-type size-in-bits='64' id='type-id-917'>
+      <parameter type-id='type-id-915'/>
+      <parameter type-id='type-id-916'/>
       <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/nmavrogi/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-925'>
+  <abi-instr version='1.0' address-size='64' path='pkcs11x.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_x509_ext_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-929'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='oid' type-id='type-id-377' visibility='default'/>
+        <var-decl name='oid' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='critical' type-id='type-id-10' visibility='default'/>
@@ -12180,49 +12292,49 @@
         <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-925' id='type-id-926'/>
-    <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-927'/>
-    <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-928'/>
+    <typedef-decl name='gnutls_x509_ext_st' type-id='type-id-929' id='type-id-930'/>
+    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-931'/>
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-932'/>
     <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-773' name='obj'/>
-      <parameter type-id='type-id-928' name='exts'/>
-      <parameter type-id='type-id-420' name='exts_size'/>
+      <parameter type-id='type-id-932' name='exts'/>
+      <parameter type-id='type-id-419' name='exts_size'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs11_check_init' mangled-name='_gnutls_pkcs11_check_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_obj_flags_to_int' mangled-name='pkcs11_obj_flags_to_int' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_pkcs11_traverse_tokens' mangled-name='_pkcs11_traverse_tokens' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_rv_to_err' mangled-name='pkcs11_rv_to_err' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_decode_ext' mangled-name='_gnutls_x509_decode_ext' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crt_set_extension' mangled-name='_gnutls_x509_crt_set_extension' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_deinit' mangled-name='gnutls_x509_ext_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs11_privkey.c' comp-dir-path='/home/nmavrogi/cvs/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-385' name='key'/>
-      <parameter type-id='type-id-376' name='fn'/>
-      <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-375' 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-385' name='pkey'/>
-      <parameter type-id='type-id-422' name='fmt'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <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-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -12232,47 +12344,47 @@
       <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-422' name='fmt'/>
-      <parameter type-id='type-id-276' name='pubkey'/>
+      <parameter type-id='type-id-421' name='fmt'/>
+      <parameter type-id='type-id-275' 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-385' name='key'/>
-      <parameter type-id='type-id-919' name='detailed'/>
+      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-923' name='detailed'/>
       <parameter type-id='type-id-850' 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-385' name='pkey'/>
+      <parameter type-id='type-id-384' 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-385' name='key'/>
+      <parameter type-id='type-id-384' 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-385' name='pkey'/>
-      <parameter type-id='type-id-923' name='itype'/>
-      <parameter type-id='type-id-102' name='output'/>
-      <parameter type-id='type-id-423' name='output_size'/>
+      <parameter type-id='type-id-384' name='pkey'/>
+      <parameter type-id='type-id-927' name='itype'/>
+      <parameter type-id='type-id-101' name='output'/>
+      <parameter type-id='type-id-422' 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-385' name='key'/>
-      <parameter type-id='type-id-420' name='bits'/>
+      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-419' 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-385' name='key'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-384' 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-385' name='dst'/>
-      <parameter type-id='type-id-385' name='src'/>
+      <parameter type-id='type-id-384' name='dst'/>
+      <parameter type-id='type-id-384' 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'>
@@ -12280,68 +12392,68 @@
       <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_read_pubkey' mangled-name='pkcs11_read_pubkey' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_generate_key' mangled-name='pkcs11_generate_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_strerror' mangled-name='pkcs11_strerror' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_url_to_info' mangled-name='pkcs11_url_to_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_open_session' mangled-name='pkcs11_open_session' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_generate_key_pair' mangled-name='pkcs11_generate_key_pair' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ecc_bits_to_curve' mangled-name='_gnutls_ecc_bits_to_curve' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_info_to_url' mangled-name='pkcs11_info_to_url' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_decrypt_init' mangled-name='pkcs11_decrypt_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_login' mangled-name='pkcs11_login' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_decrypt' mangled-name='pkcs11_decrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_call_token_func' mangled-name='pkcs11_call_token_func' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_sign_init' mangled-name='pkcs11_sign_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_sign' mangled-name='pkcs11_sign' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_get_info' mangled-name='pkcs11_get_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='p11_kit_uri_get_attributes' mangled-name='p11_kit_uri_get_attributes' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs11_write.c' comp-dir-path='/home/nmavrogi/cvs/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-102' name='rnddata'/>
-      <parameter type-id='type-id-100' name='len'/>
+      <parameter type-id='type-id-101' name='rnddata'/>
+      <parameter type-id='type-id-99' name='len'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_token_set_pin' mangled-name='gnutls_pkcs11_token_set_pin' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_pkcs11_token_set_pin@@GNUTLS_3_4'>
@@ -12364,7 +12476,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-384' name='key'/>
+      <parameter type-id='type-id-383' 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'/>
@@ -12374,14 +12486,14 @@
     <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-276' name='data'/>
+      <parameter type-id='type-id-275' 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-268' name='pubkey'/>
+      <parameter type-id='type-id-267' 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'/>
@@ -12397,99 +12509,102 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs11_get_random' mangled-name='_gnutls_pkcs11_get_random' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_retrieve_pin' mangled-name='pkcs11_retrieve_pin' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_set_pin' mangled-name='pkcs11_set_pin' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_init_pin' mangled-name='pkcs11_init_pin' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_find_slot' mangled-name='pkcs11_find_slot' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_init_token' mangled-name='pkcs11_init_token' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_destroy_object' mangled-name='pkcs11_destroy_object' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pkcs11_create_object' mangled-name='pkcs11_create_object' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='x509_crt_to_raw_pubkey' mangled-name='x509_crt_to_raw_pubkey' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </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'>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_export' mangled-name='gnutls_x509_crt_export' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs11_secret.c' comp-dir-path='/home/nmavrogi/cvs/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-276' name='key'/>
+      <parameter type-id='type-id-275' 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/nmavrogi/cvs/gnutls-mine/lib' language='LANG_C99'>
-    <class-decl name='gnutls_srp_server_credentials_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-929'>
+  <abi-instr version='1.0' address-size='64' path='srp.c' comp-dir-path='/home/nmavrogi/cvs/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-933'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='password_file' type-id='type-id-377' visibility='default'/>
+        <var-decl name='password_file' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='password_conf_file' type-id='type-id-377' visibility='default'/>
+        <var-decl name='password_conf_file' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='pwd_callback' type-id='type-id-930' visibility='default'/>
+        <var-decl name='pwd_callback' type-id='type-id-934' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='fake_salt_seed' type-id='type-id-62' visibility='default'/>
+        <var-decl name='fake_salt_seed' type-id='type-id-490' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='fake_salt_seed_size' type-id='type-id-10' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='736'>
         <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-931' id='type-id-932'/>
-    <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-930'/>
-    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-933'/>
-    <typedef-decl name='gnutls_srp_server_credentials_t' type-id='type-id-933' id='type-id-934'/>
+    <typedef-decl name='gnutls_srp_server_credentials_function' type-id='type-id-935' id='type-id-936'/>
+    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-934'/>
+    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-937'/>
+    <typedef-decl name='gnutls_srp_server_credentials_t' type-id='type-id-937' id='type-id-938'/>
     <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-934' name='cred'/>
+      <parameter type-id='type-id-938' name='cred'/>
       <parameter type-id='type-id-57' name='seed'/>
       <parameter type-id='type-id-10' name='salt_length'/>
-      <return type-id='type-id-112'/>
+      <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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-10' name='mtu'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_srp_verifier' mangled-name='gnutls_srp_verifier' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_srp_verifier@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='username'/>
@@ -12497,140 +12612,140 @@
       <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-276' name='res'/>
+      <parameter type-id='type-id-275' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-935'>
+    <class-decl name='gnutls_srp_client_credentials_st' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-939'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='username' type-id='type-id-377' visibility='default'/>
+        <var-decl name='username' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='password' type-id='type-id-377' visibility='default'/>
+        <var-decl name='password' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='get_function' type-id='type-id-936' visibility='default'/>
+        <var-decl name='get_function' type-id='type-id-940' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_srp_client_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_client_credentials_t' type-id='type-id-939' id='type-id-940'/>
+    <typedef-decl name='gnutls_srp_client_credentials_function' type-id='type-id-941' id='type-id-942'/>
+    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-940'/>
+    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-943'/>
+    <typedef-decl name='gnutls_srp_client_credentials_t' type-id='type-id-943' id='type-id-944'/>
     <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-940' name='cred'/>
-      <parameter type-id='type-id-936' name='func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-944' name='cred'/>
+      <parameter type-id='type-id-940' 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-934' name='cred'/>
-      <parameter type-id='type-id-930' name='func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-938' name='cred'/>
+      <parameter type-id='type-id-934' 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-934' name='res'/>
+      <parameter type-id='type-id-938' 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-934' size-in-bits='64' id='type-id-941'/>
+    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-945'/>
     <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-941' name='sc'/>
+      <parameter type-id='type-id-945' 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-934' name='sc'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-938' 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-940' name='res'/>
+      <parameter type-id='type-id-944' 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-940' size-in-bits='64' id='type-id-942'/>
+    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-946'/>
     <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-942' name='sc'/>
+      <parameter type-id='type-id-946' 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-940' name='sc'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-944' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-937'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-941'>
+      <parameter type-id='type-id-236'/>
       <parameter type-id='type-id-850'/>
       <parameter type-id='type-id-850'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-931'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-935'>
+      <parameter type-id='type-id-236'/>
       <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-276'/>
-      <parameter type-id='type-id-276'/>
-      <parameter type-id='type-id-276'/>
-      <parameter type-id='type-id-276'/>
+      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-275'/>
       <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/nmavrogi/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-943'>
+  <abi-instr version='1.0' address-size='64' path='psk.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib' language='LANG_C99'>
+    <class-decl name='gnutls_psk_server_credentials_st' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-947'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='password_file' type-id='type-id-377' visibility='default'/>
+        <var-decl name='password_file' type-id='type-id-376' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='pwd_callback' type-id='type-id-944' visibility='default'/>
+        <var-decl name='pwd_callback' type-id='type-id-948' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='dh_params' type-id='type-id-419' visibility='default'/>
+        <var-decl name='dh_params' type-id='type-id-418' 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-203' visibility='default'/>
+        <var-decl name='dh_sec_param' type-id='type-id-202' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='params_func' type-id='type-id-434' visibility='default'/>
+        <var-decl name='params_func' type-id='type-id-433' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='hint' type-id='type-id-377' visibility='default'/>
+        <var-decl name='hint' type-id='type-id-376' 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_server_credentials_function' type-id='type-id-945' id='type-id-946'/>
-    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-944'/>
-    <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-947'/>
-    <typedef-decl name='gnutls_psk_server_credentials_t' type-id='type-id-947' id='type-id-948'/>
+    <typedef-decl name='gnutls_psk_server_credentials_function' type-id='type-id-949' id='type-id-950'/>
+    <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-948'/>
+    <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-951'/>
+    <typedef-decl name='gnutls_psk_server_credentials_t' type-id='type-id-951' id='type-id-952'/>
     <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-948' name='res'/>
-      <parameter type-id='type-id-203' name='sec_param'/>
+      <parameter type-id='type-id-952' name='res'/>
+      <parameter type-id='type-id-202' 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-948' name='res'/>
-      <parameter type-id='type-id-419' name='dh_params'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-952' name='res'/>
+      <parameter type-id='type-id-418' 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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <return type-id='type-id-27'/>
     </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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-949'>
+    <class-decl name='gnutls_psk_client_credentials_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-953'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='username' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -12638,129 +12753,129 @@
         <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-950' visibility='default'/>
+        <var-decl name='get_function' type-id='type-id-954' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <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-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_client_credentials_t' type-id='type-id-953' id='type-id-954'/>
+    <typedef-decl name='gnutls_psk_client_credentials_function' type-id='type-id-955' id='type-id-956'/>
+    <pointer-type-def type-id='type-id-956' size-in-bits='64' id='type-id-954'/>
+    <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-957'/>
+    <typedef-decl name='gnutls_psk_client_credentials_t' type-id='type-id-957' id='type-id-958'/>
     <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-954' name='cred'/>
-      <parameter type-id='type-id-950' name='func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-958' 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_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-948' name='cred'/>
-      <parameter type-id='type-id-944' name='func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-952' name='cred'/>
+      <parameter type-id='type-id-948' 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-948' name='res'/>
+      <parameter type-id='type-id-952' 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-948' name='res'/>
+      <parameter type-id='type-id-952' 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-948' size-in-bits='64' id='type-id-955'/>
+    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-959'/>
     <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-955' name='sc'/>
+      <parameter type-id='type-id-959' 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-948' name='sc'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-952' name='sc'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <enum-decl name='gnutls_psk_key_flags' id='type-id-956'>
+    <enum-decl name='gnutls_psk_key_flags' id='type-id-960'>
       <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-956' id='type-id-957'/>
+    <typedef-decl name='gnutls_psk_key_flags' type-id='type-id-960' id='type-id-961'/>
     <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-954' name='res'/>
+      <parameter type-id='type-id-958' name='res'/>
       <parameter type-id='type-id-27' name='username'/>
       <parameter type-id='type-id-57' name='key'/>
-      <parameter type-id='type-id-957' name='flags'/>
+      <parameter type-id='type-id-961' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-954' size-in-bits='64' id='type-id-958'/>
+    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-962'/>
     <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-958' name='sc'/>
+      <parameter type-id='type-id-962' 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-954' name='sc'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-958' 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-948' name='res'/>
-      <parameter type-id='type-id-434' name='func'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-952' name='res'/>
+      <parameter type-id='type-id-433' name='func'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-951'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-955'>
+      <parameter type-id='type-id-236'/>
       <parameter type-id='type-id-850'/>
-      <parameter type-id='type-id-276'/>
+      <parameter type-id='type-id-275'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-945'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-949'>
+      <parameter type-id='type-id-236'/>
       <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-276'/>
+      <parameter type-id='type-id-275'/>
       <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/nmavrogi/cvs/gnutls-mine/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='read-file.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__fxstat' mangled-name='__fxstat' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='fileno' mangled-name='fileno' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='realloc' mangled-name='realloc' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='fread' mangled-name='fread' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='asnprintf.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/gl' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='vasnprintf.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='printf_fetchargs' mangled-name='printf_fetchargs' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='common.c' comp-dir-path='/home/nmavrogi/cvs/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-316'/>
+      <return type-id='type-id-315'/>
     </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-316' name='param'/>
+      <parameter type-id='type-id-315' 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-316' name='param'/>
+      <parameter type-id='type-id-315' 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'>
@@ -12773,89 +12888,83 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='asn1_der_decoding_startEnd' mangled-name='asn1_der_decoding_startEnd' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_read_rsa_pss_params' mangled-name='_gnutls_x509_read_rsa_pss_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_oid_to_sign' mangled-name='gnutls_oid_to_sign' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_oid_to_pk_and_curve' mangled-name='_gnutls_oid_to_pk_and_curve' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pk_get_oid' mangled-name='gnutls_pk_get_oid' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_write_pubkey_params' mangled-name='_gnutls_x509_write_pubkey_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_write_pubkey' mangled-name='_gnutls_x509_write_pubkey' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_encode_simple_der' mangled-name='asn1_encode_simple_der' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_read_value_type' mangled-name='asn1_read_value_type' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_decode_simple_ber' mangled-name='asn1_decode_simple_ber' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_decode_simple_der' mangled-name='asn1_decode_simple_der' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hex_encode' mangled-name='gnutls_hex_encode' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ucs2_to_utf8' mangled-name='_gnutls_ucs2_to_utf8' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='key_encode.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_write_key_int_le' mangled-name='_gnutls_x509_write_key_int_le' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_ecc_curve_get_oid' mangled-name='gnutls_ecc_curve_get_oid' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ecc_ansi_x962_export' mangled-name='_gnutls_ecc_ansi_x962_export' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_write_key_int' mangled-name='_gnutls_x509_write_key_int' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pk_params_clear' mangled-name='gnutls_pk_params_clear' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_digest_get_oid' mangled-name='gnutls_digest_get_oid' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_length_der' mangled-name='asn1_length_der' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </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'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='key_decode.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_read_der_int' mangled-name='_gnutls_x509_read_der_int' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_oid_to_ecc_curve' mangled-name='gnutls_oid_to_ecc_curve' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='time.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -12865,117 +12974,117 @@
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='gmtime_r' mangled-name='gmtime_r' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='strftime' mangled-name='strftime' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crl.c' comp-dir-path='/home/nmavrogi/cvs/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-729' name='crls'/>
-      <parameter type-id='type-id-420' name='crl_max'/>
+      <parameter type-id='type-id-419' name='crl_max'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-729' size-in-bits='64' id='type-id-959'/>
+    <pointer-type-def type-id='type-id-729' size-in-bits='64' id='type-id-963'/>
     <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-959' name='crls'/>
-      <parameter type-id='type-id-420' name='size'/>
+      <parameter type-id='type-id-963' name='crls'/>
+      <parameter type-id='type-id-419' name='size'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-728' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-423' name='sizeof_data'/>
+      <parameter type-id='type-id-101' name='data'/>
+      <parameter type-id='type-id-422' 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-728' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-423' name='sizeof_oid'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-728' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-423' name='sizeof_oid'/>
+      <parameter type-id='type-id-101' name='oid'/>
+      <parameter type-id='type-id-422' 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-728' name='crl'/>
-      <parameter type-id='type-id-102' name='ret'/>
-      <parameter type-id='type-id-423' name='ret_size'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-728' name='crl'/>
-      <parameter type-id='type-id-102' name='id'/>
-      <parameter type-id='type-id-423' name='id_size'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-728' name='crl'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-102' name='alt'/>
-      <parameter type-id='type-id-423' name='alt_size'/>
-      <parameter type-id='type-id-420' name='alt_type'/>
-      <parameter type-id='type-id-102' name='serial'/>
-      <parameter type-id='type-id-423' name='serial_size'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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-101' name='serial'/>
+      <parameter type-id='type-id-422' name='serial_size'/>
+      <parameter type-id='type-id-419' 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-728' name='crl'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-728' name='crl'/>
-      <parameter type-id='type-id-276' name='dn'/>
+      <parameter type-id='type-id-275' 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-960'>
+    <class-decl name='gnutls_x509_crl_iter' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-964'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='rcache' type-id='type-id-388' visibility='default'/>
+        <var-decl name='rcache' type-id='type-id-387' 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-960' size-in-bits='64' id='type-id-961'/>
-    <typedef-decl name='gnutls_x509_crl_iter_t' type-id='type-id-961' id='type-id-962'/>
-    <pointer-type-def type-id='type-id-962' size-in-bits='64' id='type-id-963'/>
+    <pointer-type-def type-id='type-id-964' size-in-bits='64' id='type-id-965'/>
+    <typedef-decl name='gnutls_x509_crl_iter_t' type-id='type-id-965' id='type-id-966'/>
+    <pointer-type-def type-id='type-id-966' size-in-bits='64' id='type-id-967'/>
     <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-728' name='crl'/>
-      <parameter type-id='type-id-963' name='iter'/>
+      <parameter type-id='type-id-967' name='iter'/>
       <parameter type-id='type-id-64' name='serial'/>
-      <parameter type-id='type-id-423' name='serial_size'/>
+      <parameter type-id='type-id-422' name='serial_size'/>
       <parameter type-id='type-id-514' 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-962' name='iter'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-966' 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-728' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-64' name='serial'/>
-      <parameter type-id='type-id-423' name='serial_size'/>
+      <parameter type-id='type-id-422' name='serial_size'/>
       <parameter type-id='type-id-514' name='t'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -12997,14 +13106,14 @@
     </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-728' name='crl'/>
-      <parameter type-id='type-id-377' name='sig'/>
-      <parameter type-id='type-id-423' name='sizeof_sig'/>
+      <parameter type-id='type-id-376' name='sig'/>
+      <parameter type-id='type-id-422' 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-728' name='crl'/>
-      <parameter type-id='type-id-377' name='oid'/>
-      <parameter type-id='type-id-423' name='oid_size'/>
+      <parameter type-id='type-id-376' name='oid'/>
+      <parameter type-id='type-id-422' 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'>
@@ -13013,20 +13122,20 @@
     </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-728' name='crl'/>
-      <parameter type-id='type-id-276' name='dn'/>
+      <parameter type-id='type-id-275' 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-728' name='crl'/>
-      <parameter type-id='type-id-276' name='dn'/>
+      <parameter type-id='type-id-275' 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-728' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-423' name='sizeof_oid'/>
+      <parameter type-id='type-id-101' name='oid'/>
+      <parameter type-id='type-id-422' 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'>
@@ -13034,25 +13143,25 @@
       <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-102' name='buf'/>
-      <parameter type-id='type-id-423' name='sizeof_buf'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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-728' name='crl'/>
-      <parameter type-id='type-id-377' name='buf'/>
-      <parameter type-id='type-id-423' name='sizeof_buf'/>
+      <parameter type-id='type-id-376' name='buf'/>
+      <parameter type-id='type-id-422' 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-728' name='crl'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-728' name='crl'/>
-      <return type-id='type-id-112'/>
+      <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-729' name='crl'/>
@@ -13060,75 +13169,75 @@
     </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-728' name='crl'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-275' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crl_get_extension' mangled-name='_gnutls_x509_crl_get_extension' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_ext_extract_number' mangled-name='_gnutls_x509_ext_extract_number' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_parse_general_name' mangled-name='_gnutls_parse_general_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_find_node' mangled-name='asn1_find_node' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_get_time' mangled-name='_gnutls_x509_get_time' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_number_of_elements' mangled-name='asn1_number_of_elements' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_copy_string' mangled-name='_gnutls_copy_string' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_get_signature_algorithm' mangled-name='_gnutls_x509_get_signature_algorithm' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_get_dn' mangled-name='_gnutls_x509_get_dn' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_get_dn_oid' mangled-name='_gnutls_x509_get_dn_oid' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_parse_dn_oid' mangled-name='_gnutls_x509_parse_dn_oid' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_strdatum_to_buf' mangled-name='_gnutls_strdatum_to_buf' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_parse_dn' mangled-name='_gnutls_x509_parse_dn' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_get_raw_field2' mangled-name='_gnutls_x509_get_raw_field2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crl_write.c' comp-dir-path='/home/nmavrogi/cvs/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-728' name='crl'/>
       <parameter type-id='type-id-467' name='issuer'/>
-      <parameter type-id='type-id-402' name='issuer_key'/>
-      <parameter type-id='type-id-212' name='dig'/>
+      <parameter type-id='type-id-401' name='issuer_key'/>
+      <parameter type-id='type-id-211' 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-728' name='crl'/>
-      <parameter type-id='type-id-102' name='nr'/>
-      <parameter type-id='type-id-100' name='nr_size'/>
+      <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-728' name='crl'/>
-      <parameter type-id='type-id-102' name='nr'/>
-      <parameter type-id='type-id-100' name='nr_size'/>
+      <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'>
@@ -13139,8 +13248,8 @@
     </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-728' name='crl'/>
-      <parameter type-id='type-id-102' name='serial'/>
-      <parameter type-id='type-id-100' name='serial_size'/>
+      <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>
@@ -13157,14 +13266,14 @@
     <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-728' name='crl'/>
       <parameter type-id='type-id-467' name='issuer'/>
-      <parameter type-id='type-id-384' name='issuer_key'/>
+      <parameter type-id='type-id-383' 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-728' name='crl'/>
       <parameter type-id='type-id-467' name='issuer'/>
-      <parameter type-id='type-id-384' name='issuer_key'/>
-      <parameter type-id='type-id-212' name='dig'/>
+      <parameter type-id='type-id-383' name='issuer_key'/>
+      <parameter type-id='type-id-211' name='dig'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -13174,22 +13283,22 @@
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_x509_pkix_sign' mangled-name='_gnutls_x509_pkix_sign' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crl_set_extension' mangled-name='_gnutls_x509_crl_set_extension' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_ext_gen_auth_key_id' mangled-name='_gnutls_x509_ext_gen_auth_key_id' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_set_time' mangled-name='_gnutls_x509_set_time' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='crq.c' comp-dir-path='/home/nmavrogi/cvs/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-766' name='crq'/>
       <parameter type-id='type-id-756' name='spki'/>
@@ -13199,36 +13308,36 @@
     <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-766' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
-      <parameter type-id='type-id-102' name='buf'/>
-      <parameter type-id='type-id-100' name='sizeof_buf'/>
+      <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-964'>
+    <class-decl name='gnutls_x509_tlsfeatures_st' size-in-bits='544' is-struct='yes' visibility='default' id='type-id-968'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='feature' type-id='type-id-965' visibility='default'/>
+        <var-decl name='feature' type-id='type-id-969' 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-965'>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='512' id='type-id-969'>
       <subrange length='32' type-id='type-id-38' id='type-id-51'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-964' size-in-bits='64' id='type-id-966'/>
-    <typedef-decl name='gnutls_x509_tlsfeatures_t' type-id='type-id-966' id='type-id-967'/>
+    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-970'/>
+    <typedef-decl name='gnutls_x509_tlsfeatures_t' type-id='type-id-970' id='type-id-971'/>
     <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-766' name='crq'/>
-      <parameter type-id='type-id-967' name='features'/>
+      <parameter type-id='type-id-971' 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-766' name='crq'/>
-      <parameter type-id='type-id-967' name='features'/>
+      <parameter type-id='type-id-971' name='features'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-419' 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'>
@@ -13244,8 +13353,8 @@
     </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-766' name='crq'/>
-      <parameter type-id='type-id-402' name='key'/>
-      <parameter type-id='type-id-212' name='dig'/>
+      <parameter type-id='type-id-401' name='key'/>
+      <parameter type-id='type-id-211' name='dig'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -13253,21 +13362,21 @@
       <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-422' 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-766' name='crq'/>
-      <parameter type-id='type-id-102' name='oid'/>
+      <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-766' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-423' name='sizeof_oid'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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'>
@@ -13284,12 +13393,12 @@
     <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-766' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <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-968'>
+    <enum-decl name='gnutls_x509_subject_alt_name_t' id='type-id-972'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_SAN_DNSNAME' value='1'/>
       <enumerator name='GNUTLS_SAN_RFC822NAME' value='2'/>
@@ -13297,15 +13406,16 @@
       <enumerator name='GNUTLS_SAN_IPADDRESS' value='4'/>
       <enumerator name='GNUTLS_SAN_OTHERNAME' value='5'/>
       <enumerator name='GNUTLS_SAN_DN' value='6'/>
-      <enumerator name='GNUTLS_SAN_MAX' value='6'/>
+      <enumerator name='GNUTLS_SAN_REGISTERED_ID' value='7'/>
+      <enumerator name='GNUTLS_SAN_MAX' value='7'/>
       <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-968' id='type-id-969'/>
+    <typedef-decl name='gnutls_x509_subject_alt_name_t' type-id='type-id-972' id='type-id-973'/>
     <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-766' name='crq'/>
-      <parameter type-id='type-id-969' name='nt'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <parameter type-id='type-id-973' 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'/>
@@ -13314,93 +13424,93 @@
       <parameter type-id='type-id-766' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-276' name='output'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-275' name='output'/>
+      <parameter type-id='type-id-419' 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-766' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-766' name='crq'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ret'/>
-      <parameter type-id='type-id-423' name='ret_size'/>
+      <parameter type-id='type-id-101' name='ret'/>
+      <parameter type-id='type-id-422' 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-766' name='crq'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ret'/>
-      <parameter type-id='type-id-423' name='ret_size'/>
-      <parameter type-id='type-id-420' name='ret_type'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-766' name='crq'/>
-      <parameter type-id='type-id-420' name='critical'/>
-      <parameter type-id='type-id-420' name='ca'/>
-      <parameter type-id='type-id-365' name='pathlen'/>
+      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-419' name='ca'/>
+      <parameter type-id='type-id-364' 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-766' name='crq'/>
-      <parameter type-id='type-id-420' name='key_usage'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-419' name='key_usage'/>
+      <parameter type-id='type-id-419' 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-766' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-275' 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-766' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-423' name='sizeof_data'/>
+      <parameter type-id='type-id-101' name='data'/>
+      <parameter type-id='type-id-422' 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-766' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-423' name='sizeof_oid'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-766' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-423' name='sizeof_data'/>
+      <parameter type-id='type-id-101' name='data'/>
+      <parameter type-id='type-id-422' 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-766' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-423' name='sizeof_data'/>
+      <parameter type-id='type-id-101' name='data'/>
+      <parameter type-id='type-id-422' 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-766' name='crq'/>
-      <parameter type-id='type-id-377' name='oid'/>
-      <parameter type-id='type-id-423' name='oid_size'/>
+      <parameter type-id='type-id-376' name='oid'/>
+      <parameter type-id='type-id-422' 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-766' name='crq'/>
-      <parameter type-id='type-id-377' name='oid'/>
-      <parameter type-id='type-id-423' name='oid_size'/>
+      <parameter type-id='type-id-376' name='oid'/>
+      <parameter type-id='type-id-422' 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'>
@@ -13411,26 +13521,26 @@
     </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-766' name='crq'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-275' 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-766' name='crq'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-766' name='crq'/>
-      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-383' 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-766' name='crq'/>
-      <parameter type-id='type-id-384' name='key'/>
-      <parameter type-id='type-id-212' name='dig'/>
+      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-211' name='dig'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -13447,41 +13557,41 @@
     </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-766' name='crq'/>
-      <parameter type-id='type-id-276' name='m'/>
-      <parameter type-id='type-id-276' name='e'/>
+      <parameter type-id='type-id-275' name='m'/>
+      <parameter type-id='type-id-275' 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-766' name='crq'/>
-      <parameter type-id='type-id-384' name='key'/>
+      <parameter type-id='type-id-383' 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-766' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <parameter type-id='type-id-101' name='data'/>
       <parameter type-id='type-id-10' name='sizeof_data'/>
       <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-766' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
-      <parameter type-id='type-id-102' name='buf'/>
-      <parameter type-id='type-id-100' name='buf_size'/>
+      <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-766' name='crq'/>
-      <parameter type-id='type-id-377' name='pass'/>
-      <parameter type-id='type-id-423' name='pass_size'/>
+      <parameter type-id='type-id-376' name='pass'/>
+      <parameter type-id='type-id-422' 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-766' name='crq'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-423' name='sizeof_oid'/>
+      <parameter type-id='type-id-101' name='oid'/>
+      <parameter type-id='type-id-422' 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'>
@@ -13489,32 +13599,32 @@
       <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-102' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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-766' name='crq'/>
-      <parameter type-id='type-id-276' name='dn'/>
+      <parameter type-id='type-id-275' 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-766' name='crq'/>
-      <parameter type-id='type-id-276' name='dn'/>
+      <parameter type-id='type-id-275' 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-766' name='crq'/>
-      <parameter type-id='type-id-377' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
+      <parameter type-id='type-id-376' name='buf'/>
+      <parameter type-id='type-id-422' 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-766' name='crq'/>
       <parameter type-id='type-id-514' name='activation'/>
       <parameter type-id='type-id-514' name='expiration'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-419' 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'>
@@ -13524,24 +13634,24 @@
     <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-766' name='crq'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-766' name='crq'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-766' size-in-bits='64' id='type-id-970'/>
+    <pointer-type-def type-id='type-id-766' size-in-bits='64' id='type-id-974'/>
     <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-970' name='crq'/>
+      <parameter type-id='type-id-974' 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-766' name='crq'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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'>
@@ -13555,97 +13665,97 @@
     </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-766' name='crq'/>
-      <parameter type-id='type-id-420' name='bits'/>
+      <parameter type-id='type-id-419' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_check_pubkey_params' mangled-name='_gnutls_x509_check_pubkey_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_write_spki_params' mangled-name='_gnutls_x509_write_spki_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crq_set_extension' mangled-name='_gnutls_x509_crq_set_extension' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_get_signed_data' mangled-name='_gnutls_x509_get_signed_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_get_signature' mangled-name='_gnutls_x509_get_signature' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='pubkey_verify_data' mangled-name='pubkey_verify_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_privkey_get_spki_params' mangled-name='_gnutls_privkey_get_spki_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_privkey_update_spki_params' mangled-name='_gnutls_privkey_update_spki_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_get_tbs' mangled-name='_gnutls_x509_get_tbs' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='privkey_sign_and_hash_data' mangled-name='privkey_sign_and_hash_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_write_sign_params' mangled-name='_gnutls_x509_write_sign_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_encode_othername_data' mangled-name='_gnutls_encode_othername_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_ext_gen_subject_alt_name' mangled-name='_gnutls_x509_ext_gen_subject_alt_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_copy_data' mangled-name='_gnutls_copy_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_encode_and_write_attribute' mangled-name='_gnutls_x509_encode_and_write_attribute' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_set_dn_oid' mangled-name='_gnutls_x509_set_dn_oid' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_x509_set_attribute' mangled-name='_x509_set_attribute' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_x509_parse_attribute' mangled-name='_x509_parse_attribute' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_get_pk_algorithm' mangled-name='_gnutls_x509_get_pk_algorithm' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dn.c' comp-dir-path='/home/nmavrogi/cvs/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-102' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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'>
@@ -13653,112 +13763,107 @@
       <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-102' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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-276' name='str'/>
+      <parameter type-id='type-id-275' 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-377' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
+      <parameter type-id='type-id-376' name='buf'/>
+      <parameter type-id='type-id-422' 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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_dn_get_str2' mangled-name='gnutls_x509_dn_get_str2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_dn_deinit' mangled-name='gnutls_x509_dn_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_read_string' mangled-name='_gnutls_x509_read_string' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_dn_to_string' mangled-name='_gnutls_x509_dn_to_string' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='attributes.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
-    <function-decl name='_gnutls_x509_write_value' mangled-name='_gnutls_x509_write_value' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='extensions.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='extensions.c' comp-dir-path='/home/nmavrogi/cvs/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-728' name='crl'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-275' 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-10' name='indx'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-275' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_aki_deinit' mangled-name='gnutls_x509_aki_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_subject_alt_names_init' mangled-name='gnutls_subject_alt_names_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='mpi.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
-    <enum-decl name='gnutls_certificate_print_formats' id='type-id-971'>
+  <abi-instr version='1.0' address-size='64' path='output.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/x509' language='LANG_C99'>
+    <enum-decl name='gnutls_certificate_print_formats' id='type-id-975'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_CRT_PRINT_FULL' value='0'/>
       <enumerator name='GNUTLS_CRT_PRINT_ONELINE' value='1'/>
@@ -13766,368 +13871,368 @@
       <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-971' id='type-id-972'/>
+    <typedef-decl name='gnutls_certificate_print_formats_t' type-id='type-id-975' id='type-id-976'/>
     <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-927' name='exts'/>
+      <parameter type-id='type-id-931' name='exts'/>
       <parameter type-id='type-id-10' name='exts_size'/>
-      <parameter type-id='type-id-972' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-976' name='format'/>
+      <parameter type-id='type-id-275' 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-268' name='pubkey'/>
-      <parameter type-id='type-id-972' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-267' name='pubkey'/>
+      <parameter type-id='type-id-976' name='format'/>
+      <parameter type-id='type-id-275' 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-766' name='crq'/>
-      <parameter type-id='type-id-972' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-976' name='format'/>
+      <parameter type-id='type-id-275' 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-728' name='crl'/>
-      <parameter type-id='type-id-972' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-976' name='format'/>
+      <parameter type-id='type-id-275' 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-972' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-976' name='format'/>
+      <parameter type-id='type-id-275' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_asciiprint' mangled-name='_gnutls_buffer_asciiprint' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_hexprint' mangled-name='_gnutls_buffer_hexprint' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_sign_is_secure2' mangled-name='gnutls_sign_is_secure2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_hexdump' mangled-name='_gnutls_buffer_hexdump' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_base64print' mangled-name='_gnutls_buffer_base64print' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_policies_init' mangled-name='gnutls_x509_policies_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_policies_get' mangled-name='gnutls_x509_policies_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_policies_deinit' mangled-name='gnutls_x509_policies_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_key_purpose_init' mangled-name='gnutls_x509_key_purpose_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_aia_init' mangled-name='gnutls_x509_aia_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_aia_get' mangled-name='gnutls_x509_aia_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_aia_deinit' mangled-name='gnutls_x509_aia_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_name_constraints_init' mangled-name='gnutls_x509_name_constraints_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_ext_get_name' mangled-name='gnutls_ext_get_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_othername_to_virtual' mangled-name='gnutls_x509_othername_to_virtual' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_idna_reverse_map' mangled-name='gnutls_idna_reverse_map' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_idna_email_reverse_map' mangled-name='_gnutls_idna_email_reverse_map' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ip_to_string' mangled-name='_gnutls_ip_to_string' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_cidr_to_string' mangled-name='_gnutls_cidr_to_string' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/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-973'>
+  <abi-instr version='1.0' address-size='64' path='pkcs12.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/x509' language='LANG_C99'>
+    <class-decl name='gnutls_pkcs12_int' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-977'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pkcs12' type-id='type-id-388' visibility='default'/>
+        <var-decl name='pkcs12' type-id='type-id-387' 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-973' size-in-bits='64' id='type-id-974'/>
-    <typedef-decl name='gnutls_pkcs12_t' type-id='type-id-974' id='type-id-975'/>
+    <pointer-type-def type-id='type-id-977' size-in-bits='64' id='type-id-978'/>
+    <typedef-decl name='gnutls_pkcs12_t' type-id='type-id-978' id='type-id-979'/>
     <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-975' name='pkcs12'/>
-      <parameter type-id='type-id-420' name='mac'/>
-      <parameter type-id='type-id-102' name='salt'/>
-      <parameter type-id='type-id-420' name='salt_size'/>
-      <parameter type-id='type-id-420' name='iter_count'/>
+      <parameter type-id='type-id-979' name='pkcs12'/>
+      <parameter type-id='type-id-419' 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-850' 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-975' name='p12'/>
+      <parameter type-id='type-id-979' name='p12'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-732' name='key'/>
       <parameter type-id='type-id-731' name='chain'/>
-      <parameter type-id='type-id-420' name='chain_len'/>
+      <parameter type-id='type-id-419' name='chain_len'/>
       <parameter type-id='type-id-731' name='extra_certs'/>
-      <parameter type-id='type-id-420' name='extra_certs_len'/>
+      <parameter type-id='type-id-419' name='extra_certs_len'/>
       <parameter type-id='type-id-729' 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-975' name='pkcs12'/>
+      <parameter type-id='type-id-979' 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-975' name='pkcs12'/>
+      <parameter type-id='type-id-979' 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-975' name='pkcs12'/>
+      <parameter type-id='type-id-979' 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-976'>
+    <class-decl name='gnutls_pkcs12_bag_int' size-in-bits='12352' is-struct='yes' visibility='default' id='type-id-980'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='element' type-id='type-id-977' visibility='default'/>
+        <var-decl name='element' type-id='type-id-981' 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-978'>
+    <class-decl name='bag_element' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-982'>
       <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-979' visibility='default'/>
+        <var-decl name='type' type-id='type-id-983' 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-377' visibility='default'/>
+        <var-decl name='friendly_name' type-id='type-id-376' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='gnutls_pkcs12_bag_type_t' id='type-id-980'>
+    <enum-decl name='gnutls_pkcs12_bag_type_t' id='type-id-984'>
       <underlying-type type-id='type-id-41'/>
       <enumerator name='GNUTLS_BAG_EMPTY' value='0'/>
       <enumerator name='GNUTLS_BAG_PKCS8_ENCRYPTED_KEY' value='1'/>
@@ -14138,354 +14243,353 @@
       <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-980' id='type-id-979'/>
+    <typedef-decl name='gnutls_pkcs12_bag_type_t' type-id='type-id-984' id='type-id-983'/>
 
-    <array-type-def dimensions='1' type-id='type-id-978' size-in-bits='12288' id='type-id-977'>
+    <array-type-def dimensions='1' type-id='type-id-982' size-in-bits='12288' id='type-id-981'>
       <subrange length='32' type-id='type-id-38' id='type-id-51'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-976' size-in-bits='64' id='type-id-981'/>
-    <typedef-decl name='gnutls_pkcs12_bag_t' type-id='type-id-981' id='type-id-982'/>
+    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-985'/>
+    <typedef-decl name='gnutls_pkcs12_bag_t' type-id='type-id-985' id='type-id-986'/>
     <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-975' name='pkcs12'/>
-      <parameter type-id='type-id-982' name='bag'/>
+      <parameter type-id='type-id-979' name='pkcs12'/>
+      <parameter type-id='type-id-986' 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-975' name='pkcs12'/>
+      <parameter type-id='type-id-979' name='pkcs12'/>
       <parameter type-id='type-id-22' name='indx'/>
-      <parameter type-id='type-id-982' name='bag'/>
+      <parameter type-id='type-id-986' 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-975' name='pkcs12'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-979' name='pkcs12'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-275' 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-975' name='pkcs12'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-979' name='pkcs12'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-975' name='pkcs12'/>
+      <parameter type-id='type-id-979' name='pkcs12'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-975' name='pkcs12'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-979' name='pkcs12'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-983'/>
+    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-987'/>
     <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-983' name='pkcs12'/>
+      <parameter type-id='type-id-987' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import_pkcs8' mangled-name='gnutls_x509_privkey_import_pkcs8' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_import' mangled-name='gnutls_x509_crl_import' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_init' mangled-name='gnutls_pkcs12_bag_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_decrypt' mangled-name='gnutls_pkcs12_bag_decrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs12_bag_deinit' mangled-name='gnutls_pkcs12_bag_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_pkcs12_encode_crt_bag' mangled-name='_pkcs12_encode_crt_bag' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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-112'/>
+      <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-112'/>
+      <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-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_pkcs12_decode_crt_bag' mangled-name='_pkcs12_decode_crt_bag' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs12_bag.c' comp-dir-path='/home/nmavrogi/cvs/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-982' name='bag'/>
-      <parameter type-id='type-id-384' name='privkey'/>
+      <parameter type-id='type-id-986' name='bag'/>
+      <parameter type-id='type-id-383' 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-982' name='bag'/>
-      <parameter type-id='type-id-420' name='schema'/>
-      <parameter type-id='type-id-420' name='cipher'/>
-      <parameter type-id='type-id-102' name='salt'/>
-      <parameter type-id='type-id-420' name='salt_size'/>
-      <parameter type-id='type-id-420' name='iter_count'/>
+      <parameter type-id='type-id-986' name='bag'/>
+      <parameter type-id='type-id-419' name='schema'/>
+      <parameter type-id='type-id-419' 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-850' 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-982' name='bag'/>
+      <parameter type-id='type-id-986' 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-982' name='bag'/>
+      <parameter type-id='type-id-986' 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-982' name='bag'/>
+      <parameter type-id='type-id-986' 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-982' name='bag'/>
+      <parameter type-id='type-id-986' name='bag'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-850' 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-982' name='bag'/>
+      <parameter type-id='type-id-986' name='bag'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-276' name='id'/>
+      <parameter type-id='type-id-275' 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-982' name='bag'/>
+      <parameter type-id='type-id-986' 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-982' name='bag'/>
+      <parameter type-id='type-id-986' name='bag'/>
       <parameter type-id='type-id-728' 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-982' name='bag'/>
+      <parameter type-id='type-id-986' name='bag'/>
       <parameter type-id='type-id-467' 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-982' name='bag'/>
-      <parameter type-id='type-id-979' name='type'/>
+      <parameter type-id='type-id-986' name='bag'/>
+      <parameter type-id='type-id-983' 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-982' name='bag'/>
+      <parameter type-id='type-id-986' name='bag'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-276' name='id'/>
+      <parameter type-id='type-id-275' 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-982' name='bag'/>
+      <parameter type-id='type-id-986' 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-982' name='bag'/>
+      <parameter type-id='type-id-986' 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-982' name='bag'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-986' name='bag'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-984'/>
+    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-988'/>
     <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-984' name='bag'/>
+      <parameter type-id='type-id-988' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs7_data_enc_info' mangled-name='_gnutls_pkcs7_data_enc_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_pkcs12_encode_safe_contents' mangled-name='_pkcs12_encode_safe_contents' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs_flags_to_schema' mangled-name='_gnutls_pkcs_flags_to_schema' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs7_encrypt_data' mangled-name='_gnutls_pkcs7_encrypt_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs7_decrypt_data' mangled-name='_gnutls_pkcs7_decrypt_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_pkcs12_decode_safe_contents' mangled-name='_pkcs12_decode_safe_contents' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_write_string' mangled-name='_gnutls_x509_write_string' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-985'/>
+  <abi-instr version='1.0' address-size='64' path='pkcs12_encr.c' comp-dir-path='/home/nmavrogi/cvs/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-985' name='salt'/>
+      <parameter type-id='type-id-898' 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-192' name='keybuf'/>
+      <parameter type-id='type-id-191' 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-112'/>
+      <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/nmavrogi/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-986'>
+  <abi-instr version='1.0' address-size='64' path='pkcs7.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/x509' language='LANG_C99'>
+    <class-decl name='gnutls_pkcs7_int' size-in-bits='1344' is-struct='yes' visibility='default' id='type-id-989'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pkcs7' type-id='type-id-388' visibility='default'/>
+        <var-decl name='pkcs7' type-id='type-id-387' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='encap_data_oid' type-id='type-id-987' visibility='default'/>
+        <var-decl name='encap_data_oid' type-id='type-id-990' 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-388' visibility='default'/>
+        <var-decl name='signed_data' type-id='type-id-387' 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-987'>
-      <subrange length='128' type-id='type-id-38' id='type-id-988'/>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='1024' id='type-id-990'>
+      <subrange length='128' type-id='type-id-38' id='type-id-991'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-989'/>
-    <typedef-decl name='gnutls_pkcs7_t' type-id='type-id-989' id='type-id-990'/>
-    <class-decl name='gnutls_pkcs7_attrs_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-991'>
+    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-992'/>
+    <typedef-decl name='gnutls_pkcs7_t' type-id='type-id-992' id='type-id-993'/>
+    <class-decl name='gnutls_pkcs7_attrs_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-994'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='oid' type-id='type-id-377' visibility='default'/>
+        <var-decl name='oid' type-id='type-id-376' 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-992' visibility='default'/>
+        <var-decl name='next' type-id='type-id-995' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-991' size-in-bits='64' id='type-id-992'/>
-    <typedef-decl name='gnutls_pkcs7_attrs_t' type-id='type-id-992' id='type-id-993'/>
+    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-995'/>
+    <typedef-decl name='gnutls_pkcs7_attrs_t' type-id='type-id-995' id='type-id-996'/>
     <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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-467' name='signer'/>
-      <parameter type-id='type-id-402' name='signer_key'/>
+      <parameter type-id='type-id-401' name='signer_key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-993' name='signed_attrs'/>
-      <parameter type-id='type-id-993' name='unsigned_attrs'/>
-      <parameter type-id='type-id-212' name='dig'/>
+      <parameter type-id='type-id-996' name='signed_attrs'/>
+      <parameter type-id='type-id-996' name='unsigned_attrs'/>
+      <parameter type-id='type-id-211' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-728' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='crl'/>
-      <parameter type-id='type-id-423' name='crl_size'/>
+      <parameter type-id='type-id-101' name='crl'/>
+      <parameter type-id='type-id-422' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-276' name='crl'/>
+      <parameter type-id='type-id-275' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-467' 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-990' name='pkcs7'/>
-      <parameter type-id='type-id-57' name='crt'/>
+      <parameter type-id='type-id-993' 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-990' name='pkcs7'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-275' 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-990' name='pkcs7'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-715' name='tl'/>
-      <parameter type-id='type-id-173' name='vdata'/>
+      <parameter type-id='type-id-172' 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'/>
@@ -14493,7 +14597,7 @@
       <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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-467' name='signer'/>
       <parameter type-id='type-id-10' name='idx'/>
       <parameter type-id='type-id-57' name='data'/>
@@ -14501,16 +14605,16 @@
       <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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-275' 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-994'>
+    <class-decl name='gnutls_pkcs7_signature_info_st' size-in-bits='1280' is-struct='yes' visibility='default' id='type-id-997'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='algo' type-id='type-id-21' visibility='default'/>
       </data-member>
@@ -14530,140 +14634,140 @@
         <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-993' visibility='default'/>
+        <var-decl name='signed_attrs' type-id='type-id-996' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='unsigned_attrs' type-id='type-id-993' visibility='default'/>
+        <var-decl name='unsigned_attrs' type-id='type-id-996' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='pad' type-id='type-id-995' visibility='default'/>
+        <var-decl name='pad' type-id='type-id-998' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='512' id='type-id-995'>
-      <subrange length='64' type-id='type-id-38' id='type-id-93'/>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='512' id='type-id-998'>
+      <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-994' id='type-id-996'/>
-    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-997'/>
+    <typedef-decl name='gnutls_pkcs7_signature_info_st' type-id='type-id-997' id='type-id-999'/>
+    <pointer-type-def type-id='type-id-999' size-in-bits='64' id='type-id-1000'/>
     <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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-997' name='info'/>
+      <parameter type-id='type-id-1000' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' 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-997' name='info'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-1000' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='certificate'/>
-      <parameter type-id='type-id-423' name='certificate_size'/>
+      <parameter type-id='type-id-101' name='certificate'/>
+      <parameter type-id='type-id-422' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-276' name='cert'/>
+      <parameter type-id='type-id-275' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-990' name='pkcs7'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-998'/>
+    <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-1001'/>
     <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-998' name='pkcs7'/>
+      <parameter type-id='type-id-1001' 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-990' name='pkcs7'/>
+      <parameter type-id='type-id-993' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_set_raw_time' mangled-name='_gnutls_x509_set_raw_time' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crt_get_spki_params' mangled-name='_gnutls_x509_crt_get_spki_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_print' mangled-name='gnutls_x509_crt_print' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_check_key_purpose' mangled-name='_gnutls_check_key_purpose' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_verify_data3' mangled-name='gnutls_x509_crt_verify_data3' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_oid_to_pk' mangled-name='gnutls_oid_to_pk' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_add_attr' mangled-name='gnutls_pkcs7_add_attr' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_attrs_deinit' mangled-name='gnutls_pkcs7_attrs_deinit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_get_tag_der' mangled-name='asn1_get_tag_der' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='asn1_get_length_ber' mangled-name='asn1_get_length_ber' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs7-attrs.c' comp-dir-path='/home/nmavrogi/cvs/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-993' name='list'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-996' 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-993' name='list'/>
+      <parameter type-id='type-id-996' name='list'/>
       <parameter type-id='type-id-10' name='idx'/>
       <parameter type-id='type-id-850' name='oid'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-275' 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-993' size-in-bits='64' id='type-id-999'/>
+    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-1002'/>
     <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-999' name='list'/>
+      <parameter type-id='type-id-1002' name='list'/>
       <parameter type-id='type-id-27' name='oid'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-275' 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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs7-crypt.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -14673,77 +14777,77 @@
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='gnutls_cipher_get_key_size' mangled-name='gnutls_cipher_get_key_size' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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-112'/>
+      <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-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_read_pbkdf1_params' mangled-name='_gnutls_read_pbkdf1_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='privkey.c' comp-dir-path='/home/nmavrogi/cvs/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-384' name='key'/>
+      <parameter type-id='type-id-383' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <return type-id='type-id-112'/>
+      <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-384' name='privkey'/>
-      <parameter type-id='type-id-376' name='fn'/>
-      <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-383' name='privkey'/>
+      <parameter type-id='type-id-375' 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-384' name='key'/>
-      <parameter type-id='type-id-212' name='digest'/>
+      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-211' name='digest'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-102' name='signature'/>
-      <parameter type-id='type-id-423' name='signature_size'/>
+      <parameter type-id='type-id-101' name='signature'/>
+      <parameter type-id='type-id-422' 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-384' name='key'/>
+      <parameter type-id='type-id-383' name='key'/>
       <parameter type-id='type-id-57' name='hash'/>
-      <parameter type-id='type-id-276' name='signature'/>
+      <parameter type-id='type-id-275' 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-384' name='key'/>
+      <parameter type-id='type-id-383' name='key'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-422' 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-384' name='key'/>
+      <parameter type-id='type-id-383' 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-384' name='key'/>
-      <parameter type-id='type-id-212' name='digest'/>
-      <parameter type-id='type-id-102' name='seed'/>
-      <parameter type-id='type-id-100' name='seed_size'/>
+      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-211' 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-384' name='key'/>
-      <parameter type-id='type-id-432' name='digest'/>
-      <parameter type-id='type-id-102' name='seed'/>
-      <parameter type-id='type-id-423' name='seed_size'/>
+      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-431' name='digest'/>
+      <parameter type-id='type-id-101' name='seed'/>
+      <parameter type-id='type-id-422' 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-1000'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-1003'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-760' visibility='default'/>
       </data-member>
@@ -14755,7 +14859,7 @@
       </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-384' name='key'/>
+      <parameter type-id='type-id-383' 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'/>
@@ -14764,106 +14868,106 @@
       <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-384' name='key'/>
+      <parameter type-id='type-id-383' 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-384' name='key'/>
-      <parameter type-id='type-id-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='g'/>
-      <parameter type-id='type-id-276' name='y'/>
-      <parameter type-id='type-id-276' name='x'/>
+      <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'/>
       <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-384' name='key'/>
-      <parameter type-id='type-id-276' name='m'/>
-      <parameter type-id='type-id-276' name='e'/>
-      <parameter type-id='type-id-276' name='d'/>
-      <parameter type-id='type-id-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='u'/>
-      <parameter type-id='type-id-276' name='e1'/>
-      <parameter type-id='type-id-276' name='e2'/>
+      <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'/>
       <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-384' name='key'/>
-      <parameter type-id='type-id-276' name='m'/>
-      <parameter type-id='type-id-276' name='e'/>
-      <parameter type-id='type-id-276' name='d'/>
-      <parameter type-id='type-id-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='u'/>
+      <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'/>
       <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-384' name='key'/>
+      <parameter type-id='type-id-383' name='key'/>
       <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-432' name='digest'/>
+      <parameter type-id='type-id-431' name='digest'/>
       <parameter type-id='type-id-712' name='paramset'/>
-      <parameter type-id='type-id-276' name='x'/>
-      <parameter type-id='type-id-276' name='y'/>
-      <parameter type-id='type-id-276' name='k'/>
+      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-275' 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-384' name='key'/>
+      <parameter type-id='type-id-383' name='key'/>
       <parameter type-id='type-id-711' name='curve'/>
-      <parameter type-id='type-id-276' name='x'/>
-      <parameter type-id='type-id-276' name='y'/>
-      <parameter type-id='type-id-276' name='k'/>
+      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-275' name='y'/>
+      <parameter type-id='type-id-275' 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-384' name='key'/>
-      <return type-id='type-id-203'/>
+      <parameter type-id='type-id-383' name='key'/>
+      <return type-id='type-id-202'/>
     </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-384' name='key'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-275' 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-384' name='key'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-384' name='key'/>
+      <parameter type-id='type-id-383' name='key'/>
       <parameter type-id='type-id-756' 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-384' name='key'/>
+      <parameter type-id='type-id-383' name='key'/>
       <parameter type-id='type-id-755' 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-384' name='key'/>
+      <parameter type-id='type-id-383' 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-384' name='key'/>
+      <parameter type-id='type-id-383' name='key'/>
       <parameter type-id='type-id-59' name='curve'/>
-      <parameter type-id='type-id-212' name='digest'/>
-      <parameter type-id='type-id-316' name='paramset'/>
+      <parameter type-id='type-id-211' name='digest'/>
+      <parameter type-id='type-id-315' 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-384' name='key'/>
+      <parameter type-id='type-id-383' 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'/>
@@ -14871,7 +14975,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-384' name='key'/>
+      <parameter type-id='type-id-383' 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'/>
@@ -14880,7 +14984,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-384' name='key'/>
+      <parameter type-id='type-id-383' 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'/>
@@ -14892,7 +14996,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-384' name='key'/>
+      <parameter type-id='type-id-383' 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'/>
@@ -14902,22 +15006,22 @@
       <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-384' name='key'/>
+      <parameter type-id='type-id-383' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-384' name='key'/>
+      <parameter type-id='type-id-383' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-384' name='dst'/>
-      <parameter type-id='type-id-384' name='src'/>
+      <parameter type-id='type-id-383' name='dst'/>
+      <parameter type-id='type-id-383' 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'>
@@ -14925,140 +15029,140 @@
       <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-384' name='key'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-383' 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-384' name='key'/>
-      <parameter type-id='type-id-420' name='bits'/>
+      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-419' 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-384' name='key'/>
+      <parameter type-id='type-id-383' 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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_read_key_int' mangled-name='_gnutls_x509_read_key_int' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='privkey_pkcs8.c' comp-dir-path='/home/nmavrogi/cvs/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-384' name='key'/>
+      <parameter type-id='type-id-383' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-384' name='key'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-275' 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-422' name='format'/>
-      <parameter type-id='type-id-420' name='schema'/>
-      <parameter type-id='type-id-420' name='cipher'/>
-      <parameter type-id='type-id-102' name='salt'/>
-      <parameter type-id='type-id-420' name='salt_size'/>
-      <parameter type-id='type-id-420' name='iter_count'/>
+      <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-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-850' 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-384' name='key'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-383' name='key'/>
+      <parameter type-id='type-id-421' name='format'/>
       <parameter type-id='type-id-27' name='password'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_check_pkcs_cipher_schema' mangled-name='_gnutls_check_pkcs_cipher_schema' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_read_pkcs_schema_params' mangled-name='_gnutls_read_pkcs_schema_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs_schema_get' mangled-name='_gnutls_pkcs_schema_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs_generate_key' mangled-name='_gnutls_pkcs_generate_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs_write_schema_params' mangled-name='_gnutls_pkcs_write_schema_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs_raw_encrypt_data' mangled-name='_gnutls_pkcs_raw_encrypt_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_privkey_decode_pkcs1_rsa_key' mangled-name='_gnutls_privkey_decode_pkcs1_rsa_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_x509_encode_provable_seed' mangled-name='_x509_encode_provable_seed' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_read_key_int_le' mangled-name='_gnutls_x509_read_key_int_le' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_read_gost_params' mangled-name='_gnutls_x509_read_gost_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_privkey_decode_ecc_key' mangled-name='_gnutls_privkey_decode_ecc_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_x509_decode_provable_seed' mangled-name='_x509_decode_provable_seed' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs_raw_decrypt_data' mangled-name='_gnutls_pkcs_raw_decrypt_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='_x509_encode_provable_seed' mangled-name='_x509_encode_provable_seed' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='privkey_pkcs8_pbes1.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_md5_update' mangled-name='nettle_md5_update' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_md5_digest' mangled-name='nettle_md5_digest' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='privkey_openssl.c' comp-dir-path='/home/nmavrogi/cvs/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-384' name='key'/>
+      <parameter type-id='type-id-383' name='key'/>
       <parameter type-id='type-id-57' name='data'/>
       <parameter type-id='type-id-27' name='password'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='gnutls_cipher_get_block_size' mangled-name='gnutls_cipher_get_block_size' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_privkey_import' mangled-name='gnutls_x509_privkey_import' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_base64_decode' mangled-name='_gnutls_base64_decode' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='hostname-verify.c' comp-dir-path='/home/nmavrogi/cvs/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-27' name='hostname'/>
@@ -15067,7 +15171,7 @@
     </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-347' name='ip'/>
+      <parameter type-id='type-id-346' 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'/>
@@ -15078,26 +15182,26 @@
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='inet_pton' mangled-name='inet_pton' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hostname_compare' mangled-name='_gnutls_hostname_compare' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='sign.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-467' const='yes' id='type-id-1001'/>
-    <pointer-type-def type-id='type-id-1001' size-in-bits='64' id='type-id-1002'/>
+  <abi-instr version='1.0' address-size='64' path='verify.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/x509' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-467' const='yes' id='type-id-1004'/>
+    <pointer-type-def type-id='type-id-1004' size-in-bits='64' id='type-id-1005'/>
     <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-728' name='crl'/>
-      <parameter type-id='type-id-1002' name='trusted_cas'/>
+      <parameter type-id='type-id-1005' 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-420' name='verify'/>
+      <parameter type-id='type-id-419' 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'>
@@ -15107,23 +15211,23 @@
     </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-1002' name='CA_list'/>
+      <parameter type-id='type-id-1005' 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-420' name='verify'/>
+      <parameter type-id='type-id-419' name='verify'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-728' const='yes' id='type-id-1003'/>
-    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1004'/>
+    <qualified-type-def type-id='type-id-728' const='yes' id='type-id-1006'/>
+    <pointer-type-def type-id='type-id-1006' size-in-bits='64' id='type-id-1007'/>
     <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-1002' name='cert_list'/>
+      <parameter type-id='type-id-1005' name='cert_list'/>
       <parameter type-id='type-id-10' name='cert_list_length'/>
-      <parameter type-id='type-id-1002' name='CA_list'/>
+      <parameter type-id='type-id-1005' name='CA_list'/>
       <parameter type-id='type-id-10' name='CA_list_length'/>
-      <parameter type-id='type-id-1004' name='CRL_list'/>
+      <parameter type-id='type-id-1007' 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-420' name='verify'/>
+      <parameter type-id='type-id-419' 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'>
@@ -15132,41 +15236,41 @@
       <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_tlsfeatures_check_crt' mangled-name='gnutls_x509_tlsfeatures_check_crt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509.c' comp-dir-path='/home/nmavrogi/cvs/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-10' name='flags'/>
-      <return type-id='type-id-112'/>
+      <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'/>
@@ -15178,10 +15282,10 @@
     </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-731' name='certs'/>
-      <parameter type-id='type-id-420' name='size'/>
+      <parameter type-id='type-id-419' name='size'/>
       <parameter type-id='type-id-27' name='url'/>
-      <parameter type-id='type-id-376' name='pin_fn'/>
-      <parameter type-id='type-id-102' name='pin_fn_userdata'/>
+      <parameter type-id='type-id-375' 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>
@@ -15193,97 +15297,97 @@
     </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-376' name='fn'/>
-      <parameter type-id='type-id-102' name='userdata'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-375' 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-10' name='seq'/>
       <parameter type-id='type-id-22' name='what'/>
-      <parameter type-id='type-id-276' name='data'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-419' 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-377' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
+      <parameter type-id='type-id-376' name='buf'/>
+      <parameter type-id='type-id-422' 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-377' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
+      <parameter type-id='type-id-376' name='buf'/>
+      <parameter type-id='type-id-422' 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-420' name='cert_max'/>
+      <parameter type-id='type-id-419' name='cert_max'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-731' name='certs'/>
-      <parameter type-id='type-id-420' name='size'/>
+      <parameter type-id='type-id-419' name='size'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-276' name='p'/>
-      <parameter type-id='type-id-276' name='q'/>
-      <parameter type-id='type-id-276' name='g'/>
-      <parameter type-id='type-id-276' name='y'/>
+      <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'/>
       <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-432' name='digest'/>
+      <parameter type-id='type-id-431' name='digest'/>
       <parameter type-id='type-id-712' name='paramset'/>
-      <parameter type-id='type-id-276' name='x'/>
-      <parameter type-id='type-id-276' name='y'/>
+      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-275' 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-276' name='x'/>
-      <parameter type-id='type-id-276' name='y'/>
+      <parameter type-id='type-id-275' name='x'/>
+      <parameter type-id='type-id-275' 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-276' name='m'/>
-      <parameter type-id='type-id-276' name='e'/>
+      <parameter type-id='type-id-275' name='m'/>
+      <parameter type-id='type-id-275' 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-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-423' name='oid_size'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-10' name='seq'/>
-      <parameter type-id='type-id-102' name='san'/>
-      <parameter type-id='type-id-423' name='san_size'/>
-      <parameter type-id='type-id-420' name='reason_flags'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-432' name='hash'/>
-      <parameter type-id='type-id-420' name='mand'/>
+      <parameter type-id='type-id-431' name='hash'/>
+      <parameter type-id='type-id-419' 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'>
@@ -15294,7 +15398,7 @@
     </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-1004' name='crl_list'/>
+      <parameter type-id='type-id-1007' name='crl_list'/>
       <parameter type-id='type-id-10' name='crl_list_length'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -15302,210 +15406,210 @@
       <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-10' name='flags'/>
       <parameter type-id='type-id-64' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-422' 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-422' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-212' name='algo'/>
-      <parameter type-id='type-id-102' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
+      <parameter type-id='type-id-211' name='algo'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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-1005'/>
-    <typedef-decl name='gnutls_x509_dn_t' type-id='type-id-1005' id='type-id-1006'/>
-    <pointer-type-def type-id='type-id-1006' size-in-bits='64' id='type-id-1007'/>
+    <pointer-type-def type-id='type-id-465' size-in-bits='64' id='type-id-1008'/>
+    <typedef-decl name='gnutls_x509_dn_t' type-id='type-id-1008' id='type-id-1009'/>
+    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1010'/>
     <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-1007' name='dn'/>
+      <parameter type-id='type-id-1010' 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-1007' name='dn'/>
+      <parameter type-id='type-id-1010' 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-276' name='dn'/>
+      <parameter type-id='type-id-275' 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-276' name='dn'/>
+      <parameter type-id='type-id-275' 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-10' name='indx'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-423' name='sizeof_data'/>
+      <parameter type-id='type-id-101' name='data'/>
+      <parameter type-id='type-id-422' 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-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-423' name='oid_size'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-423' name='oid_size'/>
+      <parameter type-id='type-id-101' name='oid'/>
+      <parameter type-id='type-id-422' 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-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-276' name='output'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-275' name='output'/>
+      <parameter type-id='type-id-419' 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-27' name='oid'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-102' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-1008'>
+    <class-decl name='gnutls_x509_policy_st' size-in-bits='1664' is-struct='yes' visibility='default' id='type-id-1011'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='oid' type-id='type-id-377' visibility='default'/>
+        <var-decl name='oid' type-id='type-id-376' 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-1009' visibility='default'/>
+        <var-decl name='qualifier' type-id='type-id-1012' 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-1010'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-1013'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-1011' visibility='default'/>
+        <var-decl name='type' type-id='type-id-1014' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='data' type-id='type-id-377' visibility='default'/>
+        <var-decl name='data' type-id='type-id-376' 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-1012'>
+    <enum-decl name='gnutls_x509_qualifier_t' id='type-id-1015'>
       <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-1012' id='type-id-1011'/>
+    <typedef-decl name='gnutls_x509_qualifier_t' type-id='type-id-1015' id='type-id-1014'/>
 
-    <array-type-def dimensions='1' type-id='type-id-1010' size-in-bits='1536' id='type-id-1009'>
-      <subrange length='8' type-id='type-id-38' id='type-id-134'/>
+    <array-type-def dimensions='1' type-id='type-id-1013' size-in-bits='1536' id='type-id-1012'>
+      <subrange length='8' type-id='type-id-38' id='type-id-455'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-1013'/>
+    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-1016'/>
     <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-10' name='indx'/>
-      <parameter type-id='type-id-1013' name='policy'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-1016' name='policy'/>
+      <parameter type-id='type-id-419' 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-1013' name='policy'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-1016' 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-420' name='critical'/>
-      <parameter type-id='type-id-365' name='pathlen'/>
+      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-364' name='pathlen'/>
       <parameter type-id='type-id-850' name='policyLanguage'/>
       <parameter type-id='type-id-850' name='policy'/>
-      <parameter type-id='type-id-423' name='sizeof_policy'/>
+      <parameter type-id='type-id-422' 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-420' name='skipcerts'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-419' name='skipcerts'/>
+      <parameter type-id='type-id-419' 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-420' name='skipcerts'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-419' name='skipcerts'/>
+      <parameter type-id='type-id-419' 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-420' name='critical'/>
+      <parameter type-id='type-id-419' 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-420' name='critical'/>
-      <parameter type-id='type-id-420' name='ca'/>
-      <parameter type-id='type-id-365' name='pathlen'/>
+      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-419' name='ca'/>
+      <parameter type-id='type-id-364' 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-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ret'/>
-      <parameter type-id='type-id-423' name='ret_size'/>
+      <parameter type-id='type-id-101' name='ret'/>
+      <parameter type-id='type-id-422' 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-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ret'/>
-      <parameter type-id='type-id-423' name='ret_size'/>
+      <parameter type-id='type-id-101' name='ret'/>
+      <parameter type-id='type-id-422' 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-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ian'/>
-      <parameter type-id='type-id-423' name='ian_size'/>
-      <parameter type-id='type-id-420' name='ian_type'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ian'/>
-      <parameter type-id='type-id-423' name='ian_size'/>
-      <parameter type-id='type-id-420' name='ian_type'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ian'/>
-      <parameter type-id='type-id-423' name='ian_size'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-10' name='seq'/>
-      <parameter type-id='type-id-102' name='ian'/>
-      <parameter type-id='type-id-423' name='ian_size'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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'>
@@ -15516,34 +15620,34 @@
     </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-102' name='id'/>
-      <parameter type-id='type-id-423' name='id_size'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-10' name='seq'/>
-      <parameter type-id='type-id-102' name='alt'/>
-      <parameter type-id='type-id-423' name='alt_size'/>
-      <parameter type-id='type-id-420' name='alt_type'/>
-      <parameter type-id='type-id-102' name='serial'/>
-      <parameter type-id='type-id-423' name='serial_size'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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-101' name='serial'/>
+      <parameter type-id='type-id-422' name='serial_size'/>
+      <parameter type-id='type-id-419' 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-102' name='ret'/>
-      <parameter type-id='type-id-423' name='ret_size'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <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'/>
       <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-420' name='critical'/>
+      <parameter type-id='type-id-419' 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'>
@@ -15552,20 +15656,20 @@
     </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-377' name='sig'/>
-      <parameter type-id='type-id-423' name='sig_size'/>
+      <parameter type-id='type-id-376' name='sig'/>
+      <parameter type-id='type-id-422' 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-377' name='oid'/>
-      <parameter type-id='type-id-423' name='oid_size'/>
+      <parameter type-id='type-id-376' name='oid'/>
+      <parameter type-id='type-id-422' 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-377' name='oid'/>
-      <parameter type-id='type-id-423' name='oid_size'/>
+      <parameter type-id='type-id-376' name='oid'/>
+      <parameter type-id='type-id-422' 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'>
@@ -15575,8 +15679,8 @@
     <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-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-423' name='oid_size'/>
+      <parameter type-id='type-id-101' name='oid'/>
+      <parameter type-id='type-id-422' 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'>
@@ -15584,32 +15688,32 @@
       <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-102' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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-276' name='dn'/>
+      <parameter type-id='type-id-275' 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-276' name='dn'/>
+      <parameter type-id='type-id-275' 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-377' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
+      <parameter type-id='type-id-376' name='buf'/>
+      <parameter type-id='type-id-422' 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-10' name='indx'/>
-      <parameter type-id='type-id-102' name='oid'/>
-      <parameter type-id='type-id-423' name='oid_size'/>
+      <parameter type-id='type-id-101' name='oid'/>
+      <parameter type-id='type-id-422' 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'>
@@ -15617,36 +15721,36 @@
       <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-102' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
+      <parameter type-id='type-id-101' name='buf'/>
+      <parameter type-id='type-id-422' 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-276' name='dn'/>
+      <parameter type-id='type-id-275' 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-276' name='dn'/>
+      <parameter type-id='type-id-275' 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-377' name='buf'/>
-      <parameter type-id='type-id-423' name='buf_size'/>
+      <parameter type-id='type-id-376' name='buf'/>
+      <parameter type-id='type-id-422' 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-57' name='data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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'/>
-      <return type-id='type-id-112'/>
+      <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'/>
@@ -15667,19 +15771,19 @@
     </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-102' name='result'/>
-      <parameter type-id='type-id-423' name='result_size'/>
+      <parameter type-id='type-id-101' name='result'/>
+      <parameter type-id='type-id-422' 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-420' name='bits'/>
+      <parameter type-id='type-id-419' 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-422' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-275' 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'>
@@ -15688,46 +15792,46 @@
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crt_import_system_url' mangled-name='_gnutls_x509_crt_import_system_url' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crt_import_pkcs11_url' mangled-name='_gnutls_x509_crt_import_pkcs11_url' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_crt_get_extension' mangled-name='_gnutls_x509_crt_get_extension' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_encode_PKI_params' mangled-name='_gnutls_x509_encode_PKI_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_fingerprint' mangled-name='gnutls_fingerprint' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_policies_erase' mangled-name='_gnutls_x509_policies_erase' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_san_find_type' mangled-name='_gnutls_x509_san_find_type' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509_dn.c' comp-dir-path='/home/nmavrogi/cvs/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-1006' name='dn'/>
-      <parameter type-id='type-id-276' name='str'/>
+      <parameter type-id='type-id-1009' name='dn'/>
+      <parameter type-id='type-id-275' 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-1006' name='dn'/>
-      <parameter type-id='type-id-276' name='str'/>
+      <parameter type-id='type-id-1009' name='dn'/>
+      <parameter type-id='type-id-275' 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-1014'>
+    <class-decl name='gnutls_x509_ava_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-1017'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='oid' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -15738,123 +15842,123 @@
         <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-1014' id='type-id-1015'/>
-    <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-1016'/>
+    <typedef-decl name='gnutls_x509_ava_st' type-id='type-id-1017' id='type-id-1018'/>
+    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-1019'/>
     <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-1006' name='dn'/>
+      <parameter type-id='type-id-1009' name='dn'/>
       <parameter type-id='type-id-22' name='irdn'/>
       <parameter type-id='type-id-22' name='iava'/>
-      <parameter type-id='type-id-1016' name='ava'/>
+      <parameter type-id='type-id-1019' 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-1006' name='dn'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-1009' name='dn'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-275' 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-1006' name='dn'/>
-      <parameter type-id='type-id-422' name='format'/>
-      <parameter type-id='type-id-102' name='output_data'/>
-      <parameter type-id='type-id-423' name='output_data_size'/>
+      <parameter type-id='type-id-1009' name='dn'/>
+      <parameter type-id='type-id-421' name='format'/>
+      <parameter type-id='type-id-101' name='output_data'/>
+      <parameter type-id='type-id-422' 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-1006' name='dn'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-1009' 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-1006' name='dn'/>
+      <parameter type-id='type-id-1009' 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-1007' name='dn'/>
+      <parameter type-id='type-id-1010' 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-1006' name='dn'/>
+      <parameter type-id='type-id-1009' name='dn'/>
       <parameter type-id='type-id-27' name='str'/>
-      <parameter type-id='type-id-427' name='err'/>
+      <parameter type-id='type-id-426' 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-766' name='crq'/>
       <parameter type-id='type-id-27' name='dn'/>
-      <parameter type-id='type-id-427' name='err'/>
+      <parameter type-id='type-id-426' 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-27' name='dn'/>
-      <parameter type-id='type-id-427' name='err'/>
+      <parameter type-id='type-id-426' 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-27' name='dn'/>
-      <parameter type-id='type-id-427' name='err'/>
+      <parameter type-id='type-id-426' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hex_decode2' mangled-name='gnutls_hex_decode2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_dn_oid_known' mangled-name='gnutls_x509_dn_oid_known' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ldap_string_to_oid' mangled-name='_gnutls_ldap_string_to_oid' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509_write.c' comp-dir-path='/home/nmavrogi/cvs/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-756' 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-1008' const='yes' id='type-id-1017'/>
-    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1018'/>
+    <qualified-type-def type-id='type-id-1011' const='yes' 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_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-1018' name='policy'/>
+      <parameter type-id='type-id-1021' 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-22' name='what'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-275' 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-402' name='issuer_key'/>
-      <parameter type-id='type-id-212' name='dig'/>
+      <parameter type-id='type-id-401' name='issuer_key'/>
+      <parameter type-id='type-id-211' 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-102' name='oid'/>
+      <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-102' name='id'/>
-      <parameter type-id='type-id-100' name='id_size'/>
+      <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-102' name='id'/>
-      <parameter type-id='type-id-100' name='id_size'/>
+      <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'>
@@ -15864,35 +15968,35 @@
     </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-969' name='type'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <parameter type-id='type-id-973' 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-969' name='type'/>
-      <parameter type-id='type-id-102' name='data_string'/>
+      <parameter type-id='type-id-973' 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-102' name='id'/>
-      <parameter type-id='type-id-100' name='id_size'/>
+      <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-102' name='id'/>
-      <parameter type-id='type-id-100' name='id_size'/>
+      <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-102' name='serial'/>
-      <parameter type-id='type-id-100' name='serial_size'/>
+      <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'>
@@ -15908,14 +16012,14 @@
     <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-384' name='issuer_key'/>
+      <parameter type-id='type-id-383' 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-384' name='issuer_key'/>
-      <parameter type-id='type-id-212' name='dig'/>
+      <parameter type-id='type-id-383' name='issuer_key'/>
+      <parameter type-id='type-id-211' name='dig'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -15930,13 +16034,13 @@
       <parameter type-id='type-id-22' name='pathLenConstraint'/>
       <parameter type-id='type-id-27' name='policyLanguage'/>
       <parameter type-id='type-id-27' name='policy'/>
-      <parameter type-id='type-id-100' name='sizeof_policy'/>
+      <parameter type-id='type-id-99' name='sizeof_policy'/>
       <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-27' name='oid'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <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'/>
@@ -15944,30 +16048,30 @@
     <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-27' name='oid'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <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_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-969' name='type'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <parameter type-id='type-id-973' 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-969' name='type'/>
-      <parameter type-id='type-id-102' name='data'/>
+      <parameter type-id='type-id-973' 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-969' name='type'/>
+      <parameter type-id='type-id-973' name='type'/>
       <parameter type-id='type-id-27' name='data_string'/>
       <return type-id='type-id-22'/>
     </function-decl>
@@ -15995,8 +16099,8 @@
     <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-27' name='oid'/>
-      <parameter type-id='type-id-102' name='buf'/>
-      <parameter type-id='type-id-100' name='sizeof_buf'/>
+      <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>
@@ -16012,7 +16116,7 @@
     </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-384' name='key'/>
+      <parameter type-id='type-id-383' 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'>
@@ -16024,7 +16128,7 @@
       <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-467' name='eecrt'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
-      <parameter type-id='type-id-102' name='name'/>
+      <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>
@@ -16032,7 +16136,7 @@
       <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
-      <parameter type-id='type-id-102' name='name'/>
+      <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>
@@ -16040,7 +16144,7 @@
       <parameter type-id='type-id-467' name='crt'/>
       <parameter type-id='type-id-27' name='oid'/>
       <parameter type-id='type-id-10' name='raw_flag'/>
-      <parameter type-id='type-id-102' name='name'/>
+      <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>
@@ -16052,61 +16156,61 @@
       <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_policies' mangled-name='gnutls_x509_ext_export_policies' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_aia_set' mangled-name='gnutls_x509_aia_set' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_ext_export_aia' mangled-name='gnutls_x509_ext_export_aia' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_check_cert_sanity' mangled-name='_gnutls_check_cert_sanity' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crq_verify' mangled-name='gnutls_x509_crq_verify' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/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-1019'>
+  <abi-instr version='1.0' address-size='64' path='name_constraints.c' comp-dir-path='/home/nmavrogi/cvs/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-1022'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='permitted' type-id='type-id-1020' visibility='default'/>
+        <var-decl name='permitted' type-id='type-id-1023' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='excluded' type-id='type-id-1020' visibility='default'/>
+        <var-decl name='excluded' type-id='type-id-1023' 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-1021'>
+    <class-decl name='name_constraints_node_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-1024'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -16114,94 +16218,94 @@
         <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-1020' visibility='default'/>
+        <var-decl name='next' type-id='type-id-1023' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1021' size-in-bits='64' id='type-id-1020'/>
-    <pointer-type-def type-id='type-id-1019' size-in-bits='64' id='type-id-1022'/>
-    <typedef-decl name='gnutls_x509_name_constraints_t' type-id='type-id-1022' id='type-id-1023'/>
+    <pointer-type-def type-id='type-id-1024' size-in-bits='64' id='type-id-1023'/>
+    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-1025'/>
+    <typedef-decl name='gnutls_x509_name_constraints_t' type-id='type-id-1025' id='type-id-1026'/>
     <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-1023' name='nc'/>
-      <parameter type-id='type-id-969' name='type'/>
+      <parameter type-id='type-id-1026' name='nc'/>
+      <parameter type-id='type-id-973' name='type'/>
       <parameter type-id='type-id-467' 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-1023' name='nc'/>
-      <parameter type-id='type-id-969' name='type'/>
+      <parameter type-id='type-id-1026' name='nc'/>
+      <parameter type-id='type-id-973' 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-1023' name='nc'/>
+      <parameter type-id='type-id-1026' 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-1023' name='nc'/>
-      <parameter type-id='type-id-969' name='type'/>
+      <parameter type-id='type-id-1026' name='nc'/>
+      <parameter type-id='type-id-973' 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-1023' name='nc'/>
-      <parameter type-id='type-id-969' name='type'/>
+      <parameter type-id='type-id-1026' name='nc'/>
+      <parameter type-id='type-id-973' 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-1023' name='nc'/>
-      <parameter type-id='type-id-1023' name='nc2'/>
+      <parameter type-id='type-id-1026' name='nc'/>
+      <parameter type-id='type-id-1026' name='nc2'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1024'/>
+    <pointer-type-def type-id='type-id-1026' size-in-bits='64' id='type-id-1027'/>
     <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-1024' name='nc'/>
+      <parameter type-id='type-id-1027' 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-1023' name='nc'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-1026' 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-1023' name='nc'/>
+      <parameter type-id='type-id-1026' name='nc'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-419' 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-1023' name='nc'/>
+      <parameter type-id='type-id-1026' name='nc'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-420' name='type'/>
-      <parameter type-id='type-id-276' name='name'/>
+      <parameter type-id='type-id-419' name='type'/>
+      <parameter type-id='type-id-275' 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-1023' name='nc'/>
+      <parameter type-id='type-id-1026' name='nc'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-420' name='type'/>
-      <parameter type-id='type-id-276' name='name'/>
+      <parameter type-id='type-id-419' name='type'/>
+      <parameter type-id='type-id-275' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_mask_ip' mangled-name='_gnutls_mask_ip' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_parse_general_name2' mangled-name='_gnutls_parse_general_name2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_mask_to_prefix' mangled-name='_gnutls_mask_to_prefix' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='verify-high.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/x509' language='LANG_C99'>
     <class-decl name='node_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-459'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='trusted_cas' type-id='type-id-458' visibility='default'/>
@@ -16210,7 +16314,7 @@
         <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-1025' visibility='default'/>
+        <var-decl name='named_certs' type-id='type-id-1028' 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'/>
@@ -16222,52 +16326,52 @@
         <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-1026'>
+    <class-decl name='named_cert_st' size-in-bits='2176' is-struct='yes' visibility='default' id='type-id-1029'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='cert' type-id='type-id-467' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='name' type-id='type-id-317' visibility='default'/>
+        <var-decl name='name' type-id='type-id-316' 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-1026' size-in-bits='64' id='type-id-1025'/>
-    <typedef-decl name='gnutls_verify_output_function' type-id='type-id-1027' id='type-id-1028'/>
-    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-1029'/>
+    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1028'/>
+    <typedef-decl name='gnutls_verify_output_function' type-id='type-id-1030' 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_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-436' name='list'/>
+      <parameter type-id='type-id-435' name='list'/>
       <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-102' name='name'/>
-      <parameter type-id='type-id-100' name='name_size'/>
+      <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-420' name='voutput'/>
-      <parameter type-id='type-id-1029' name='func'/>
+      <parameter type-id='type-id-419' name='voutput'/>
+      <parameter type-id='type-id-1032' 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-436' name='list'/>
+      <parameter type-id='type-id-435' name='list'/>
       <parameter type-id='type-id-458' name='cert_list'/>
       <parameter type-id='type-id-10' name='cert_list_size'/>
-      <parameter type-id='type-id-173' name='data'/>
+      <parameter type-id='type-id-172' name='data'/>
       <parameter type-id='type-id-10' name='elements'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-420' name='voutput'/>
-      <parameter type-id='type-id-1029' name='func'/>
+      <parameter type-id='type-id-419' name='voutput'/>
+      <parameter type-id='type-id-1032' 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-436' name='list'/>
+      <parameter type-id='type-id-435' name='list'/>
       <parameter type-id='type-id-458' 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-420' name='voutput'/>
-      <parameter type-id='type-id-1029' name='func'/>
+      <parameter type-id='type-id-419' name='voutput'/>
+      <parameter type-id='type-id-1032' 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-436' name='list'/>
+      <parameter type-id='type-id-435' 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'/>
@@ -16275,42 +16379,42 @@
       <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-436' name='list'/>
+      <parameter type-id='type-id-435' name='list'/>
       <parameter type-id='type-id-57' name='dn'/>
       <parameter type-id='type-id-458' 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-436' name='list'/>
+      <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-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-436' name='list'/>
-      <parameter type-id='type-id-1004' name='crl_list'/>
+      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-1007' 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-436' name='list'/>
+      <parameter type-id='type-id-435' name='list'/>
       <parameter type-id='type-id-467' name='cert'/>
-      <parameter type-id='type-id-102' name='name'/>
-      <parameter type-id='type-id-100' name='name_size'/>
+      <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-436' name='list'/>
-      <parameter type-id='type-id-1002' name='clist'/>
+      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-1005' 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-1030'>
+    <class-decl name='gnutls_x509_trust_list_iter' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-1033'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='node_index' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -16318,7 +16422,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-916' visibility='default'/>
+        <var-decl name='pkcs11_list' type-id='type-id-920' 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'/>
@@ -16327,74 +16431,74 @@
         <var-decl name='pkcs11_size' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1030' size-in-bits='64' id='type-id-1031'/>
-    <typedef-decl name='gnutls_x509_trust_list_iter_t' type-id='type-id-1031' id='type-id-1032'/>
+    <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1034'/>
+    <typedef-decl name='gnutls_x509_trust_list_iter_t' type-id='type-id-1034' id='type-id-1035'/>
     <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-1032' name='iter'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-1035' name='iter'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-1033'/>
+    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1036'/>
     <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-436' name='list'/>
-      <parameter type-id='type-id-1033' name='iter'/>
+      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-1036' name='iter'/>
       <parameter type-id='type-id-458' 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-436' name='list'/>
-      <parameter type-id='type-id-1002' name='clist'/>
+      <parameter type-id='type-id-435' name='list'/>
+      <parameter type-id='type-id-1005' 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-436' name='list'/>
+      <parameter type-id='type-id-435' name='list'/>
       <parameter type-id='type-id-10' name='all'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-1034'/>
+    <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-1037'/>
     <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-1034' name='list'/>
+      <parameter type-id='type-id-1037' 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-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_verify_crt_status' mangled-name='_gnutls_verify_crt_status' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_check_hostname2' mangled-name='gnutls_x509_crt_check_hostname2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crt_check_email' mangled-name='gnutls_x509_crt_check_email' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pkcs11_verify_crt_status' mangled-name='_gnutls_pkcs11_verify_crt_status' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs11_get_raw_issuer_by_subject_key_id' mangled-name='gnutls_pkcs11_get_raw_issuer_by_subject_key_id' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_verify' mangled-name='gnutls_x509_crl_verify' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1027'>
+    <function-type size-in-bits='64' id='type-id-1030'>
       <parameter type-id='type-id-467'/>
       <parameter type-id='type-id-467'/>
       <parameter type-id='type-id-728'/>
@@ -16402,144 +16506,144 @@
       <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='verify-high2.c' comp-dir-path='/home/nmavrogi/cvs/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-436' name='list'/>
+      <parameter type-id='type-id-435' name='list'/>
       <parameter type-id='type-id-27' name='ca_file'/>
-      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-421' 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-436' name='list'/>
+      <parameter type-id='type-id-435' 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-422' name='type'/>
+      <parameter type-id='type-id-421' 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-436' name='list'/>
+      <parameter type-id='type-id-435' 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-422' name='type'/>
+      <parameter type-id='type-id-421' 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-436' name='list'/>
+      <parameter type-id='type-id-435' name='list'/>
       <parameter type-id='type-id-57' name='cas'/>
-      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-421' 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-436' name='list'/>
+      <parameter type-id='type-id-435' name='list'/>
       <parameter type-id='type-id-57' name='cas'/>
       <parameter type-id='type-id-57' name='crls'/>
-      <parameter type-id='type-id-422' name='type'/>
+      <parameter type-id='type-id-421' 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_crt_list_import_pkcs11' mangled-name='gnutls_x509_crt_list_import_pkcs11' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='opendir' mangled-name='opendir' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='readdir' mangled-name='readdir' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='closedir' mangled-name='closedir' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_crl_list_import2' mangled-name='gnutls_x509_crl_list_import2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='x509_ext.c' comp-dir-path='/home/nmavrogi/cvs/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-967' name='f'/>
+      <parameter type-id='type-id-971' 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-967' name='f'/>
-      <parameter type-id='type-id-276' name='ext'/>
+      <parameter type-id='type-id-971' name='f'/>
+      <parameter type-id='type-id-275' 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-967' name='f'/>
+      <parameter type-id='type-id-971' 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-927' name='ext'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-931' 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-1035'>
+    <class-decl name='gnutls_x509_key_purposes_st' size-in-bits='8256' is-struct='yes' visibility='default' id='type-id-1038'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='oid' type-id='type-id-1036' visibility='default'/>
+        <var-decl name='oid' type-id='type-id-1039' 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-1036'>
-      <subrange length='64' type-id='type-id-38' id='type-id-93'/>
+    <array-type-def dimensions='1' type-id='type-id-62' size-in-bits='8192' id='type-id-1039'>
+      <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1037'/>
-    <typedef-decl name='gnutls_x509_key_purposes_t' type-id='type-id-1037' id='type-id-1038'/>
+    <pointer-type-def type-id='type-id-1038' size-in-bits='64' id='type-id-1040'/>
+    <typedef-decl name='gnutls_x509_key_purposes_t' type-id='type-id-1040' id='type-id-1041'/>
     <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-1038' name='p'/>
-      <parameter type-id='type-id-276' name='ext'/>
+      <parameter type-id='type-id-1041' name='p'/>
+      <parameter type-id='type-id-275' 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-1038' name='p'/>
+      <parameter type-id='type-id-1041' 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-1038' name='p'/>
+      <parameter type-id='type-id-1041' name='p'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-276' name='oid'/>
+      <parameter type-id='type-id-275' 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-1038' name='p'/>
+      <parameter type-id='type-id-1041' 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-1038' name='p'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-1041' name='p'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1038' size-in-bits='64' id='type-id-1039'/>
+    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-1042'/>
     <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-1039' name='p'/>
+      <parameter type-id='type-id-1042' 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-1040'>
+    <class-decl name='gnutls_x509_aia_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1043'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='aia' type-id='type-id-1041' visibility='default'/>
+        <var-decl name='aia' type-id='type-id-1044' 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-1042'>
+    <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-1045'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='oid' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -16550,53 +16654,53 @@
         <var-decl name='san' type-id='type-id-62' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-1041'/>
-    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1043'/>
-    <typedef-decl name='gnutls_x509_aia_t' type-id='type-id-1043' id='type-id-1044'/>
+    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1044'/>
+    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1046'/>
+    <typedef-decl name='gnutls_x509_aia_t' type-id='type-id-1046' id='type-id-1047'/>
     <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-1044' name='aia'/>
-      <parameter type-id='type-id-276' name='ext'/>
+      <parameter type-id='type-id-1047' name='aia'/>
+      <parameter type-id='type-id-275' 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-1044' name='aia'/>
+      <parameter type-id='type-id-1047' 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-1044' name='aia'/>
+      <parameter type-id='type-id-1047' 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-1044' name='aia'/>
+      <parameter type-id='type-id-1047' name='aia'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-276' name='oid'/>
-      <parameter type-id='type-id-420' name='san_type'/>
-      <parameter type-id='type-id-276' name='san'/>
+      <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'/>
       <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-1044' name='aia'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-1047' name='aia'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-1045'/>
+    <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1048'/>
     <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-1045' name='aia'/>
+      <parameter type-id='type-id-1048' 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-1046'>
+    <class-decl name='gnutls_x509_crl_dist_points_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1049'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='points' type-id='type-id-1047' visibility='default'/>
+        <var-decl name='points' type-id='type-id-1050' 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-1048'>
+    <class-decl name='crl_dist_point_st' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-1051'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-10' visibility='default'/>
       </data-member>
@@ -16607,122 +16711,122 @@
         <var-decl name='reasons' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1048' size-in-bits='64' id='type-id-1047'/>
-    <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1049'/>
-    <typedef-decl name='gnutls_x509_crl_dist_points_t' type-id='type-id-1049' id='type-id-1050'/>
+    <pointer-type-def type-id='type-id-1051' size-in-bits='64' id='type-id-1050'/>
+    <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1052'/>
+    <typedef-decl name='gnutls_x509_crl_dist_points_t' type-id='type-id-1052' id='type-id-1053'/>
     <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-1050' name='cdp'/>
-      <parameter type-id='type-id-276' name='ext'/>
+      <parameter type-id='type-id-1053' name='cdp'/>
+      <parameter type-id='type-id-275' 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-1050' name='cdp'/>
+      <parameter type-id='type-id-1053' 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-1050' name='cdp'/>
-      <parameter type-id='type-id-969' name='type'/>
+      <parameter type-id='type-id-1053' name='cdp'/>
+      <parameter type-id='type-id-973' 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-1050' name='cdp'/>
+      <parameter type-id='type-id-1053' name='cdp'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-420' name='type'/>
-      <parameter type-id='type-id-276' name='san'/>
-      <parameter type-id='type-id-420' name='reasons'/>
+      <parameter type-id='type-id-419' name='type'/>
+      <parameter type-id='type-id-275' name='san'/>
+      <parameter type-id='type-id-419' 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-1050' name='cdp'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-1053' name='cdp'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1050' size-in-bits='64' id='type-id-1051'/>
+    <pointer-type-def type-id='type-id-1053' size-in-bits='64' id='type-id-1054'/>
     <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-1051' name='cdp'/>
+      <parameter type-id='type-id-1054' 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-1052'>
+    <class-decl name='gnutls_x509_policies_st' size-in-bits='106560' is-struct='yes' visibility='default' id='type-id-1055'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='policy' type-id='type-id-1053' visibility='default'/>
+        <var-decl name='policy' type-id='type-id-1056' 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-1008' size-in-bits='106496' id='type-id-1053'>
-      <subrange length='64' type-id='type-id-38' id='type-id-93'/>
+    <array-type-def dimensions='1' type-id='type-id-1011' size-in-bits='106496' id='type-id-1056'>
+      <subrange length='64' type-id='type-id-38' id='type-id-92'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-1054'/>
-    <typedef-decl name='gnutls_x509_policies_t' type-id='type-id-1054' id='type-id-1055'/>
+    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-1057'/>
+    <typedef-decl name='gnutls_x509_policies_t' type-id='type-id-1057' id='type-id-1058'/>
     <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-1055' name='policies'/>
-      <parameter type-id='type-id-276' name='ext'/>
+      <parameter type-id='type-id-1058' name='policies'/>
+      <parameter type-id='type-id-275' 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-1055' name='policies'/>
+      <parameter type-id='type-id-1058' 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-1055' name='policies'/>
-      <parameter type-id='type-id-1018' name='policy'/>
+      <parameter type-id='type-id-1058' name='policies'/>
+      <parameter type-id='type-id-1021' 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-1055' name='policies'/>
+      <parameter type-id='type-id-1058' name='policies'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-1013' name='policy'/>
+      <parameter type-id='type-id-1016' 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-1055' name='policies'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-1058' name='policies'/>
+      <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-1058' size-in-bits='64' id='type-id-1059'/>
     <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-1056' name='policies'/>
+      <parameter type-id='type-id-1059' 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'>
       <parameter type-id='type-id-22' name='pathLenConstraint'/>
       <parameter type-id='type-id-27' name='policyLanguage'/>
       <parameter type-id='type-id-27' name='policy'/>
-      <parameter type-id='type-id-100' name='sizeof_policy'/>
-      <parameter type-id='type-id-276' name='ext'/>
+      <parameter type-id='type-id-99' name='sizeof_policy'/>
+      <parameter type-id='type-id-275' 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-365' name='pathlen'/>
+      <parameter type-id='type-id-364' name='pathlen'/>
       <parameter type-id='type-id-850' name='policyLanguage'/>
       <parameter type-id='type-id-850' name='policy'/>
-      <parameter type-id='type-id-423' name='sizeof_policy'/>
+      <parameter type-id='type-id-422' 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-276' name='ext'/>
+      <parameter type-id='type-id-275' 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-420' name='ca'/>
-      <parameter type-id='type-id-365' name='pathlen'/>
+      <parameter type-id='type-id-419' name='ca'/>
+      <parameter type-id='type-id-364' 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-276' name='ext'/>
+      <parameter type-id='type-id-275' 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'>
@@ -16733,25 +16837,25 @@
     </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-276' name='ext'/>
+      <parameter type-id='type-id-275' 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-420' name='skipcerts'/>
+      <parameter type-id='type-id-419' 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-276' name='ext'/>
+      <parameter type-id='type-id-275' 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-420' name='key_usage'/>
+      <parameter type-id='type-id-419' 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-1057'>
+    <class-decl name='gnutls_x509_aki_st' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1060'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='id' type-id='type-id-62' visibility='default'/>
       </data-member>
@@ -16764,13 +16868,13 @@
     </class-decl>
     <class-decl name='gnutls_subject_alt_names_st' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-463'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='names' type-id='type-id-1058' visibility='default'/>
+        <var-decl name='names' 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='name_st' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-1059'>
+    <class-decl name='name_st' size-in-bits='320' 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>
@@ -16781,31 +16885,31 @@
         <var-decl name='othername_oid' type-id='type-id-62' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1059' size-in-bits='64' id='type-id-1058'/>
-    <pointer-type-def type-id='type-id-1057' size-in-bits='64' id='type-id-1060'/>
-    <typedef-decl name='gnutls_x509_aki_t' type-id='type-id-1060' id='type-id-1061'/>
+    <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_aki_t' type-id='type-id-1063' id='type-id-1064'/>
     <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-1061' name='aki'/>
-      <parameter type-id='type-id-276' name='ext'/>
+      <parameter type-id='type-id-1064' name='aki'/>
+      <parameter type-id='type-id-275' 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-1061' name='aki'/>
+      <parameter type-id='type-id-1064' 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-1061' name='aki'/>
+      <parameter type-id='type-id-1064' name='aki'/>
       <parameter type-id='type-id-10' name='seq'/>
-      <parameter type-id='type-id-420' name='san_type'/>
-      <parameter type-id='type-id-276' name='san'/>
-      <parameter type-id='type-id-276' name='othername_oid'/>
-      <parameter type-id='type-id-276' name='serial'/>
+      <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'/>
       <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-1061' name='aki'/>
+      <parameter type-id='type-id-1064' 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'/>
@@ -16813,48 +16917,48 @@
       <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-1061' name='aki'/>
+      <parameter type-id='type-id-1064' 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-1061' name='aki'/>
-      <parameter type-id='type-id-276' name='id'/>
+      <parameter type-id='type-id-1064' name='aki'/>
+      <parameter type-id='type-id-275' 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-1061' name='aki'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-1064' name='aki'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1061' size-in-bits='64' id='type-id-1062'/>
+    <pointer-type-def type-id='type-id-1064' size-in-bits='64' id='type-id-1065'/>
     <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-1062' name='aki'/>
+      <parameter type-id='type-id-1065' 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-276' name='ext'/>
+      <parameter type-id='type-id-275' 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-276' name='id'/>
+      <parameter type-id='type-id-275' 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-1023' name='nc'/>
-      <parameter type-id='type-id-276' name='ext'/>
+      <parameter type-id='type-id-1026' name='nc'/>
+      <parameter type-id='type-id-275' 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-1023' name='nc'/>
+      <parameter type-id='type-id-1026' 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-276' name='ext'/>
+      <parameter type-id='type-id-275' 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'>
@@ -16873,52 +16977,52 @@
     <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-10' name='seq'/>
-      <parameter type-id='type-id-420' name='san_type'/>
-      <parameter type-id='type-id-276' name='san'/>
-      <parameter type-id='type-id-276' name='othername_oid'/>
+      <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'/>
       <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'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-461' size-in-bits='64' id='type-id-1063'/>
+    <pointer-type-def type-id='type-id-461' size-in-bits='64' id='type-id-1066'/>
     <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-1063' name='sans'/>
+      <parameter type-id='type-id-1066' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_idna_email_map' mangled-name='_gnutls_idna_email_map' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_write_new_general_name' mangled-name='_gnutls_write_new_general_name' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_policy_release' mangled-name='gnutls_x509_policy_release' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_read_der_uint' mangled-name='_gnutls_x509_read_der_uint' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_extract_name_constraints' mangled-name='_gnutls_extract_name_constraints' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_name_constraints_node_free' mangled-name='_gnutls_name_constraints_node_free' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_write_new_othername' mangled-name='_gnutls_write_new_othername' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_alt_name_assign_virt_type' mangled-name='_gnutls_alt_name_assign_virt_type' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='email-verify.c' comp-dir-path='/home/nmavrogi/cvs/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-27' name='email'/>
@@ -16926,150 +17030,150 @@
       <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pkcs7-output.c' comp-dir-path='/home/nmavrogi/cvs/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-990' name='pkcs7'/>
-      <parameter type-id='type-id-972' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-993' name='pkcs7'/>
+      <parameter type-id='type-id-976' name='format'/>
+      <parameter type-id='type-id-275' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_pkcs7_get_signature_info' mangled-name='gnutls_pkcs7_get_signature_info' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_hex_encode2' mangled-name='gnutls_hex_encode2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='virt-san.c' comp-dir-path='/home/nmavrogi/cvs/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-420' name='virt_type'/>
-      <parameter type-id='type-id-276' name='virt'/>
+      <parameter type-id='type-id-419' name='virt_type'/>
+      <parameter type-id='type-id-275' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_krb5_principal_to_der' mangled-name='_gnutls_krb5_principal_to_der' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_alt_name_process' mangled-name='_gnutls_alt_name_process' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='spki.c' comp-dir-path='/home/nmavrogi/cvs/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-755' name='spki'/>
-      <parameter type-id='type-id-432' name='dig'/>
-      <parameter type-id='type-id-420' name='salt_size'/>
+      <parameter type-id='type-id-431' name='dig'/>
+      <parameter type-id='type-id-419' 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-755' name='spki'/>
-      <parameter type-id='type-id-212' name='dig'/>
+      <parameter type-id='type-id-211' name='dig'/>
       <parameter type-id='type-id-10' name='salt_size'/>
-      <return type-id='type-id-112'/>
+      <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-755' name='spki'/>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-755' size-in-bits='64' id='type-id-1064'/>
+    <pointer-type-def type-id='type-id-755' size-in-bits='64' id='type-id-1067'/>
     <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-1064' name='spki'/>
+      <parameter type-id='type-id-1067' 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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='tls_features.c' comp-dir-path='/home/nmavrogi/cvs/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-967' name='feat'/>
+      <parameter type-id='type-id-971' name='feat'/>
       <parameter type-id='type-id-467' 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-967' name='features'/>
+      <parameter type-id='type-id-971' 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-967' name='features'/>
+      <parameter type-id='type-id-971' name='features'/>
       <parameter type-id='type-id-10' name='flags'/>
-      <parameter type-id='type-id-420' name='critical'/>
+      <parameter type-id='type-id-419' 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-967' name='f'/>
+      <parameter type-id='type-id-971' name='f'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-420' name='feature'/>
+      <parameter type-id='type-id-419' 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-967' name='f'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-971' name='f'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-967' size-in-bits='64' id='type-id-1065'/>
+    <pointer-type-def type-id='type-id-971' size-in-bits='64' id='type-id-1068'/>
     <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-1065' name='f'/>
+      <parameter type-id='type-id-1068' 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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ip.c' comp-dir-path='/home/nmavrogi/cvs/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-276' name='cidr_rfc5280'/>
+      <parameter type-id='type-id-275' 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-102' name='_ip'/>
+      <parameter type-id='type-id-101' name='_ip'/>
       <parameter type-id='type-id-10' name='ip_size'/>
-      <parameter type-id='type-id-377' name='out'/>
+      <parameter type-id='type-id-376' 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-102' name='_ip'/>
+      <parameter type-id='type-id-101' name='_ip'/>
       <parameter type-id='type-id-10' name='ip_size'/>
-      <parameter type-id='type-id-377' name='out'/>
+      <parameter type-id='type-id-376' name='out'/>
       <parameter type-id='type-id-10' name='out_size'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='inet_ntop' mangled-name='inet_ntop' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/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-1066'>
+  <abi-instr version='1.0' address-size='64' path='ocsp.c' comp-dir-path='/home/nmavrogi/cvs/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-1069'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='resp' type-id='type-id-388' visibility='default'/>
+        <var-decl name='resp' type-id='type-id-387' 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-388' visibility='default'/>
+        <var-decl name='basicresp' type-id='type-id-387' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='der' type-id='type-id-62' visibility='default'/>
@@ -17078,773 +17182,779 @@
         <var-decl name='init' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1066' size-in-bits='64' id='type-id-1067'/>
-    <typedef-decl name='gnutls_ocsp_resp_t' type-id='type-id-1067' id='type-id-1068'/>
-    <pointer-type-def type-id='type-id-1068' size-in-bits='64' id='type-id-1069'/>
     <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-1070'/>
+    <typedef-decl name='gnutls_ocsp_resp_t' type-id='type-id-1070' id='type-id-1071'/>
+    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-1072'/>
+    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-1073'/>
     <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-1070' name='ocsps'/>
-      <parameter type-id='type-id-420' name='size'/>
+      <parameter type-id='type-id-1073' name='ocsps'/>
+      <parameter type-id='type-id-419' name='size'/>
       <parameter type-id='type-id-57' name='resp_data'/>
-      <parameter type-id='type-id-422' name='format'/>
+      <parameter type-id='type-id-421' 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-1069' const='yes' id='type-id-1074'/>
+    <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-1075'/>
+    <typedef-decl name='gnutls_ocsp_resp_const_t' type-id='type-id-1075' id='type-id-1076'/>
     <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-1068' name='resp'/>
-      <parameter type-id='type-id-436' name='trustlist'/>
-      <parameter type-id='type-id-420' name='verify'/>
+      <parameter type-id='type-id-1076' name='resp'/>
+      <parameter type-id='type-id-435' name='trustlist'/>
+      <parameter type-id='type-id-419' 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-1068' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-467' name='issuer'/>
-      <parameter type-id='type-id-420' name='verify'/>
+      <parameter type-id='type-id-419' name='verify'/>
       <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <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-1068' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-731' name='certs'/>
-      <parameter type-id='type-id-423' name='ncerts'/>
+      <parameter type-id='type-id-422' 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-1068' name='resp'/>
+      <parameter type-id='type-id-1076' 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-1068' name='resp'/>
-      <parameter type-id='type-id-420' name='critical'/>
-      <parameter type-id='type-id-276' name='nonce'/>
+      <parameter type-id='type-id-1076' name='resp'/>
+      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-275' 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-1068' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-276' name='oid'/>
-      <parameter type-id='type-id-420' name='critical'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-275' name='oid'/>
+      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-275' 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-1068' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-432' name='digest'/>
-      <parameter type-id='type-id-276' name='issuer_name_hash'/>
-      <parameter type-id='type-id-276' name='issuer_key_hash'/>
-      <parameter type-id='type-id-276' name='serial_number'/>
-      <parameter type-id='type-id-420' name='cert_status'/>
+      <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-420' name='revocation_reason'/>
+      <parameter type-id='type-id-419' 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-1068' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-10' name='indx'/>
       <parameter type-id='type-id-467' 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-1068' name='resp'/>
+      <parameter type-id='type-id-1076' 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-1068' name='resp'/>
+      <parameter type-id='type-id-1076' name='resp'/>
       <parameter type-id='type-id-10' name='type'/>
-      <parameter type-id='type-id-276' name='raw'/>
+      <parameter type-id='type-id-275' 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-1068' name='resp'/>
-      <parameter type-id='type-id-276' name='dn'/>
+      <parameter type-id='type-id-1076' name='resp'/>
+      <parameter type-id='type-id-275' 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-1068' name='resp'/>
+      <parameter type-id='type-id-1076' 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-1068' name='resp'/>
-      <parameter type-id='type-id-276' name='response_type_oid'/>
-      <parameter type-id='type-id-276' name='response'/>
+      <parameter type-id='type-id-1076' name='resp'/>
+      <parameter type-id='type-id-275' name='response_type_oid'/>
+      <parameter type-id='type-id-275' 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-1068' name='resp'/>
+      <parameter type-id='type-id-1076' 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-1071'>
+    <class-decl name='gnutls_ocsp_req_int' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-1077'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='req' type-id='type-id-388' visibility='default'/>
+        <var-decl name='req' type-id='type-id-387' 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-1071' size-in-bits='64' id='type-id-1072'/>
-    <typedef-decl name='gnutls_ocsp_req_t' type-id='type-id-1072' id='type-id-1073'/>
+    <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-1078'/>
+    <typedef-decl name='gnutls_ocsp_req_t' type-id='type-id-1078' id='type-id-1079'/>
     <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-1073' name='req'/>
+      <parameter type-id='type-id-1079' 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-1073' name='req'/>
+      <parameter type-id='type-id-1079' 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-1077' const='yes' id='type-id-1080'/>
+    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1081'/>
+    <typedef-decl name='gnutls_ocsp_req_const_t' type-id='type-id-1081' id='type-id-1082'/>
     <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-1073' name='req'/>
-      <parameter type-id='type-id-420' name='critical'/>
-      <parameter type-id='type-id-276' name='nonce'/>
+      <parameter type-id='type-id-1082' name='req'/>
+      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-275' 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-1073' name='req'/>
+      <parameter type-id='type-id-1079' 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-1073' name='req'/>
+      <parameter type-id='type-id-1082' name='req'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-276' name='oid'/>
-      <parameter type-id='type-id-420' name='critical'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-275' name='oid'/>
+      <parameter type-id='type-id-419' name='critical'/>
+      <parameter type-id='type-id-275' 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-1073' name='req'/>
-      <parameter type-id='type-id-212' name='digest'/>
+      <parameter type-id='type-id-1079' name='req'/>
+      <parameter type-id='type-id-211' name='digest'/>
       <parameter type-id='type-id-467' name='issuer'/>
       <parameter type-id='type-id-467' 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-1073' name='req'/>
-      <parameter type-id='type-id-212' name='digest'/>
+      <parameter type-id='type-id-1079' name='req'/>
+      <parameter type-id='type-id-211' 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-1073' name='req'/>
+      <parameter type-id='type-id-1082' name='req'/>
       <parameter type-id='type-id-10' name='indx'/>
-      <parameter type-id='type-id-432' name='digest'/>
-      <parameter type-id='type-id-276' name='issuer_name_hash'/>
-      <parameter type-id='type-id-276' name='issuer_key_hash'/>
-      <parameter type-id='type-id-276' name='serial_number'/>
+      <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'/>
       <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-1073' name='req'/>
+      <parameter type-id='type-id-1082' 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-1068' name='resp'/>
-      <parameter type-id='type-id-276' name='data'/>
-      <parameter type-id='type-id-422' name='fmt'/>
+      <parameter type-id='type-id-1076' name='resp'/>
+      <parameter type-id='type-id-275' name='data'/>
+      <parameter type-id='type-id-421' 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-1068' name='resp'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-1076' name='resp'/>
+      <parameter type-id='type-id-275' 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-1073' name='req'/>
-      <parameter type-id='type-id-276' name='data'/>
+      <parameter type-id='type-id-1082' name='req'/>
+      <parameter type-id='type-id-275' 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-1068' name='resp'/>
+      <parameter type-id='type-id-1071' name='resp'/>
       <parameter type-id='type-id-57' name='data'/>
-      <parameter type-id='type-id-422' name='fmt'/>
+      <parameter type-id='type-id-421' 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-1068' name='resp'/>
+      <parameter type-id='type-id-1071' 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-1073' name='req'/>
+      <parameter type-id='type-id-1079' 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-1068' name='resp'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-1071' 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-1069' name='resp'/>
+      <parameter type-id='type-id-1072' 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-1073' name='req'/>
-      <return type-id='type-id-112'/>
+      <parameter type-id='type-id-1079' name='req'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-1074'/>
+    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-1083'/>
     <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-1074' name='req'/>
+      <parameter type-id='type-id-1083' 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-1068' name='resp'/>
-      <parameter type-id='type-id-276' name='dn'/>
+      <parameter type-id='type-id-1076' name='resp'/>
+      <parameter type-id='type-id-275' 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-1068' name='resp'/>
-      <parameter type-id='type-id-276' name='sig'/>
+      <parameter type-id='type-id-1076' name='resp'/>
+      <parameter type-id='type-id-275' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_get_extension' mangled-name='_gnutls_get_extension' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_x509_generalTime2gtime' mangled-name='_gnutls_x509_generalTime2gtime' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_set_extension' mangled-name='_gnutls_set_extension' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/x509' language='LANG_C99'>
-    <enum-decl name='gnutls_ocsp_print_formats_t' id='type-id-1075'>
+  <abi-instr version='1.0' address-size='64' path='ocsp_output.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/x509' language='LANG_C99'>
+    <enum-decl name='gnutls_ocsp_print_formats_t' id='type-id-1084'>
       <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-1075' id='type-id-1076'/>
+    <typedef-decl name='gnutls_ocsp_print_formats_t' type-id='type-id-1084' id='type-id-1085'/>
     <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-1068' name='resp'/>
-      <parameter type-id='type-id-1076' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-1076' name='resp'/>
+      <parameter type-id='type-id-1085' name='format'/>
+      <parameter type-id='type-id-275' 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-1073' name='req'/>
-      <parameter type-id='type-id-1076' name='format'/>
-      <parameter type-id='type-id-276' name='out'/>
+      <parameter type-id='type-id-1082' name='req'/>
+      <parameter type-id='type-id-1085' name='format'/>
+      <parameter type-id='type-id-275' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_resp_get_certs' mangled-name='gnutls_ocsp_resp_get_certs' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_sign_is_secure' mangled-name='gnutls_sign_is_secure' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_ocsp_req_get_nonce' mangled-name='gnutls_ocsp_req_get_nonce' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <typedef-decl name='hello_ext_entry_st' type-id='type-id-297' id='type-id-1077'/>
-    <qualified-type-def type-id='type-id-1077' const='yes' id='type-id-1078'/>
-    <var-decl name='ext_mod_max_record_size' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='max_record.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <typedef-decl name='hello_ext_entry_st' type-id='type-id-296' id='type-id-1086'/>
+    <qualified-type-def type-id='type-id-1086' const='yes' id='type-id-1087'/>
+    <var-decl name='ext_mod_max_record_size' type-id='type-id-1087' 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-237' name='session'/>
-      <parameter type-id='type-id-100' name='size'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-100' name='size'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-236' 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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_server_name' type-id='type-id-1078' visibility='default'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1079'>
+  <abi-instr version='1.0' address-size='64' path='server_name.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_server_name' type-id='type-id-1087' visibility='default'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1088'>
       <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-1079' id='type-id-1080'/>
+    <typedef-decl name='gnutls_server_name_type_t' type-id='type-id-1088' id='type-id-1089'/>
     <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-237' name='session'/>
-      <parameter type-id='type-id-1080' name='type'/>
-      <parameter type-id='type-id-102' name='name'/>
-      <parameter type-id='type-id-100' name='name_length'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-1089' 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-237' name='session'/>
-      <parameter type-id='type-id-1080' name='type'/>
-      <parameter type-id='type-id-102' name='name'/>
-      <parameter type-id='type-id-100' name='name_length'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-1089' 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-237' name='session'/>
-      <parameter type-id='type-id-102' name='data'/>
-      <parameter type-id='type-id-423' name='data_length'/>
-      <parameter type-id='type-id-420' name='type'/>
+      <parameter type-id='type-id-236' 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-10' name='indx'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_gnutls_hello_ext_get_datum' mangled-name='_gnutls_hello_ext_get_datum' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hello_ext_get_resumed_datum' mangled-name='_gnutls_hello_ext_get_resumed_datum' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hello_ext_unset_priv' mangled-name='_gnutls_hello_ext_unset_priv' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_hello_ext_set_datum' mangled-name='_gnutls_hello_ext_set_datum' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_sig' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='signature.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_sig' type-id='type-id-1087' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-414' name='session'/>
+      <parameter type-id='type-id-413' 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-1081'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-1090'/>
     <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-414' name='session'/>
-      <parameter type-id='type-id-100' name='indx'/>
-      <parameter type-id='type-id-1081' name='algo'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-99' name='indx'/>
+      <parameter type-id='type-id-1090' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_tls_aid_to_sign' mangled-name='_gnutls_tls_aid_to_sign' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_sr' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='safe_renegotiation.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_sr' type-id='type-id-1087' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_session_ticket' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='session_ticket.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_session_ticket' type-id='type-id-1087' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-276' name='key'/>
+      <parameter type-id='type-id-275' 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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_initialize_session_ticket_key_rotation' mangled-name='_gnutls_initialize_session_ticket_key_rotation' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_key_generate' mangled-name='gnutls_key_generate' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_get_session_ticket_encryption_key' mangled-name='_gnutls_get_session_ticket_encryption_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_get_session_ticket_decryption_key' mangled-name='_gnutls_get_session_ticket_decryption_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_srp' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='srp.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_srp' type-id='type-id-1087' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='heartbeat.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_heartbeat' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='heartbeat.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_heartbeat' type-id='type-id-1087' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-112'/>
+      <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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-100' name='data_size'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-10' name='type'/>
-      <return type-id='type-id-112'/>
+      <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-237' name='session'/>
+      <parameter type-id='type-id-236' 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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_status_request' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='status_request.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_status_request' type-id='type-id-1087' 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-414' name='session'/>
-      <parameter type-id='type-id-276' name='responder_id'/>
-      <parameter type-id='type-id-100' name='responder_id_size'/>
-      <parameter type-id='type-id-276' name='extensions'/>
+      <parameter type-id='type-id-413' name='session'/>
+      <parameter type-id='type-id-275' name='responder_id'/>
+      <parameter type-id='type-id-99' name='responder_id_size'/>
+      <parameter type-id='type-id-275' 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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_dumbfw' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='dumbfw.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_dumbfw' type-id='type-id-1087' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ext_master_secret.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_ext_master_secret' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='ext_master_secret.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_ext_master_secret' type-id='type-id-1087' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_etm' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='etm.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_etm' type-id='type-id-1087' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_supported_versions' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='supported_versions.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_supported_versions' type-id='type-id-1087' 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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_post_handshake' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='post_handshake.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_post_handshake' type-id='type-id-1087' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='key_share.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='key_share.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_tls_id_to_group' mangled-name='_gnutls_tls_id_to_group' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_session_supports_group' mangled-name='_gnutls_session_supports_group' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_cookie' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='cookie.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_cookie' type-id='type-id-1087' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='psk_ke_modes.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_psk_ke_modes' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='psk_ke_modes.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_psk_ke_modes' type-id='type-id-1087' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='pre_shared_key.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_pre_shared_key' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='pre_shared_key.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_pre_shared_key' type-id='type-id-1087' 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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls13_unpack_session_ticket' mangled-name='_gnutls13_unpack_session_ticket' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_tls13_init_secret2' mangled-name='_tls13_init_secret2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_find_psk_key' mangled-name='_gnutls_find_psk_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_supported_groups' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='supported_groups.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_supported_groups' type-id='type-id-1087' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ec_point_formats.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_supported_ec_point_formats' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='ec_point_formats.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_supported_ec_point_formats' type-id='type-id-1087' 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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_early_data' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='early_data.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_early_data' type-id='type-id-1087' 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-237' name='session'/>
-      <parameter type-id='type-id-100' name='size'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-236' 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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_record_size_limit' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='record_size_limit.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_record_size_limit' type-id='type-id-1087' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='client_cert_type.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_client_cert_type' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='client_cert_type.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_client_cert_type' type-id='type-id-1087' 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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_session_client_cert_type_set' mangled-name='_gnutls_session_client_cert_type_set' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_server_cert_type' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='server_cert_type.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_server_cert_type' type-id='type-id-1087' 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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_alpn' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='alpn.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_alpn' type-id='type-id-1087' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-276' name='protocol'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-275' 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/nmavrogi/cvs/gnutls-mine/lib/ext' language='LANG_C99'>
-    <var-decl name='ext_mod_srtp' type-id='type-id-1078' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='srtp.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/ext' language='LANG_C99'>
+    <var-decl name='ext_mod_srtp' type-id='type-id-1087' 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-237' name='session'/>
-      <parameter type-id='type-id-102' name='key_material'/>
+      <parameter type-id='type-id-236' 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-276' name='client_key'/>
-      <parameter type-id='type-id-276' name='client_salt'/>
-      <parameter type-id='type-id-276' name='server_key'/>
-      <parameter type-id='type-id-276' name='server_salt'/>
+      <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'/>
       <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-237' name='session'/>
+      <parameter type-id='type-id-236' name='session'/>
       <parameter type-id='type-id-27' name='profiles'/>
-      <parameter type-id='type-id-427' name='err_pos'/>
+      <parameter type-id='type-id-426' name='err_pos'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1082'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1091'>
       <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-1082' id='type-id-1083'/>
+    <typedef-decl name='gnutls_srtp_profile_t' type-id='type-id-1091' id='type-id-1092'/>
     <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-237' name='session'/>
-      <parameter type-id='type-id-1083' name='profile'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-1092' 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-237' name='session'/>
+      <parameter type-id='type-id-236' 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-237' name='session'/>
-      <parameter type-id='type-id-276' name='mki'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-275' 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-1083' name='profile'/>
+      <parameter type-id='type-id-1092' name='profile'/>
       <return type-id='type-id-27'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-1084'/>
+    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-1093'/>
     <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-1084' name='profile'/>
+      <parameter type-id='type-id-1093' 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-237' name='session'/>
-      <parameter type-id='type-id-1084' name='profile'/>
+      <parameter type-id='type-id-236' name='session'/>
+      <parameter type-id='type-id-1093' 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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='anon.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_figure_dh_params' mangled-name='_gnutls_figure_dh_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_dh_common_print_server_kx' mangled-name='_gnutls_dh_common_print_server_kx' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_proc_dh_common_server_kx' mangled-name='_gnutls_proc_dh_common_server_kx' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='cert.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_sign_to_tls_aid' mangled-name='_gnutls_sign_to_tls_aid' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_handshake_sign_data' mangled-name='_gnutls_handshake_sign_data' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_server_name_get' mangled-name='gnutls_server_name_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_sign_algorithm_write_params' mangled-name='_gnutls_sign_algorithm_write_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_handshake_verify_crt_vrfy' mangled-name='_gnutls_handshake_verify_crt_vrfy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_handshake_sign_crt_vrfy' mangled-name='_gnutls_handshake_sign_crt_vrfy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_x509_rdn_get2' mangled-name='gnutls_x509_rdn_get2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_kx_supports_pk' mangled-name='_gnutls_kx_supports_pk' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_kx_supports_pk_usage' mangled-name='_gnutls_kx_supports_pk_usage' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_kx_encipher_type' mangled-name='_gnutls_kx_encipher_type' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dh_common.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_buffer_append_mpi' mangled-name='_gnutls_buffer_append_mpi' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_dh_set_peer_public' mangled-name='_gnutls_dh_set_peer_public' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_set_psk_session_key' mangled-name='_gnutls_set_psk_session_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dhe.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_gen_dhe_signature' mangled-name='_gnutls_gen_dhe_signature' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='rsa_psk.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='dhe_psk.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_proc_ecdh_common_client_kx' mangled-name='_gnutls_proc_ecdh_common_client_kx' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_gen_dh_common_client_kx_int' mangled-name='_gnutls_gen_dh_common_client_kx_int' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_gen_ecdh_common_client_kx_int' mangled-name='_gnutls_gen_ecdh_common_client_kx_int' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ecdh_common_print_server_kx' mangled-name='_gnutls_ecdh_common_print_server_kx' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='srp_kx.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -17858,75 +17968,86 @@
     <var-decl name='gnutls_srp_8192_group_prime' type-id='type-id-65' mangled-name='gnutls_srp_8192_group_prime' visibility='default' elf-symbol-id='gnutls_srp_8192_group_prime@@GNUTLS_3_6_2'/>
     <var-decl name='gnutls_srp_8192_group_generator' type-id='type-id-65' mangled-name='gnutls_srp_8192_group_generator' visibility='default' elf-symbol-id='gnutls_srp_8192_group_generator@@GNUTLS_3_6_2'/>
     <function-decl name='_gnutls_calc_srp_x' mangled-name='_gnutls_calc_srp_x' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_mpi_log' mangled-name='_gnutls_mpi_log' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_calc_srp_u' mangled-name='_gnutls_calc_srp_u' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_calc_srp_S1' mangled-name='_gnutls_calc_srp_S1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_calc_srp_A' mangled-name='_gnutls_calc_srp_A' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_calc_srp_S2' mangled-name='_gnutls_calc_srp_S2' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_srp_pwd_read_entry' mangled-name='_gnutls_srp_pwd_read_entry' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_calc_srp_B' mangled-name='_gnutls_calc_srp_B' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_srp_entry_free' mangled-name='_gnutls_srp_entry_free' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='srp_passwd.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='srp_rsa.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_gen_srp_server_kx' mangled-name='_gnutls_gen_srp_server_kx' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/auth' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='srp_sb64.c' comp-dir-path='/home/nmavrogi/cvs/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-276' name='result'/>
+      <parameter type-id='type-id-275' 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-377' name='result'/>
-      <parameter type-id='type-id-423' name='result_size'/>
+      <parameter type-id='type-id-376' name='result'/>
+      <parameter type-id='type-id-422' 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-276' name='result'/>
+      <parameter type-id='type-id-275' 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-377' name='result'/>
-      <parameter type-id='type-id-423' name='result_size'/>
+      <parameter type-id='type-id-376' name='result'/>
+      <parameter type-id='type-id-422' name='result_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cert_types.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-1085'/>
-    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-1086'/>
+  <abi-instr version='1.0' address-size='64' path='vko_gost.c' comp-dir-path='/home/nmavrogi/cvs/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>
+    <function-decl name='_gnutls_gost_keytrans_encrypt' mangled-name='_gnutls_gost_keytrans_encrypt' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gost_keytrans_decrypt' mangled-name='_gnutls_gost_keytrans_decrypt' 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_types.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/algorithms' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-1094'/>
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-1095'/>
     <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-1086'/>
+      <return type-id='type-id-1095'/>
     </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'/>
@@ -17937,11 +18058,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/nmavrogi/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-29' const='yes' id='type-id-1087'/>
-    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-1088'/>
+  <abi-instr version='1.0' address-size='64' path='ciphers.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/algorithms' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-29' const='yes' id='type-id-1096'/>
+    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-1097'/>
     <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-1088'/>
+      <return type-id='type-id-1097'/>
     </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'/>
@@ -17953,7 +18074,7 @@
     </function-decl>
     <function-decl name='gnutls_cipher_get_key_size' mangled-name='gnutls_cipher_get_key_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_get_key_size@@GNUTLS_3_4'>
       <parameter type-id='type-id-29' name='algorithm'/>
-      <return type-id='type-id-100'/>
+      <return type-id='type-id-99'/>
     </function-decl>
     <function-decl name='gnutls_cipher_get_iv_size' mangled-name='gnutls_cipher_get_iv_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_cipher_get_iv_size@@GNUTLS_3_4'>
       <parameter type-id='type-id-29' name='algorithm'/>
@@ -17972,24 +18093,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/nmavrogi/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ciphersuites.c' comp-dir-path='/home/nmavrogi/cvs/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-425' name='pcache'/>
+      <parameter type-id='type-id-424' name='pcache'/>
       <parameter type-id='type-id-10' name='idx'/>
-      <parameter type-id='type-id-420' name='sidx'/>
+      <parameter type-id='type-id-419' 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-1089'/>
-    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-1090'/>
-    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-1091'/>
-    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-1092'/>
+    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-1098'/>
+    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-1099'/>
+    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-1100'/>
+    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-1101'/>
     <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-100' name='idx'/>
+      <parameter type-id='type-id-99' name='idx'/>
       <parameter type-id='type-id-64' name='cs_id'/>
-      <parameter type-id='type-id-1089' name='kx'/>
-      <parameter type-id='type-id-1090' name='cipher'/>
-      <parameter type-id='type-id-1091' name='mac'/>
-      <parameter type-id='type-id-1092' name='min_version'/>
+      <parameter type-id='type-id-1098' name='kx'/>
+      <parameter type-id='type-id-1099' name='cipher'/>
+      <parameter type-id='type-id-1100' name='mac'/>
+      <parameter type-id='type-id-1101' 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'>
@@ -17999,16 +18120,16 @@
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='_gnutls_mac_exists' mangled-name='_gnutls_mac_exists' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_select_server_cert' mangled-name='_gnutls_select_server_cert' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_kx_needs_dh_params' mangled-name='_gnutls_kx_needs_dh_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='ecc.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -18037,17 +18158,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-1093'/>
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-1094'/>
+    <qualified-type-def type-id='type-id-59' const='yes' id='type-id-1102'/>
+    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1103'/>
     <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-1094'/>
+      <return type-id='type-id-1103'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='kx.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-1095'/>
-    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-1096'/>
+  <abi-instr version='1.0' address-size='64' path='kx.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/algorithms' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-1104'/>
+    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-1105'/>
     <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-1096'/>
+      <return type-id='type-id-1105'/>
     </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'/>
@@ -18058,9 +18179,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/nmavrogi/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='mac.c' comp-dir-path='/home/nmavrogi/cvs/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-212' name='algorithm'/>
+      <parameter type-id='type-id-211' 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'>
@@ -18069,25 +18190,25 @@
     </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-212'/>
+      <return type-id='type-id-211'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-212' const='yes' id='type-id-1097'/>
-    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-1098'/>
+    <qualified-type-def type-id='type-id-211' const='yes' id='type-id-1106'/>
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1107'/>
     <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-1098'/>
+      <return type-id='type-id-1107'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-1099'/>
-    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-1100'/>
+    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-1108'/>
+    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-1109'/>
     <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-1100'/>
+      <return type-id='type-id-1109'/>
     </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'/>
-      <return type-id='type-id-100'/>
+      <return type-id='type-id-99'/>
     </function-decl>
     <function-decl name='gnutls_mac_get_key_size' mangled-name='gnutls_mac_get_key_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_mac_get_key_size@@GNUTLS_3_4'>
       <parameter type-id='type-id-31' name='algorithm'/>
-      <return type-id='type-id-100'/>
+      <return type-id='type-id-99'/>
     </function-decl>
     <function-decl name='gnutls_mac_get_id' mangled-name='gnutls_mac_get_id' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gnutls_mac_get_id@@GNUTLS_3_4'>
       <parameter type-id='type-id-27' name='name'/>
@@ -18095,10 +18216,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-212'/>
+      <return type-id='type-id-211'/>
     </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-212' name='algorithm'/>
+      <parameter type-id='type-id-211' 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'>
@@ -18110,11 +18231,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/nmavrogi/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-32' 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='protocols.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/algorithms' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-32' const='yes' id='type-id-1110'/>
+    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-1111'/>
     <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-1102'/>
+      <return type-id='type-id-1111'/>
     </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'/>
@@ -18129,7 +18250,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/nmavrogi/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='publickey.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -18154,27 +18275,27 @@
       <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/nmavrogi/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='secparams.c' comp-dir-path='/home/nmavrogi/cvs/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-203'/>
+      <return type-id='type-id-202'/>
     </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-203' name='param'/>
+      <parameter type-id='type-id-202' 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-203' name='param'/>
+      <parameter type-id='type-id-202' 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-203' name='param'/>
+      <parameter type-id='type-id-202' 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/nmavrogi/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='sign.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -18186,7 +18307,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-212'/>
+      <return type-id='type-id-211'/>
     </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'/>
@@ -18194,7 +18315,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-212' name='hash'/>
+      <parameter type-id='type-id-211' 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'>
@@ -18205,10 +18326,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-1103'/>
-    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-1104'/>
+    <qualified-type-def type-id='type-id-21' const='yes' id='type-id-1112'/>
+    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-1113'/>
     <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-1104'/>
+      <return type-id='type-id-1113'/>
     </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'/>
@@ -18224,10 +18345,10 @@
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='_gnutls_digest_is_insecure' mangled-name='_gnutls_digest_is_insecure' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/algorithms' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='groups.c' comp-dir-path='/home/nmavrogi/cvs/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'/>
@@ -18236,22 +18357,22 @@
       <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-1105'/>
-    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-1106'/>
+    <qualified-type-def type-id='type-id-56' const='yes' id='type-id-1114'/>
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-1115'/>
     <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-1106'/>
+      <return type-id='type-id-1115'/>
     </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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/accelerated' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='accelerated.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/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-1107' visibility='default' id='type-id-1108'>
+  <abi-instr version='1.0' address-size='64' path='aes-cbc-x86-aesni.c' comp-dir-path='/home/nmavrogi/cvs/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-1116' visibility='default' id='type-id-1117'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='init' type-id='type-id-806' visibility='default'/>
       </data-member>
@@ -18262,7 +18383,7 @@
         <var-decl name='setiv' type-id='type-id-811' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='getiv' type-id='type-id-1109' visibility='default'/>
+        <var-decl name='getiv' type-id='type-id-1118' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='encrypt' type-id='type-id-812' visibility='default'/>
@@ -18280,146 +18401,146 @@
         <var-decl name='deinit' type-id='type-id-810' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='auth' type-id='type-id-1110' visibility='default'/>
+        <var-decl name='auth' type-id='type-id-1119' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='tag' type-id='type-id-1111' visibility='default'/>
+        <var-decl name='tag' type-id='type-id-1120' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='exists' type-id='type-id-1112' visibility='default'/>
+        <var-decl name='exists' type-id='type-id-1121' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='gnutls_cipher_getiv_func' type-id='type-id-118' id='type-id-1109'/>
-    <typedef-decl name='gnutls_cipher_auth_func' type-id='type-id-118' id='type-id-1110'/>
-    <typedef-decl name='gnutls_cipher_tag_func' type-id='type-id-120' id='type-id-1111'/>
-    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-1112'/>
-    <typedef-decl name='gnutls_crypto_cipher_st' type-id='type-id-1108' id='type-id-1107'/>
-    <qualified-type-def type-id='type-id-1107' const='yes' id='type-id-1114'/>
-    <var-decl name='_gnutls_aesni_x86' type-id='type-id-1114' visibility='default'/>
+    <typedef-decl name='gnutls_cipher_getiv_func' type-id='type-id-117' id='type-id-1118'/>
+    <typedef-decl name='gnutls_cipher_auth_func' type-id='type-id-117' id='type-id-1119'/>
+    <typedef-decl name='gnutls_cipher_tag_func' type-id='type-id-119' id='type-id-1120'/>
+    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-1121'/>
+    <typedef-decl name='gnutls_crypto_cipher_st' type-id='type-id-1117' id='type-id-1116'/>
+    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1123'/>
+    <var-decl name='_gnutls_aesni_x86' type-id='type-id-1123' 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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='aesni_set_decrypt_key' mangled-name='aesni_set_decrypt_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1113'>
+    <function-type size-in-bits='64' id='type-id-1122'>
       <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/nmavrogi/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_ssse3' type-id='type-id-1114' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-cbc-x86-ssse3.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_ssse3' type-id='type-id-1123' 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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='vpaes_set_decrypt_key' mangled-name='vpaes_set_decrypt_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='vpaes_set_encrypt_key' mangled-name='vpaes_set_encrypt_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_ccm_x86_aesni' type-id='type-id-1114' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-ccm-x86-aesni.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_ccm_x86_aesni' type-id='type-id-1123' 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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ccm_decrypt_message' mangled-name='nettle_ccm_decrypt_message' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ccm_encrypt_message' mangled-name='nettle_ccm_encrypt_message' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_padlock' type-id='type-id-1114' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-padlock.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_padlock' type-id='type-id-1123' 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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_gcm_decrypt' mangled-name='nettle_gcm_decrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_gcm_digest' mangled-name='nettle_gcm_digest' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='padlock_ecb_encrypt' mangled-name='padlock_ecb_encrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_gcm_encrypt' mangled-name='nettle_gcm_encrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_gcm_set_iv' mangled-name='nettle_gcm_set_iv' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='padlock_aes_cipher_setkey' mangled-name='padlock_aes_cipher_setkey' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_gcm_set_key' mangled-name='nettle_gcm_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_x86_aesni' type-id='type-id-1114' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-aesni.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_x86_aesni' type-id='type-id-1123' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-pclmul-avx.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_pclmul_avx' type-id='type-id-1114' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-pclmul-avx.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_pclmul_avx' type-id='type-id-1123' 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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='aesni_gcm_encrypt' mangled-name='aesni_gcm_encrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gcm_ghash_avx' mangled-name='gcm_ghash_avx' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='aesni_ctr32_encrypt_blocks' mangled-name='aesni_ctr32_encrypt_blocks' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gcm_gmult_avx' mangled-name='gcm_gmult_avx' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gcm_init_avx' mangled-name='gcm_init_avx' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_pclmul' type-id='type-id-1114' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-pclmul.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_pclmul' type-id='type-id-1123' 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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gcm_gmult_clmul' mangled-name='gcm_gmult_clmul' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gcm_init_clmul' mangled-name='gcm_init_clmul' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_gcm_x86_ssse3' type-id='type-id-1114' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-gcm-x86-ssse3.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_gcm_x86_ssse3' type-id='type-id-1123' visibility='default'/>
     <function-decl name='vpaes_encrypt' mangled-name='vpaes_encrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_aes_padlock' type-id='type-id-1114' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='aes-padlock.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_aes_padlock' type-id='type-id-1123' 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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='padlock_reload_key' mangled-name='padlock_reload_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_aes256_set_decrypt_key' mangled-name='nettle_aes256_set_decrypt_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_aes256_set_encrypt_key' mangled-name='nettle_aes256_set_encrypt_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1115' visibility='default' id='type-id-1116'>
+  <abi-instr version='1.0' address-size='64' path='hmac-padlock.c' comp-dir-path='/home/nmavrogi/cvs/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-1124' visibility='default' id='type-id-1125'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='init' type-id='type-id-795' visibility='default'/>
       </data-member>
@@ -18442,48 +18563,55 @@
         <var-decl name='fast' type-id='type-id-803' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='exists' type-id='type-id-1117' visibility='default'/>
+        <var-decl name='copy' type-id='type-id-1126' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='exists' type-id='type-id-1127' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-1117'/>
-    <typedef-decl name='gnutls_crypto_mac_st' type-id='type-id-1116' id='type-id-1115'/>
-    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1119'/>
-    <var-decl name='_gnutls_hmac_sha_padlock' type-id='type-id-1119' visibility='default'/>
-    <var-decl name='_gnutls_hmac_sha_padlock_nano' type-id='type-id-1119' visibility='default'/>
+    <typedef-decl name='gnutls_mac_copy_func' type-id='type-id-130' id='type-id-1126'/>
+    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-1127'/>
+    <typedef-decl name='gnutls_crypto_mac_st' type-id='type-id-1125' id='type-id-1124'/>
+    <qualified-type-def type-id='type-id-1124' const='yes' id='type-id-1129'/>
+    <var-decl name='_gnutls_hmac_sha_padlock' type-id='type-id-1129' visibility='default'/>
+    <var-decl name='_gnutls_hmac_sha_padlock_nano' type-id='type-id-1129' 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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_hmac_digest' mangled-name='nettle_hmac_digest' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='padlock_sha512_update' mangled-name='padlock_sha512_update' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_hmac_set_key' mangled-name='nettle_hmac_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='padlock_sha256_update' mangled-name='padlock_sha256_update' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='padlock_sha1_update' mangled-name='padlock_sha1_update' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1118'>
+    <function-type size-in-bits='64' id='type-id-1128'>
       <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/nmavrogi/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='_gnutls_hmac_sha_x86_ssse3' type-id='type-id-1119' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='hmac-x86-ssse3.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='_gnutls_hmac_sha_x86_ssse3' type-id='type-id-1129' 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>
     <function-decl name='x86_sha256_update' mangled-name='x86_sha256_update' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='x86_sha1_update' mangled-name='x86_sha1_update' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/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-1120'>
+  <abi-instr version='1.0' address-size='64' path='sha-padlock.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <class-decl name='nettle_hash' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1130'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-27' visibility='default'/>
       </data-member>
@@ -18497,28 +18625,28 @@
         <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-1121' visibility='default'/>
+        <var-decl name='init' type-id='type-id-1131' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='update' type-id='type-id-1122' visibility='default'/>
+        <var-decl name='update' type-id='type-id-1132' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='digest' type-id='type-id-1123' visibility='default'/>
+        <var-decl name='digest' type-id='type-id-1133' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='nettle_hash_init_func' type-id='type-id-121' id='type-id-1124'/>
-    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-1121'/>
-    <typedef-decl name='nettle_hash_update_func' type-id='type-id-1125' id='type-id-1126'/>
-    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-1122'/>
-    <typedef-decl name='nettle_hash_digest_func' type-id='type-id-1127' id='type-id-1128'/>
-    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-1123'/>
-    <qualified-type-def type-id='type-id-1120' const='yes' id='type-id-1129'/>
-    <var-decl name='padlock_sha1' type-id='type-id-1129' visibility='default'/>
-    <var-decl name='padlock_sha224' type-id='type-id-1129' visibility='default'/>
-    <var-decl name='padlock_sha256' type-id='type-id-1129' visibility='default'/>
-    <var-decl name='padlock_sha384' type-id='type-id-1129' visibility='default'/>
-    <var-decl name='padlock_sha512' type-id='type-id-1129' visibility='default'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='384' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1130' visibility='default' id='type-id-1131'>
+    <typedef-decl name='nettle_hash_init_func' type-id='type-id-120' id='type-id-1134'/>
+    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-1131'/>
+    <typedef-decl name='nettle_hash_update_func' type-id='type-id-1135' id='type-id-1136'/>
+    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-1132'/>
+    <typedef-decl name='nettle_hash_digest_func' type-id='type-id-1137' id='type-id-1138'/>
+    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-1133'/>
+    <qualified-type-def type-id='type-id-1130' const='yes' id='type-id-1139'/>
+    <var-decl name='padlock_sha1' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='padlock_sha224' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='padlock_sha256' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='padlock_sha384' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='padlock_sha512' type-id='type-id-1139' visibility='default'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='448' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1140' visibility='default' id='type-id-1141'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='init' type-id='type-id-786' visibility='default'/>
       </data-member>
@@ -18535,823 +18663,867 @@
         <var-decl name='fast' type-id='type-id-792' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='exists' type-id='type-id-1132' visibility='default'/>
+        <var-decl name='copy' type-id='type-id-1142' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='exists' type-id='type-id-1143' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-1132'/>
-    <typedef-decl name='gnutls_crypto_digest_st' type-id='type-id-1131' id='type-id-1130'/>
-    <qualified-type-def type-id='type-id-1130' const='yes' id='type-id-1134'/>
-    <var-decl name='_gnutls_sha_padlock' type-id='type-id-1134' visibility='default'/>
-    <var-decl name='_gnutls_sha_padlock_nano' type-id='type-id-1134' visibility='default'/>
+    <typedef-decl name='gnutls_digest_copy_func' type-id='type-id-130' id='type-id-1142'/>
+    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-1143'/>
+    <typedef-decl name='gnutls_crypto_digest_st' type-id='type-id-1141' id='type-id-1140'/>
+    <qualified-type-def type-id='type-id-1140' const='yes' id='type-id-1145'/>
+    <var-decl name='_gnutls_sha_padlock' type-id='type-id-1145' visibility='default'/>
+    <var-decl name='_gnutls_sha_padlock_nano' type-id='type-id-1145' 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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='padlock_sha256_oneshot' mangled-name='padlock_sha256_oneshot' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_sha224_init' mangled-name='nettle_sha224_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_sha1_init' mangled-name='nettle_sha1_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_sha256_init' mangled-name='nettle_sha256_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_sha384_init' mangled-name='nettle_sha384_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_sha512_init' mangled-name='nettle_sha512_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='padlock_sha512_blocks' mangled-name='padlock_sha512_blocks' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='padlock_sha256_blocks' mangled-name='padlock_sha256_blocks' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='padlock_sha1_blocks' mangled-name='padlock_sha1_blocks' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1133'>
-      <parameter type-id='type-id-212'/>
+    <function-type size-in-bits='64' id='type-id-1144'>
+      <parameter type-id='type-id-211'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1125'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-985'/>
-      <return type-id='type-id-112'/>
+    <function-type size-in-bits='64' id='type-id-1135'>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-898'/>
+      <return type-id='type-id-111'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1127'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-192'/>
-      <return type-id='type-id-112'/>
+    <function-type size-in-bits='64' id='type-id-1137'>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-191'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <var-decl name='x86_sha1' type-id='type-id-1129' visibility='default'/>
-    <var-decl name='x86_sha224' type-id='type-id-1129' visibility='default'/>
-    <var-decl name='x86_sha256' type-id='type-id-1129' visibility='default'/>
-    <var-decl name='_gnutls_sha_x86_ssse3' type-id='type-id-1134' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='sha-x86-ssse3.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/accelerated/x86' language='LANG_C99'>
+    <var-decl name='x86_sha1' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='x86_sha224' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='x86_sha256' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='x86_sha384' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='x86_sha512' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='_gnutls_sha_x86_ssse3' type-id='type-id-1145' 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>
+    <function-decl name='sha512_block_data_order' mangled-name='sha512_block_data_order' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
     <function-decl name='nettle_sha256_update' mangled-name='nettle_sha256_update' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='sha256_block_data_order' mangled-name='sha256_block_data_order' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_sha1_update' mangled-name='nettle_sha1_update' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='sha1_block_data_order' mangled-name='sha1_block_data_order' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/accelerated/x86' language='LANG_C99'>
-    <function-decl name='gnutls_cpuid' mangled-name='gnutls_cpuid' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
+  <abi-instr version='1.0' address-size='64' path='x86-common.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_crypto_single_digest_register' mangled-name='gnutls_crypto_single_digest_register' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='gnutls_crypto_single_mac_register' mangled-name='gnutls_crypto_single_mac_register' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_priority_update_non_aesni' mangled-name='_gnutls_priority_update_non_aesni' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='padlock_capability' mangled-name='padlock_capability' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='pk.c' comp-dir-path='/home/nmavrogi/cvs/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='704' is-struct='yes' visibility='default' id='type-id-1135'>
+    <class-decl name='gnutls_crypto_pk' size-in-bits='768' is-struct='yes' visibility='default' id='type-id-1146'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='encrypt' type-id='type-id-1136' visibility='default'/>
+        <var-decl name='encrypt' type-id='type-id-1147' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='decrypt' type-id='type-id-1136' visibility='default'/>
+        <var-decl name='decrypt' type-id='type-id-1147' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='decrypt2' type-id='type-id-1137' visibility='default'/>
+        <var-decl name='decrypt2' type-id='type-id-1148' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='sign' type-id='type-id-1138' visibility='default'/>
+        <var-decl name='sign' type-id='type-id-1149' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='verify' type-id='type-id-1139' visibility='default'/>
+        <var-decl name='verify' type-id='type-id-1150' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='verify_priv_params' type-id='type-id-1140' visibility='default'/>
+        <var-decl name='verify_priv_params' type-id='type-id-1151' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='verify_pub_params' type-id='type-id-1140' visibility='default'/>
+        <var-decl name='verify_pub_params' type-id='type-id-1151' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='generate_keys' type-id='type-id-1141' visibility='default'/>
+        <var-decl name='generate_keys' type-id='type-id-1152' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='generate_params' type-id='type-id-1142' visibility='default'/>
+        <var-decl name='generate_params' type-id='type-id-1153' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='pk_fixup_private_params' type-id='type-id-1143' visibility='default'/>
+        <var-decl name='pk_fixup_private_params' type-id='type-id-1154' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='derive' type-id='type-id-1144' visibility='default'/>
+        <var-decl name='derive' type-id='type-id-1155' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='curve_exists' type-id='type-id-1156' visibility='default'/>
       </data-member>
     </class-decl>
-    <qualified-type-def type-id='type-id-313' const='yes' id='type-id-1145'/>
-    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-1146'/>
-    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-1136'/>
-    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-1137'/>
-    <qualified-type-def type-id='type-id-318' const='yes' id='type-id-1149'/>
-    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-1150'/>
-    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-1138'/>
-    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-1139'/>
-    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-1140'/>
-    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-1154'/>
-    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-1141'/>
-    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-1142'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1157'>
+    <qualified-type-def type-id='type-id-312' const='yes' id='type-id-1157'/>
+    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-1158'/>
+    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-1147'/>
+    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-1148'/>
+    <qualified-type-def type-id='type-id-317' const='yes' id='type-id-1161'/>
+    <pointer-type-def type-id='type-id-1161' size-in-bits='64' id='type-id-1162'/>
+    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-1149'/>
+    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-1150'/>
+    <pointer-type-def type-id='type-id-1165' size-in-bits='64' id='type-id-1151'/>
+    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-1166'/>
+    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-1152'/>
+    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-1153'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1169'>
       <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-1157' id='type-id-1158'/>
-    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-1143'/>
-    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-1144'/>
-    <typedef-decl name='gnutls_crypto_pk_st' type-id='type-id-1135' id='type-id-1161'/>
-    <var-decl name='_gnutls_pk_ops' type-id='type-id-1161' visibility='default'/>
+    <typedef-decl name='gnutls_direction_t' type-id='type-id-1169' id='type-id-1170'/>
+    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-1154'/>
+    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-1155'/>
+    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-1156'/>
+    <typedef-decl name='gnutls_crypto_pk_st' type-id='type-id-1146' id='type-id-1174'/>
+    <var-decl name='_gnutls_pk_ops' type-id='type-id-1174' visibility='default'/>
+    <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_521r1' mangled-name='nettle_get_secp_521r1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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-112'/>
-    </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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ecc_point_init' mangled-name='nettle_ecc_point_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_invert' mangled-name='__gmpz_invert' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ecc_point_mul_g' mangled-name='nettle_ecc_point_mul_g' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_init' mangled-name='__gmpz_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ecc_point_get' mangled-name='nettle_ecc_point_get' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_cmp' mangled-name='__gmpz_cmp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_clear' mangled-name='__gmpz_clear' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_sizeinbase' mangled-name='__gmpz_sizeinbase' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_mpz_random_size' mangled-name='nettle_mpz_random_size' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_pk_bits_to_subgroup_bits' mangled-name='_gnutls_pk_bits_to_subgroup_bits' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_mod' mangled-name='__gmpz_mod' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_powm' mangled-name='__gmpz_powm' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_cmp_ui' mangled-name='__gmpz_cmp_ui' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_set' mangled-name='__gmpz_set' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_sub_ui' mangled-name='__gmpz_sub_ui' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_mpz_random' mangled-name='nettle_mpz_random' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_add_ui' mangled-name='__gmpz_add_ui' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='rsa_generate_fips186_4_keypair' mangled-name='rsa_generate_fips186_4_keypair' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_rsa_public_key_init' mangled-name='nettle_rsa_public_key_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_rsa_private_key_init' mangled-name='nettle_rsa_private_key_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_set_ui' mangled-name='__gmpz_set_ui' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_rsa_private_key_clear' mangled-name='nettle_rsa_private_key_clear' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_rsa_public_key_clear' mangled-name='nettle_rsa_public_key_clear' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_rsa_generate_fips186_4_keypair' mangled-name='_rsa_generate_fips186_4_keypair' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_rsa_generate_keypair' mangled-name='nettle_rsa_generate_keypair' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ecc_scalar_init' mangled-name='nettle_ecc_scalar_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ecdsa_generate_keypair' mangled-name='nettle_ecdsa_generate_keypair' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ecc_scalar_clear' mangled-name='nettle_ecc_scalar_clear' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ecc_bit_size' mangled-name='nettle_ecc_bit_size' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_dsa_params_init' mangled-name='nettle_dsa_params_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_dsa_params_clear' mangled-name='nettle_dsa_params_clear' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='nettle_dsa_generate_params' mangled-name='nettle_dsa_generate_params' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_dsa_generate_dss_pqg' mangled-name='_dsa_generate_dss_pqg' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='dsa_validate_dss_pqg' mangled-name='dsa_validate_dss_pqg' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='nettle_dsa_generate_params' mangled-name='nettle_dsa_generate_params' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='dsa_generate_dss_pqg' mangled-name='dsa_generate_dss_pqg' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_gostdsa_verify' mangled-name='_gnutls_gostdsa_verify' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_decode_ber_rs' mangled-name='_gnutls_decode_ber_rs' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_dsa_q_to_hash' mangled-name='_gnutls_dsa_q_to_hash' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ecdsa_verify' mangled-name='nettle_ecdsa_verify' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_dsa_verify' mangled-name='nettle_dsa_verify' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_dsa_signature_init' mangled-name='nettle_dsa_signature_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_gostdsa_sign' mangled-name='_gnutls_gostdsa_sign' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_encode_gost_rs' mangled-name='_gnutls_encode_gost_rs' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_dsa_signature_clear' mangled-name='nettle_dsa_signature_clear' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ecdsa_sign' mangled-name='nettle_ecdsa_sign' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_encode_ber_rs' mangled-name='_gnutls_encode_ber_rs' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_ecdsa_compute_k' mangled-name='_gnutls_ecdsa_compute_k' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_dsa_sign' mangled-name='nettle_dsa_sign' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_dsa_compute_k' mangled-name='_gnutls_dsa_compute_k' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_rsa_pkcs1_sign_tr' mangled-name='nettle_rsa_pkcs1_sign_tr' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_mpi_dprint_size' mangled-name='_gnutls_mpi_dprint_size' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_rsa_sec_decrypt' mangled-name='nettle_rsa_sec_decrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_rsa_decrypt_tr' mangled-name='nettle_rsa_decrypt_tr' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_rsa_encrypt' mangled-name='nettle_rsa_encrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ecc_point_mul' mangled-name='nettle_ecc_point_mul' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_mem_is_zero' mangled-name='_gnutls_mem_is_zero' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gostdsa_vko' mangled-name='_gnutls_gostdsa_vko' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_mpz_sizeinbase_256_u' mangled-name='nettle_mpz_sizeinbase_256_u' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ecc_size_a' mangled-name='nettle_ecc_size_a' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ecc_size' mangled-name='nettle_ecc_size' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_ecc_scalar_set' mangled-name='nettle_ecc_scalar_set' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_rsa_public_key_prepare' mangled-name='nettle_rsa_public_key_prepare' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_gostdsa_unmask_key' mangled-name='_gnutls_gostdsa_unmask_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1152'>
+    <function-type size-in-bits='64' id='type-id-1173'>
+      <parameter type-id='type-id-59'/>
+      <return type-id='type-id-22'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1164'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-1146'/>
-      <parameter type-id='type-id-1150'/>
+      <parameter type-id='type-id-1158'/>
+      <parameter type-id='type-id-1162'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1148'>
+    <function-type size-in-bits='64' id='type-id-1160'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-64'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-1146'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-1158'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1153'>
+    <function-type size-in-bits='64' id='type-id-1165'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-1146'/>
+      <parameter type-id='type-id-1158'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1147'>
+    <function-type size-in-bits='64' id='type-id-1159'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-276'/>
+      <parameter type-id='type-id-275'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-1146'/>
+      <parameter type-id='type-id-1158'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1151'>
+    <function-type size-in-bits='64' id='type-id-1163'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-276'/>
+      <parameter type-id='type-id-275'/>
       <parameter type-id='type-id-57'/>
-      <parameter type-id='type-id-1146'/>
-      <parameter type-id='type-id-1150'/>
+      <parameter type-id='type-id-1158'/>
+      <parameter type-id='type-id-1162'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1160'>
+    <function-type size-in-bits='64' id='type-id-1172'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-276'/>
-      <parameter type-id='type-id-1146'/>
-      <parameter type-id='type-id-1146'/>
+      <parameter type-id='type-id-275'/>
+      <parameter type-id='type-id-1158'/>
+      <parameter type-id='type-id-1158'/>
+      <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-1159'>
+    <function-type size-in-bits='64' id='type-id-1171'>
       <parameter type-id='type-id-60'/>
-      <parameter type-id='type-id-1158'/>
-      <parameter type-id='type-id-1154'/>
+      <parameter type-id='type-id-1170'/>
+      <parameter type-id='type-id-1166'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1156'>
+    <function-type size-in-bits='64' id='type-id-1168'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-1154'/>
+      <parameter type-id='type-id-1166'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1155'>
+    <function-type size-in-bits='64' id='type-id-1167'>
       <parameter type-id='type-id-60'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-1154'/>
+      <parameter type-id='type-id-1166'/>
       <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='mpi.c' comp-dir-path='/home/nmavrogi/cvs/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-1162'>
+    <class-decl name='gnutls_crypto_bigint' size-in-bits='1600' is-struct='yes' visibility='default' id='type-id-1175'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='bigint_init' type-id='type-id-1163' visibility='default'/>
+        <var-decl name='bigint_init' type-id='type-id-1176' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='bigint_init_multi' type-id='type-id-1164' visibility='default'/>
+        <var-decl name='bigint_init_multi' type-id='type-id-1177' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='bigint_release' type-id='type-id-1165' visibility='default'/>
+        <var-decl name='bigint_release' type-id='type-id-1178' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='bigint_clear' type-id='type-id-1165' visibility='default'/>
+        <var-decl name='bigint_clear' type-id='type-id-1178' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='bigint_cmp' type-id='type-id-1166' visibility='default'/>
+        <var-decl name='bigint_cmp' type-id='type-id-1179' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='bigint_cmp_ui' type-id='type-id-1167' visibility='default'/>
+        <var-decl name='bigint_cmp_ui' type-id='type-id-1180' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='bigint_modm' type-id='type-id-1168' visibility='default'/>
+        <var-decl name='bigint_modm' type-id='type-id-1181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='bigint_set' type-id='type-id-1169' visibility='default'/>
+        <var-decl name='bigint_set' type-id='type-id-1182' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='bigint_copy' type-id='type-id-1170' visibility='default'/>
+        <var-decl name='bigint_copy' type-id='type-id-1183' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='bigint_set_ui' type-id='type-id-1171' visibility='default'/>
+        <var-decl name='bigint_set_ui' type-id='type-id-1184' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='bigint_get_nbits' type-id='type-id-1172' visibility='default'/>
+        <var-decl name='bigint_get_nbits' type-id='type-id-1185' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='bigint_powm' type-id='type-id-1173' visibility='default'/>
+        <var-decl name='bigint_powm' type-id='type-id-1186' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='bigint_addm' type-id='type-id-1173' visibility='default'/>
+        <var-decl name='bigint_addm' type-id='type-id-1186' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='bigint_subm' type-id='type-id-1173' visibility='default'/>
+        <var-decl name='bigint_subm' type-id='type-id-1186' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='bigint_mulm' type-id='type-id-1173' visibility='default'/>
+        <var-decl name='bigint_mulm' type-id='type-id-1186' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='bigint_add' type-id='type-id-1168' visibility='default'/>
+        <var-decl name='bigint_add' type-id='type-id-1181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='bigint_sub' type-id='type-id-1168' visibility='default'/>
+        <var-decl name='bigint_sub' type-id='type-id-1181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='bigint_mul' type-id='type-id-1168' visibility='default'/>
+        <var-decl name='bigint_mul' type-id='type-id-1181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='bigint_add_ui' type-id='type-id-1174' visibility='default'/>
+        <var-decl name='bigint_add_ui' type-id='type-id-1187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='bigint_sub_ui' type-id='type-id-1174' visibility='default'/>
+        <var-decl name='bigint_sub_ui' type-id='type-id-1187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='bigint_mul_ui' type-id='type-id-1174' visibility='default'/>
+        <var-decl name='bigint_mul_ui' type-id='type-id-1187' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='bigint_div' type-id='type-id-1168' visibility='default'/>
+        <var-decl name='bigint_div' type-id='type-id-1181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='bigint_prime_check' type-id='type-id-1175' visibility='default'/>
+        <var-decl name='bigint_prime_check' type-id='type-id-1188' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='bigint_scan' type-id='type-id-1176' visibility='default'/>
+        <var-decl name='bigint_scan' type-id='type-id-1189' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='bigint_print' type-id='type-id-1177' visibility='default'/>
+        <var-decl name='bigint_print' type-id='type-id-1190' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-1178'/>
-    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-1163'/>
-    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-1164'/>
-    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-1165'/>
-    <qualified-type-def type-id='type-id-319' const='yes' id='type-id-1182'/>
-    <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'/>
-    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-1168'/>
-    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-1169'/>
-    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-1170'/>
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-1171'/>
-    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1172'/>
-    <pointer-type-def type-id='type-id-1190' size-in-bits='64' id='type-id-1173'/>
-    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-1174'/>
-    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-1175'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1193'>
+    <pointer-type-def type-id='type-id-318' size-in-bits='64' id='type-id-1191'/>
+    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-1176'/>
+    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-1177'/>
+    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-1178'/>
+    <qualified-type-def type-id='type-id-318' const='yes' id='type-id-1195'/>
+    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-1179'/>
+    <pointer-type-def type-id='type-id-1197' size-in-bits='64' id='type-id-1180'/>
+    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-1181'/>
+    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-1182'/>
+    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-1183'/>
+    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-1184'/>
+    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-1185'/>
+    <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'/>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-1206'>
       <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-1193' id='type-id-1194'/>
-    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-1176'/>
-    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-1177'/>
-    <typedef-decl name='gnutls_crypto_bigint_st' type-id='type-id-1162' id='type-id-1197'/>
-    <var-decl name='_gnutls_mpi_ops' type-id='type-id-1197' 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-1206' id='type-id-1207'/>
+    <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-1189'/>
+    <pointer-type-def type-id='type-id-1209' size-in-bits='64' id='type-id-1190'/>
+    <typedef-decl name='gnutls_crypto_bigint_st' type-id='type-id-1175' id='type-id-1210'/>
+    <var-decl name='_gnutls_mpi_ops' type-id='type-id-1210' 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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_mul_ui' mangled-name='__gmpz_mul_ui' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_cdiv_q' mangled-name='__gmpz_cdiv_q' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_mul' mangled-name='__gmpz_mul' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_sub' mangled-name='__gmpz_sub' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_add' mangled-name='__gmpz_add' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_fdiv_r' mangled-name='__gmpz_fdiv_r' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_mpz_get_str_256_u_le' mangled-name='_gnutls_mpz_get_str_256_u_le' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_mpz_sizeinbase_256_s' mangled-name='nettle_mpz_sizeinbase_256_s' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_mpz_set_str_256_u_le' mangled-name='_gnutls_mpz_set_str_256_u_le' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_mpz_set_str_256_u' mangled-name='nettle_mpz_set_str_256_u' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1179'>
-      <parameter type-id='type-id-1178'/>
+    <function-type size-in-bits='64' id='type-id-1192'>
+      <parameter type-id='type-id-1191'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1180'>
-      <parameter type-id='type-id-1178'/>
+    <function-type size-in-bits='64' id='type-id-1193'>
+      <parameter type-id='type-id-1191'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1192'>
-      <parameter type-id='type-id-1182'/>
+    <function-type size-in-bits='64' id='type-id-1205'>
+      <parameter type-id='type-id-1195'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1183'>
-      <parameter type-id='type-id-1182'/>
-      <parameter type-id='type-id-1182'/>
+    <function-type size-in-bits='64' id='type-id-1196'>
+      <parameter type-id='type-id-1195'/>
+      <parameter type-id='type-id-1195'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1184'>
-      <parameter type-id='type-id-1182'/>
+    <function-type size-in-bits='64' id='type-id-1197'>
+      <parameter type-id='type-id-1195'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1196'>
-      <parameter type-id='type-id-1182'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-423'/>
-      <parameter type-id='type-id-1194'/>
+    <function-type size-in-bits='64' id='type-id-1209'>
+      <parameter type-id='type-id-1195'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-422'/>
+      <parameter type-id='type-id-1207'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1186'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-1182'/>
+    <function-type size-in-bits='64' id='type-id-1199'>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-1195'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1185'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-1182'/>
-      <parameter type-id='type-id-1182'/>
+    <function-type size-in-bits='64' id='type-id-1198'>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-1195'/>
+      <parameter type-id='type-id-1195'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1190'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-1182'/>
-      <parameter type-id='type-id-1182'/>
-      <parameter type-id='type-id-1182'/>
+    <function-type size-in-bits='64' id='type-id-1203'>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-1195'/>
+      <parameter type-id='type-id-1195'/>
+      <parameter type-id='type-id-1195'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1191'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-1182'/>
+    <function-type size-in-bits='64' id='type-id-1204'>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-1195'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1188'>
-      <parameter type-id='type-id-319'/>
+    <function-type size-in-bits='64' id='type-id-1201'>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1195'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-1194'/>
+    <function-type size-in-bits='64' id='type-id-1208'>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-101'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-1207'/>
       <return type-id='type-id-22'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1187'>
-      <parameter type-id='type-id-1182'/>
-      <return type-id='type-id-319'/>
+    <function-type size-in-bits='64' id='type-id-1200'>
+      <parameter type-id='type-id-1195'/>
+      <return type-id='type-id-318'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1189'>
-      <parameter type-id='type-id-1182'/>
+    <function-type size-in-bits='64' id='type-id-1202'>
+      <parameter type-id='type-id-1195'/>
       <return type-id='type-id-10'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1181'>
-      <parameter type-id='type-id-319'/>
-      <return type-id='type-id-112'/>
+    <function-type size-in-bits='64' id='type-id-1194'>
+      <parameter type-id='type-id-318'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <var-decl name='_gnutls_mac_ops' type-id='type-id-1115' visibility='default'/>
-    <var-decl name='_gnutls_digest_ops' type-id='type-id-1130' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='mac.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <var-decl name='_gnutls_mac_ops' type-id='type-id-1124' visibility='default'/>
+    <var-decl name='_gnutls_digest_ops' type-id='type-id-1140' visibility='default'/>
     <function-decl name='_gnutls_streebog512_init' mangled-name='_gnutls_streebog512_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_md2_init' mangled-name='nettle_md2_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_sha3_224_init' mangled-name='nettle_sha3_224_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_sha3_256_init' mangled-name='nettle_sha3_256_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_sha3_384_init' mangled-name='nettle_sha3_384_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_sha3_512_init' mangled-name='nettle_sha3_512_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_gosthash94_init' mangled-name='nettle_gosthash94_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_streebog256_init' mangled-name='_gnutls_streebog256_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='nettle_aes192_set_encrypt_key' mangled-name='nettle_aes192_set_encrypt_key' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_backport_nettle_cmac_aes256_set_key' mangled-name='_gnutls_backport_nettle_cmac_aes256_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='nettle_aes128_set_encrypt_key' mangled-name='nettle_aes128_set_encrypt_key' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='nettle_cmac_aes256_set_key' mangled-name='nettle_cmac_aes256_set_key' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='_gnutls_backport_nettle_cmac_aes128_set_key' mangled-name='_gnutls_backport_nettle_cmac_aes128_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='nettle_cmac_aes128_set_key' mangled-name='nettle_cmac_aes128_set_key' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_umac128_set_key' mangled-name='nettle_umac128_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <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-112'/>
+      <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'>
+      <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'>
+      <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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <var-decl name='_gnutls_cipher_ops' type-id='type-id-1107' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='cipher.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <var-decl name='_gnutls_cipher_ops' type-id='type-id-1116' 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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_xts_aes256_encrypt_message' mangled-name='nettle_xts_aes256_encrypt_message' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_xts_aes128_decrypt_message' mangled-name='nettle_xts_aes128_decrypt_message' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_xts_aes128_encrypt_message' mangled-name='nettle_xts_aes128_encrypt_message' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_backport_nettle_cfb8_decrypt' mangled-name='_gnutls_backport_nettle_cfb8_decrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_backport_nettle_cfb8_encrypt' mangled-name='_gnutls_backport_nettle_cfb8_encrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_des3_set_key' mangled-name='nettle_des3_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_des_set_key' mangled-name='nettle_des_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_chacha_poly1305_set_nonce' mangled-name='nettle_chacha_poly1305_set_nonce' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gost28147_cnt_crypt' mangled-name='_gnutls_gost28147_cnt_crypt' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gost28147_cnt_set_iv' mangled-name='_gnutls_gost28147_cnt_set_iv' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <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'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_cfb_encrypt' mangled-name='nettle_cfb_encrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_cbc_decrypt' mangled-name='nettle_cbc_decrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_cbc_encrypt' mangled-name='nettle_cbc_encrypt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='prf.c' comp-dir-path='/home/nmavrogi/cvs/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-100' name='master_size'/>
-      <parameter type-id='type-id-102' name='master'/>
-      <parameter type-id='type-id-100' name='label_size'/>
+      <parameter type-id='type-id-99' name='master_size'/>
+      <parameter type-id='type-id-101' name='master'/>
+      <parameter type-id='type-id-99' name='label_size'/>
       <parameter type-id='type-id-27' name='label'/>
-      <parameter type-id='type-id-100' name='seed_size'/>
-      <parameter type-id='type-id-985' name='seed'/>
-      <parameter type-id='type-id-100' name='outsize'/>
-      <parameter type-id='type-id-377' name='out'/>
+      <parameter type-id='type-id-99' name='seed_size'/>
+      <parameter type-id='type-id-898' name='seed'/>
+      <parameter type-id='type-id-99' name='outsize'/>
+      <parameter type-id='type-id-376' name='out'/>
       <return type-id='type-id-22'/>
     </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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='nettle_tls10_prf' mangled-name='nettle_tls10_prf' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <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>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='backport/cfb8.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/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-112'/>
+    <function-decl name='_gnutls_hmac_streebog512_set_key' mangled-name='_gnutls_hmac_streebog512_set_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='backport/cmac.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <function-decl name='nettle_aes128_set_encrypt_key' mangled-name='nettle_aes128_set_encrypt_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <function-decl name='nettle_tls10_prf' mangled-name='nettle_tls10_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='backport/xts.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <function-decl name='nettle_aes128_set_decrypt_key' mangled-name='nettle_aes128_set_decrypt_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+  <abi-instr version='1.0' address-size='64' path='backport/cfb8.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='rnd.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_chacha_set_key' mangled-name='nettle_chacha_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_chacha_set_nonce' mangled-name='nettle_chacha_set_nonce' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/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-1198'>
+  <abi-instr version='1.0' address-size='64' path='int/rsa-keygen-fips186.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <class-decl name='rsa_public_key' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-1211'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='size' type-id='type-id-100' visibility='default'/>
+        <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-1199' visibility='default'/>
+        <var-decl name='n' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='e' type-id='type-id-1199' visibility='default'/>
+        <var-decl name='e' type-id='type-id-1212' 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-1200' visibility='default' id='type-id-1201'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-1213' visibility='default' id='type-id-1214'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='_mp_alloc' type-id='type-id-22' visibility='default'/>
       </data-member>
@@ -19359,140 +19531,137 @@
         <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-1202' visibility='default'/>
+        <var-decl name='_mp_d' type-id='type-id-1215' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='mp_limb_t' type-id='type-id-38' id='type-id-1203'/>
-    <pointer-type-def type-id='type-id-1203' size-in-bits='64' id='type-id-1202'/>
-    <typedef-decl name='__mpz_struct' type-id='type-id-1201' id='type-id-1200'/>
+    <typedef-decl name='mp_limb_t' type-id='type-id-38' id='type-id-1216'/>
+    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-1215'/>
+    <typedef-decl name='__mpz_struct' type-id='type-id-1214' id='type-id-1213'/>
 
-    <array-type-def dimensions='1' type-id='type-id-1200' size-in-bits='128' id='type-id-1204'>
-      <subrange length='1' type-id='type-id-38' id='type-id-1205'/>
+    <array-type-def dimensions='1' type-id='type-id-1213' size-in-bits='128' id='type-id-1217'>
+      <subrange length='1' type-id='type-id-38' id='type-id-1218'/>
 
     </array-type-def>
-    <typedef-decl name='mpz_t' type-id='type-id-1204' id='type-id-1199'/>
-    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-1206'/>
-    <class-decl name='rsa_private_key' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-1207'>
+    <typedef-decl name='mpz_t' type-id='type-id-1217' id='type-id-1212'/>
+    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-1219'/>
+    <class-decl name='rsa_private_key' size-in-bits='832' is-struct='yes' visibility='default' id='type-id-1220'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='size' type-id='type-id-100' visibility='default'/>
+        <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-1199' visibility='default'/>
+        <var-decl name='d' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='p' type-id='type-id-1199' visibility='default'/>
+        <var-decl name='p' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='q' type-id='type-id-1199' visibility='default'/>
+        <var-decl name='q' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='a' type-id='type-id-1199' visibility='default'/>
+        <var-decl name='a' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='b' type-id='type-id-1199' visibility='default'/>
+        <var-decl name='b' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='c' type-id='type-id-1199' visibility='default'/>
+        <var-decl name='c' type-id='type-id-1212' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1207' size-in-bits='64' id='type-id-1208'/>
-    <typedef-decl name='nettle_progress_func' type-id='type-id-1209' id='type-id-1210'/>
-    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-1211'/>
+    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-1221'/>
+    <typedef-decl name='nettle_progress_func' type-id='type-id-1222' id='type-id-1223'/>
+    <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-1224'/>
     <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-1206' name='pub'/>
-      <parameter type-id='type-id-1208' name='key'/>
+      <parameter type-id='type-id-1219' name='pub'/>
+      <parameter type-id='type-id-1221' name='key'/>
       <parameter type-id='type-id-10' name='seed_length'/>
-      <parameter type-id='type-id-192' name='seed'/>
-      <parameter type-id='type-id-102' name='progress_ctx'/>
-      <parameter type-id='type-id-1211' name='progress'/>
+      <parameter type-id='type-id-191' name='seed'/>
+      <parameter type-id='type-id-101' name='progress_ctx'/>
+      <parameter type-id='type-id-1224' name='progress'/>
       <parameter type-id='type-id-10' name='n_size'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='__gmpz_tstbit' mangled-name='__gmpz_tstbit' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_mul_2exp' mangled-name='__gmpz_mul_2exp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_lcm' mangled-name='__gmpz_lcm' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='nettle_sha512_update' mangled-name='nettle_sha512_update' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_sha384_digest' mangled-name='nettle_sha384_digest' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='st_provable_prime' mangled-name='st_provable_prime' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='mpz_seed_sizeinbase_256_u' mangled-name='mpz_seed_sizeinbase_256_u' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_sqrt' mangled-name='__gmpz_sqrt' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_gcd' mangled-name='__gmpz_gcd' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1209'>
-      <parameter type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-1222'>
+      <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-22'/>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='int/provable-prime.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_fdiv_q_2exp' mangled-name='__gmpz_fdiv_q_2exp' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/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-1212'>
+  <abi-instr version='1.0' address-size='64' path='int/dsa-keygen-fips186.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <class-decl name='dsa_params' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-1225'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='p' type-id='type-id-1199' visibility='default'/>
+        <var-decl name='p' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='q' type-id='type-id-1199' visibility='default'/>
+        <var-decl name='q' type-id='type-id-1212' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='g' type-id='type-id-1199' visibility='default'/>
+        <var-decl name='g' type-id='type-id-1212' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-1213'/>
-    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-1214'/>
-    <typedef-decl name='nettle_random_func' type-id='type-id-1127' id='type-id-1215'/>
-    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-1216'/>
+    <pointer-type-def type-id='type-id-1225' size-in-bits='64' id='type-id-1226'/>
+    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-1227'/>
+    <typedef-decl name='nettle_random_func' type-id='type-id-1137' id='type-id-1228'/>
+    <pointer-type-def type-id='type-id-1228' size-in-bits='64' id='type-id-1229'/>
     <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-1213' name='params'/>
-      <parameter type-id='type-id-1214' name='y'/>
-      <parameter type-id='type-id-1214' name='x'/>
-      <parameter type-id='type-id-102' name='random_ctx'/>
-      <parameter type-id='type-id-1216' name='random'/>
-      <parameter type-id='type-id-102' name='progress_ctx'/>
-      <parameter type-id='type-id-1211' name='progress'/>
+      <parameter type-id='type-id-1226' name='params'/>
+      <parameter type-id='type-id-1227' name='y'/>
+      <parameter type-id='type-id-1227' name='x'/>
+      <parameter type-id='type-id-101' name='random_ctx'/>
+      <parameter type-id='type-id-1229' name='random'/>
+      <parameter type-id='type-id-101' name='progress_ctx'/>
+      <parameter type-id='type-id-1224' 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-1217'>
+    <class-decl name='dss_params_validation_seeds' size-in-bits='6400' is-struct='yes' visibility='default' id='type-id-1230'>
       <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-1218' visibility='default'/>
+        <var-decl name='seed' type-id='type-id-1231' 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-1218' visibility='default'/>
+        <var-decl name='pseed' type-id='type-id-1231' 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-1218' visibility='default'/>
+        <var-decl name='qseed' type-id='type-id-1231' 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'/>
@@ -19502,232 +19671,283 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2056' id='type-id-1218'>
-      <subrange length='257' type-id='type-id-38' id='type-id-1219'/>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2056' id='type-id-1231'>
+      <subrange length='257' type-id='type-id-38' id='type-id-1232'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-1217' size-in-bits='64' id='type-id-1220'/>
+    <pointer-type-def type-id='type-id-1230' size-in-bits='64' id='type-id-1233'/>
     <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-1213' name='params'/>
-      <parameter type-id='type-id-1220' name='cert'/>
+      <parameter type-id='type-id-1226' name='params'/>
+      <parameter type-id='type-id-1233' name='cert'/>
       <parameter type-id='type-id-10' name='seed_length'/>
-      <parameter type-id='type-id-102' name='seed'/>
-      <parameter type-id='type-id-102' name='progress_ctx'/>
-      <parameter type-id='type-id-1211' name='progress'/>
+      <parameter type-id='type-id-101' name='seed'/>
+      <parameter type-id='type-id-101' name='progress_ctx'/>
+      <parameter type-id='type-id-1224' 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-1213' name='params'/>
+      <parameter type-id='type-id-1226' name='params'/>
       <parameter type-id='type-id-10' name='domain_seed_size'/>
-      <parameter type-id='type-id-985' name='domain_seed'/>
-      <parameter type-id='type-id-102' name='progress_ctx'/>
-      <parameter type-id='type-id-1211' name='progress'/>
+      <parameter type-id='type-id-898' name='domain_seed'/>
+      <parameter type-id='type-id-101' name='progress_ctx'/>
+      <parameter type-id='type-id-1224' name='progress'/>
       <parameter type-id='type-id-10' name='index'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='__gmpz_fdiv_q' mangled-name='__gmpz_fdiv_q' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='int/dsa-validate.c' comp-dir-path='/home/nmavrogi/cvs/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-1213' name='pub'/>
-      <parameter type-id='type-id-1220' name='cert'/>
+      <parameter type-id='type-id-1226' name='pub'/>
+      <parameter type-id='type-id-1233' 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-1213' name='pub'/>
+      <parameter type-id='type-id-1226' name='pub'/>
       <parameter type-id='type-id-10' name='domain_seed_size'/>
-      <parameter type-id='type-id-985' name='domain_seed'/>
+      <parameter type-id='type-id-898' name='domain_seed'/>
       <parameter type-id='type-id-10' name='index'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_dsa_check_qp_sizes' mangled-name='_dsa_check_qp_sizes' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_dsa_generate_dss_pq' mangled-name='_dsa_generate_dss_pq' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_dsa_generate_dss_g' mangled-name='_dsa_generate_dss_g' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='int/tls1-prf.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='nettle_hmac_sha1_set_key' mangled-name='nettle_hmac_sha1_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <pointer-type-def type-id='type-id-1221' size-in-bits='64' id='type-id-1222'/>
-    <typedef-decl name='get_entropy_func' type-id='type-id-1222' id='type-id-1223'/>
-    <var-decl name='_rnd_get_system_entropy' type-id='type-id-1223' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='int/dsa-compute-k.c' comp-dir-path='/home/nmavrogi/cvs/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>
+    <function-decl name='__gmpn_copyi' mangled-name='__gmpn_copyi' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='mpn_set_base256' mangled-name='mpn_set_base256' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpz_limbs_read' mangled-name='__gmpz_limbs_read' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpz_limbs_write' mangled-name='__gmpz_limbs_write' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpz_limbs_finish' mangled-name='__gmpz_limbs_finish' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='mpn_get_base256' mangled-name='mpn_get_base256' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpn_sub_n' mangled-name='__gmpn_sub_n' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpn_cnd_add_n' mangled-name='__gmpn_cnd_add_n' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='__gmpn_zero' mangled-name='__gmpn_zero' 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='int/ecdsa-compute-k.c' comp-dir-path='/home/nmavrogi/cvs/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/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-1235'/>
+    <typedef-decl name='get_entropy_func' type-id='type-id-1235' id='type-id-1236'/>
+    <var-decl name='_rnd_get_system_entropy' type-id='type-id-1236' visibility='default'/>
     <function-decl name='close' mangled-name='close' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='read' mangled-name='read' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='open' mangled-name='open' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1221'>
-      <parameter type-id='type-id-102'/>
-      <parameter type-id='type-id-100'/>
+    <function-type size-in-bits='64' id='type-id-1234'>
+      <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/nmavrogi/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-1224'>
+  <abi-instr version='1.0' address-size='64' path='gost/gost28147.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <class-decl name='gost28147_param' size-in-bits='32800' is-struct='yes' visibility='default' id='type-id-1237'>
       <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-1225' visibility='default'/>
+        <var-decl name='sbox' type-id='type-id-1238' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='32768' id='type-id-1225'>
-      <subrange length='1024' type-id='type-id-38' id='type-id-1226'/>
+    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='32768' id='type-id-1238'>
+      <subrange length='1024' type-id='type-id-38' id='type-id-1239'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-1224' const='yes' id='type-id-1227'/>
-    <var-decl name='_gnutls_gost28147_param_test_3411' type-id='type-id-1227' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_3411' type-id='type-id-1227' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_Test_89' type-id='type-id-1227' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_A' type-id='type-id-1227' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_B' type-id='type-id-1227' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_C' type-id='type-id-1227' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_CryptoPro_D' type-id='type-id-1227' visibility='default'/>
-    <var-decl name='_gnutls_gost28147_param_TC26_Z' type-id='type-id-1227' visibility='default'/>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/gosthash94.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1240'/>
+    <var-decl name='_gnutls_gost28147_param_test_3411' type-id='type-id-1240' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_3411' type-id='type-id-1240' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_Test_89' type-id='type-id-1240' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_A' type-id='type-id-1240' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_B' type-id='type-id-1240' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_C' type-id='type-id-1240' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_CryptoPro_D' type-id='type-id-1240' visibility='default'/>
+    <var-decl name='_gnutls_gost28147_param_TC26_Z' type-id='type-id-1240' 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-112'/>
+      <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/nmavrogi/cvs/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>
+    <function-decl name='_gnutls_gost28147_imit_update' mangled-name='_gnutls_gost28147_imit_update' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gost28147_imit_digest' mangled-name='_gnutls_gost28147_imit_digest' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='nettle_memeql_sec' mangled-name='nettle_memeql_sec' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
+    </function-decl>
+    <function-decl name='_gnutls_gost28147_encrypt' mangled-name='_gnutls_gost28147_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='gost/gosthash94.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <var-decl name='_gnutls_gosthash94cp' type-id='type-id-1129' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='gost/gosthash94-meta.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <var-decl name='_gnutls_gosthash94cp' type-id='type-id-1139' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/streebog-meta.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <var-decl name='_gnutls_streebog512' type-id='type-id-1129' visibility='default'/>
-    <var-decl name='_gnutls_streebog256' type-id='type-id-1129' visibility='default'/>
+  <abi-instr version='1.0' address-size='64' path='gost/streebog-meta.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/lib/nettle' language='LANG_C99'>
+    <var-decl name='_gnutls_streebog512' type-id='type-id-1139' visibility='default'/>
+    <var-decl name='_gnutls_streebog256' type-id='type-id-1139' visibility='default'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/hmac-gosthash94.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/hmac-gosthash94.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/hmac-streebog.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/bignum-le.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='__gmpz_export' mangled-name='__gmpz_export' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/pbkdf2-hmac-gosthash94.c' comp-dir-path='/home/nmavrogi/cvs/gnutls/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-112'/>
+      <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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/pbkdf2-hmac-streebog.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <function-decl name='_gnutls_hmac_streebog512_set_key' mangled-name='_gnutls_hmac_streebog512_set_key' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </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-112'/>
-    </function-decl>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/ecc-gostdsa-sign.c' comp-dir-path='/home/nmavrogi/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='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_nettle_ecc_mod_mul' mangled-name='_nettle_ecc_mod_mul' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_nettle_ecc_mod_add' mangled-name='_nettle_ecc_mod_add' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='__gmpn_sub_n' mangled-name='__gmpn_sub_n' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_nettle_cnd_copy' mangled-name='_nettle_cnd_copy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-mask.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <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-112'/>
+      <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-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
-    <function-decl name='__gmpz_limbs_write' mangled-name='__gmpz_limbs_write' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
+  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-sign.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ecc_gostdsa_sign' mangled-name='_gnutls_ecc_gostdsa_sign' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
-    </function-decl>
-    <function-decl name='__gmpz_limbs_finish' mangled-name='__gmpz_limbs_finish' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <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/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-verify.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_nettle_gmp_alloc_limbs' mangled-name='_nettle_gmp_alloc_limbs' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_nettle_mpz_limbs_copy' mangled-name='_nettle_mpz_limbs_copy' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_gnutls_ecc_gostdsa_verify' mangled-name='_gnutls_ecc_gostdsa_verify' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
     <function-decl name='_nettle_gmp_free_limbs' mangled-name='_nettle_gmp_free_limbs' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='gost/ecc-gost-hash.c' comp-dir-path='/home/nmavrogi/cvs/gnutls-mine/lib/nettle' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='gost/gostdsa-vko.c' comp-dir-path='/home/nmavrogi/cvs/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-112'/>
+      <return type-id='type-id-111'/>
     </function-decl>
-    <function-decl name='__gmpn_rshift' mangled-name='__gmpn_rshift' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-112'/>
+    <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/nmavrogi/cvs/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>
+    <function-decl name='_gnutls_gost28147_key_wrap_cryptopro' mangled-name='_gnutls_gost28147_key_wrap_cryptopro' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-111'/>
     </function-decl>
   </abi-instr>
 </abi-corpus>
diff --git a/devel/libgnutls.abignore b/devel/libgnutls.abignore
index cd281518a4..c381204fd9 100644
--- a/devel/libgnutls.abignore
+++ b/devel/libgnutls.abignore
@@ -49,9 +49,3 @@ changed_enumerators = GNUTLS_GROUP_MAX
 [suppress_type]
 name = gnutls_sec_param_t
 changed_enumerators = GNUTLS_SEC_PARAM_MAX
-
-[suppress_type]
-name = gnutls_ocsp_req_int*
-
-[suppress_type]
-name = gnutls_ocsp_resp_int*
author	Nikos Mavrogiannopoulos <nmav@gnutls.org>	2019-12-07 21:30:17 +0100
committer	Nikos Mavrogiannopoulos <nmav@redhat.com>	2019-12-10 11:50:54 +0100
commit	e48290a51da19288986bd7aaca265ea62b054dc8 (patch)
tree	b42cf124be667faa7d7b89cae57e0356d5c3c999
parent	26c410bc6ac144d8300d53b1a3f39ffd4f75c6ac (diff)
download	gnutls-tmp-more-const-1.tar.gz